cleaning more translations

includes/mailer/users_mailer.php

@@ -10,7 +10,7 @@ function mail_user_delete($user)
 {
     return engelsystem_email_to_user(
         $user,
-        __('Your account has been deleted'),
+        __('Your account has been deleted.'),
         __(
             'Your %s account has been deleted. If you have any questions regarding your account deletion, please contact heaven.',
             [config('app_name')]

includes/pages/admin_active.php

@@ -328,18 +328,18 @@ function admin_active()
         form([
             form_text('search', __('Search angel:'), $search),
             form_checkbox('show_all_shifts', __('Show all shifts'), $show_all_shifts),
-            form_submit('submit', __('Search')),
+            form_submit('submit', __('form.search')),
         ], page_link_to('admin_active')),
         $set_active == '' ? form([
             form_text('count', __('How much angels should be active?'), $count ?: $forced_count),
-            form_submit('set_active', __('Preview')),
+            form_submit('set_active', __('form.preview')),
         ]) : $set_active,
         $msg . msg(),
         table(
             array_merge(
                 [
                     'no'           => __('No.'),
-                    'nick'         => __('Name'),
+                    'nick'         => __('general.name'),
                 ],
                 ($goodie_tshirt ? ['shirt_size'   => __('Size')] : []),
                 [

includes/pages/admin_arrive.php

@@ -113,7 +113,7 @@ function admin_arrive()
             form_hidden('user', $usr->id),
             form_submit(
                 'submit',
-                $usr->state->arrived ? __('reset') : __('arrived'),
+                $usr->state->arrived ? __('reset') : __('user.arrived'),
                 'btn-sm',
                 true,
                 $usr->state->arrived ? 'secondary' : 'primary'
@@ -196,11 +196,11 @@ function admin_arrive()
     return page_with_title(admin_arrive_title(), [
         $msg . msg(),
         form([
-            form_text('search', __('Search'), $search),
+            form_text('search', __('form.search'), $search),
-            form_submit('submit', __('Search')),
+            form_submit('submit', __('form.search')),
         ], page_link_to('admin_arrive')),
         table([
-            'name'                            => __('Name'),
+            'name'                            => __('general.name'),
             'rendered_planned_arrival_date'   => __('Planned arrival'),
             'arrived'                         => __('Arrived?'),
             'rendered_arrival_date'           => __('Arrival date'),
@@ -211,7 +211,7 @@ function admin_arrive()
             div('col-md-4', [
                 heading(__('Planned arrival statistics'), 3),
                 BarChart::render([
-                    'count' => __('arrived'),
+                    'count' => __('user.arrived'),
                     'sum'   => __('arrived sum'),
                 ], [
                     'count' => '#090',
@@ -226,7 +226,7 @@ function admin_arrive()
             div('col-md-4', [
                 heading(__('Arrival statistics'), 3),
                 BarChart::render([
-                    'count' => __('arrived'),
+                    'count' => __('user.arrived'),
                     'sum'   => __('arrived sum'),
                 ], [
                     'count' => '#090',
@@ -241,7 +241,7 @@ function admin_arrive()
             div('col-md-4', [
                 heading(__('Planned departure statistics'), 3),
                 BarChart::render([
-                    'count' => __('arrived'),
+                    'count' => __('user.arrived'),
                     'sum'   => __('arrived sum'),
                 ], [
                     'count' => '#090',

includes/pages/admin_free.php

@@ -115,18 +115,18 @@ function admin_free()
             div('row', [
                 div('col-md-12 form-inline', [
                     div('row', [
-                        form_text('search', __('Search'), $search, null, null, null, 'col'),
+                        form_text('search', __('form.search'), $search, null, null, null, 'col'),
                         form_select('angeltype', __('Angeltype'), $angel_types, $angelType, '', 'col'),
-                        form_submit('submit', __('Search')),
+                        form_submit('submit', __('form.search')),
                     ]),
                 ]),
             ]),
         ]),
         table([
-            'name'        => __('Name'),
+            'name'        => __('general.name'),
             'shift_state' => __('Next shift'),
             'last_shift'  => __('Last shift'),
-            'dect'        => __('DECT'),
+            'dect'        => __('general.dect'),
             'email'       => __('settings.profile.email'),
             'actions'     => '',
         ], $free_users_table),

includes/pages/admin_groups.php

@@ -50,7 +50,7 @@ function admin_groups()
 
         return page_with_title(admin_groups_title(), [
             table([
-                'name'       => __('Name'),
+                'name'       => __('general.name'),
                 'privileges' => __('Privileges'),
                 'actions'    => '',
             ], $groups_table),

includes/pages/admin_shifts.php

@@ -361,7 +361,7 @@ function admin_shifts()
                 $shiftsCreationHint = '<span class="text-danger">' . $shiftsCreationHint . '</span>';
             }
 
-            return page_with_title(__('Preview'), [
+            return page_with_title(__('form.preview'), [
                 form([
                     $hidden_types,
                     form_hidden('shifttype_id', $shifttype_id),
@@ -559,7 +559,7 @@ function admin_shifts()
                         ]),
                     ]),
                 ]),
-                form_submit('preview', icon('search') . __('Preview')),
+                form_submit('preview', icon('search') . __('form.preview')),
             ]),
         ]
     );

includes/pages/admin_user.php

@@ -57,7 +57,7 @@ function admin_user()
         $html .= '<input type="hidden" name="Type" value="Normal">' . "\n";
         $html .= '<tr><td>' . "\n";
         $html .= '<table>' . "\n";
-        $html .= '  <tr><td>' . __('Nickname') . '</td><td>' . '<input size="40" name="eNick" value="' . $user_source->name . '" class="form-control" maxlength="24"></td></tr>' . "\n";
+        $html .= '  <tr><td>' . __('nick.nick') . '</td><td>' . '<input size="40" name="eNick" value="' . $user_source->name . '" class="form-control" maxlength="24"></td></tr>' . "\n";
         $html .= '  <tr><td>' . __('Last login') . '</td><td><p class="help-block">'
             . ($user_source->last_login_at ? $user_source->last_login_at->format(__('Y-m-d H:i')) : '-')
             . '</p></td></tr>' . "\n";
@@ -67,7 +67,7 @@ function admin_user()
         }
         $html .= '  <tr><td>' . __('Mobile') . '</td><td>' . '<input type= "tel" size="40" name="eHandy" value="' . $user_source->contact->mobile . '" class="form-control" maxlength="40"></td></tr>' . "\n";
         if (config('enable_dect')) {
-            $html .= '  <tr><td>' . __('DECT') . '</td><td>' . '<input size="40" name="eDECT" value="' . $user_source->contact->dect . '" class="form-control" maxlength="40"></td></tr>' . "\n";
+            $html .= '  <tr><td>' . __('general.dect') . '</td><td>' . '<input size="40" name="eDECT" value="' . $user_source->contact->dect . '" class="form-control" maxlength="40"></td></tr>' . "\n";
         }
         if ($user_source->settings->email_human) {
             $html .= '  <tr><td>' . __('settings.profile.email') . '</td><td>' . '<input type="email" size="40" name="eemail" value="' . $user_source->email . '" class="form-control" maxlength="254"></td></tr>' . "\n";

includes/view/AngelTypes_view.php

@@ -87,8 +87,8 @@ function AngelType_edit_view(AngelType $angeltype, bool $supporter_mode)
         msg(),
         form([
             $supporter_mode
-                ? form_info(__('Name'), $angeltype->name)
+                ? form_info(__('general.name'), $angeltype->name)
-                : form_text('name', __('Name'), $angeltype->name),
+                : form_text('name', __('general.name'), $angeltype->name),
             $supporter_mode
                 ? form_info(__('angeltypes.restricted'), $angeltype->restricted ? __('Yes') : __('No'))
                 : form_checkbox(
@@ -146,15 +146,15 @@ function AngelType_edit_view(AngelType $angeltype, bool $supporter_mode)
                     __('angeltypes.hide_on_shift_view.info') . '"></span>',
                     $angeltype->hide_on_shift_view
                 ),
-            form_textarea('description', __('Description'), $angeltype->description),
+            form_textarea('description', __('general.description'), $angeltype->description),
             form_info('', __('Please use markdown for the description.')),
             heading(__('Contact'), 3),
             form_info(
                 '',
                 __('Primary contact person/desk for user questions.')
             ),
-            form_text('contact_name', __('Name'), $angeltype->contact_name),
+            form_text('contact_name', __('general.name'), $angeltype->contact_name),
-            config('enable_dect') ? form_text('contact_dect', __('DECT'), $angeltype->contact_dect) : '',
+            config('enable_dect') ? form_text('contact_dect', __('general.dect'), $angeltype->contact_dect) : '',
             form_text('contact_email', __('settings.profile.email'), $angeltype->contact_email),
             form_submit('submit', __('form.save')),
         ]),
@@ -362,11 +362,11 @@ function AngelType_view_members(AngelType $angeltype, $members, $admin_user_ange
 function AngelType_view_table_headers(AngelType $angeltype, $supporter, $admin_angeltypes)
 {
     $headers = [
-        'name'    => __('Nick'),
+        'name'    => __('nick.nick'),
     ];
 
     if (config('enable_dect')) {
-        $headers['dect'] = __('DECT');
+        $headers['dect'] = __('general.dect');
     }
 
     if ($angeltype->requires_driver_license && ($supporter || $admin_angeltypes)) {
@@ -479,7 +479,7 @@ function AngelType_view_info(
         $info[] = AngelTypes_render_contact_info($angeltype);
     }
 
-    $info[] = '<h3>' . __('Description') . '</h3>';
+    $info[] = '<h3>' . __('general.description') . '</h3>';
     $parsedown = new Parsedown();
     if ($angeltype->description != '') {
         $info[] = $parsedown->parse($angeltype->description);
@@ -556,8 +556,8 @@ function AngelType_view_info(
 function AngelTypes_render_contact_info(AngelType $angeltype)
 {
     $info = [
-        __('Name')   => [$angeltype->contact_name, $angeltype->contact_name],
+        __('general.name')   => [$angeltype->contact_name, $angeltype->contact_name],
-        __('DECT')   => config('enable_dect') ? [sprintf('<a href="tel:%s">%1$s</a>', $angeltype->contact_dect), $angeltype->contact_dect] : null,
+        __('general.dect')   => config('enable_dect') ? [sprintf('<a href="tel:%s">%1$s</a>', $angeltype->contact_dect), $angeltype->contact_dect] : null,
         __('settings.profile.email') => [sprintf('<a href="mailto:%s">%1$s</a>', $angeltype->contact_email), $angeltype->contact_email],
     ];
     $contactInfo = [];
@@ -588,7 +588,7 @@ function AngelTypes_list_view($angeltypes, bool $admin_angeltypes)
             button(url('/angeltypes/about'), __('angeltypes.about')),
         ]),
         table([
-            'name'                      => __('Name'),
+            'name'                      => __('general.name'),
             'is_restricted'             => icon('mortarboard-fill') . __('angeltypes.restricted'),
             'shift_self_signup_allowed' => icon('pencil-square') . __('shift.self_signup.allowed'),
             'membership'                => __('Membership'),

includes/view/Rooms_view.php

@@ -22,7 +22,7 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
 
     $description = '';
     if ($room->description) {
-        $description = '<h3>' . __('Description') . '</h3>';
+        $description = '<h3>' . __('general.description') . '</h3>';
         $parsedown = new Parsedown();
         $description .= $parsedown->parse($room->description);
     }
@@ -30,12 +30,12 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
     $dect = '';
     if (config('enable_dect') && $room->dect) {
         $dect = heading(__('Contact'), 3)
-            . description([__('DECT') => sprintf('<a href="tel:%s">%1$s</a>', $room->dect)]);
+            . description([__('general.dect') => sprintf('<a href="tel:%s">%1$s</a>', $room->dect)]);
     }
 
     $tabs = [];
     if ($room->map_url) {
-        $tabs[__('Map')] = sprintf(
+        $tabs[__('room.map_url')] = sprintf(
             '<div class="map">'
             . '<iframe style="width: 100%%; min-height: 400px; border: 0 none;" src="%s"></iframe>'
             . '</div>',

includes/view/ShiftTypes_view.php

@@ -51,8 +51,8 @@ function ShiftType_edit_view($name, $description, $shifttype_id)
             button(page_link_to('shifttypes'), shifttypes_title(), 'back'),
         ]),
         form([
-            form_text('name', __('Name'), $name),
+            form_text('name', __('general.name'), $name),
-            form_textarea('description', __('Description'), $description),
+            form_textarea('description', __('general.description'), $description),
             form_info('', __('Please use markdown for the description.')),
             form_submit('submit', __('form.save')),
         ]),
@@ -80,7 +80,7 @@ function ShiftType_view(ShiftType $shifttype)
                 icon('trash') . __('delete'),
             ),
         ]),
-        heading(__('Description'), 2),
+        heading(__('general.description'), 2),
         $parsedown->parse($shifttype->description),
     ], true);
 }
@@ -120,7 +120,7 @@ function ShiftTypes_list_view($shifttypes)
             button(page_link_to('shifttypes', ['action' => 'edit']), __('New shifttype'), 'add'),
         ]),
         table([
-            'name'    => __('Name'),
+            'name'    => __('general.name'),
             'actions' => '',
         ], $shifttypes),
     ], true);

includes/view/Shifts_view.php

@@ -187,7 +187,7 @@ function Shift_view(Shift $shift, ShiftType $shifttype, Room $room, $angeltypes_
             '<div class="list-group">' . $needed_angels . '</div>',
         ]),
         div('col-sm-6', [
-            '<h2>' . __('Description') . '</h2>',
+            '<h2>' . __('general.description') . '</h2>',
             $parsedown->parse($shifttype->description),
             $parsedown->parse($shift->description),
         ]),

includes/view/User_view.php

@@ -132,14 +132,14 @@ function Users_view(
     $user_table_headers = [];
 
     if (!config('display_full_name')) {
-        $user_table_headers['name'] = Users_table_header_link('name', __('Nick'), $order_by);
+        $user_table_headers['name'] = Users_table_header_link('name', __('nick.nick'), $order_by);
     }
     if (config('enable_user_name')) {
         $user_table_headers['first_name'] = Users_table_header_link('first_name', __('Prename'), $order_by);
-        $user_table_headers['last_name'] = Users_table_header_link('last_name', __('Name'), $order_by);
+        $user_table_headers['last_name'] = Users_table_header_link('last_name', __('general.name'), $order_by);
     }
     if (config('enable_dect')) {
-        $user_table_headers['dect'] = Users_table_header_link('dect', __('DECT'), $order_by);
+        $user_table_headers['dect'] = Users_table_header_link('dect', __('general.dect'), $order_by);
     }
     $user_table_headers['arrived'] = Users_table_header_link('arrived', __('Arrived'), $order_by);
     if (config('enable_voucher')) {
@@ -570,7 +570,7 @@ function User_view(
                             form([
                                 form_hidden('action', 'arrived'),
                                 form_hidden('user', $user_source->id),
-                                form_submit('submit', __('arrived'), '', false),
+                                form_submit('submit', __('user.arrived'), '', false),
                             ], page_link_to('admin_arrive'), true) : '',
                         ($admin_user_privilege || $auth->can('voucher.edit')) && config('enable_voucher') ?
                             button(

resources/lang/de_DE/default.po

@@ -79,7 +79,7 @@ msgstr "Credits"
 msgid "Register"
 msgstr "Registrieren"
 
-msgid "login.login"
+msgid "general.login"
 msgstr "Login"
 
 msgid "page.403.login"
@@ -470,9 +470,6 @@ msgstr "Bitte gib eine korrekte Anzahl von Gutscheinen ein."
 msgid "Saved the number of vouchers."
 msgstr "Anzahl der Gutscheine gespeichert."
 
-msgid "%s's vouchers"
-msgstr "Gutschein von %s"
-
 msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
@@ -513,19 +510,6 @@ msgstr "Die aktualisierte Schicht:"
 msgid "Your Shift has changed"
 msgstr "Deine Schicht hat sich geändert"
 
-msgid "A Shift you are registered on was deleted:"
-msgstr "Eine deiner Schichten wurde gelöscht:"
-
-msgid ""
-"Since the deleted shift was already done, we added a worklog entry instead, "
-"to keep your work hours correct."
-msgstr ""
-"Da die gelöschte Schicht bereits vergangen ist, haben wir einen "
-"entsprechenden Arbeitseinsatz hinzugefügt."
-
-msgid "Your Shift was deleted"
-msgstr "Deine Schicht wurde gelöscht"
-
 msgid "You have been assigned to a Shift:"
 msgstr "Du wurdest in eine Schicht eingetragen:"
 
@@ -538,7 +522,7 @@ msgstr "Du wurdest aus einer Schicht ausgetragen:"
 msgid "Removed from Shift"
 msgstr "Von Schicht ausgetragen"
 
-msgid "Your account has been deleted"
+msgid "Your account has been deleted."
 msgstr "Dein Konto wurde gelöscht."
 
 msgid ""
@@ -609,18 +593,9 @@ msgstr "Suche Engel:"
 msgid "Show all shifts"
 msgstr "Alle Schichten anzeigen"
 
-msgid "Search"
-msgstr "Suche"
-
 msgid "How much angels should be active?"
 msgstr "Wie viele Engel sollten aktiv sein?"
 
-msgid "Preview"
-msgstr "Vorschau"
-
-msgid "Nickname"
-msgstr "Nick"
-
 msgid "Size"
 msgstr "Größe"
 
@@ -660,9 +635,6 @@ msgstr "Engel wurde als angekommen markiert."
 msgid "reset"
 msgstr "zurücksetzen"
 
-msgid "arrived"
-msgstr "angekommen"
-
 msgid "Planned arrival"
 msgstr "Geplanter Ankunftstag"
 
@@ -696,28 +668,22 @@ msgstr "Geplante Abreise-Statistik"
 msgid "Free angels"
 msgstr "Freie Engel"
 
-msgid "Alle"
-msgstr "All"
-
 msgid "Angeltype"
 msgstr "Engeltyp"
 
-msgid "Nick"
-msgstr "Nick"
-
 msgid "Next shift"
 msgstr "Nächste Schicht"
 
 msgid "Last shift"
 msgstr "Letzte Schicht"
 
-msgid "DECT"
+msgid "general.dect"
 msgstr "DECT"
 
 msgid "Grouprights"
 msgstr "Gruppenrechte"
 
-msgid "Name"
+msgid "general.name"
 msgstr "Name"
 
 msgid "Privileges"
@@ -726,82 +692,18 @@ msgstr "Privilegien"
 msgid "Edit group"
 msgstr "Gruppe bearbeiten"
 
-msgid "Frab import"
-msgstr "Frab Import"
-
-msgid "Webserver has no write-permission on import directory."
-msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
-
 msgid "Please select a shift type."
 msgstr "Bitte einen Schichttyp wählen."
 
-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."
-
-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."
-
-msgid "No valid xml/xcal file provided."
-msgstr "Keine valide xml/xcal Datei hochgeladen."
-
-msgid "File upload went wrong."
-msgstr "Das Hochladen der Datei ist schiefgegangen."
-
-msgid "Please provide some data."
-msgstr "Bitte lade eine Datei hoch."
-
-msgid "File Upload"
-msgstr "Datei hochladen"
-
-msgid "Validation"
-msgstr "Überprüfen"
-
-msgid "Import"
-msgstr "Importieren"
-
-msgid "Add minutes to start"
-msgstr "Minuten vor Talk-Beginn hinzufügen"
-
-msgid "Add minutes to end"
-msgstr "Minuten nach Talk-Ende hinzufügen"
-
-msgid "xcal-File (.xcal)"
-msgstr "xcal-Datei (.xcal)"
-
-msgid "Missing import file."
-msgstr "Import-Datei nicht vorhanden."
-
-msgid "Shifts to create"
-msgstr "Anzulegende Schichten"
-
-msgid "Day"
-msgstr "Tag"
-
 msgid "Start"
 msgstr "Beginn"
 
 msgid "End"
 msgstr "Ende"
 
-msgid "Shift type"
-msgstr "Schichttyp"
-
 msgid "Location"
 msgstr "Ort"
 
-msgid "Shifts to update"
-msgstr "Zu aktualisierende Schichten"
-
-msgid "Shifts to delete"
-msgstr "Zu löschende Schichten"
-
-msgid "It's done!"
-msgstr "Erledigt!"
-
 msgid "Delete"
 msgstr "löschen"
 
@@ -811,40 +713,10 @@ msgstr "Fragen beantworten"
 msgid "There are unanswered questions!"
 msgstr "Es gibt unbeantwortete Fragen!"
 
-msgid "Unanswered questions"
-msgstr "Unbeantwortete Fragen"
-
-msgid "From"
-msgstr "Von"
-
-msgid "Question"
-msgstr "Frage"
-
-msgid "Answer"
-msgstr "Antwort"
-
-msgid "Answered questions"
-msgstr "Beantwortete Fragen"
-
-msgid "Answered by"
-msgstr "Antwort von"
-
-msgid "Answered at"
-msgstr "Beantwortet am"
-
-msgid "Asked at"
-msgstr "Gefragt am"
-
 msgid "Locations"
 msgstr "Orte"
 
-msgid "This name is already in use."
+msgid "general.description"
-msgstr "Dieser Name ist bereits vergeben."
-
-msgid "Please enter needed angels for type %s."
-msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an."
-
-msgid "Description"
 msgstr "Beschreibung"
 
 msgid "Please use markdown for the description."
@@ -853,12 +725,6 @@ msgstr "Bitte benutze Markdown für die Beschreibung."
 msgid "Needed angels:"
 msgstr "Benötigte Engel:"
 
-msgid "add"
-msgstr "Neu"
-
-msgid "Map"
-msgstr "Karte"
-
 msgid "Create shifts"
 msgstr "Schichten erstellen"
 
@@ -923,7 +789,7 @@ msgid "Shift change hours"
 msgstr "Schichtwechsel-Stunden"
 
 msgid "Create a shift over midnight."
-msgstr ""
+msgstr "Erstelle Schichten über Mitternacht"
 
 msgid "Take needed angels from location settings"
 msgstr "Übernehme benötigte Engel von den Ort-Einstellungen"
@@ -1944,9 +1810,6 @@ msgstr "Zu aktualisierende Schichten"
 msgid "schedule.import.shifts.delete"
 msgstr "Zu löschende Schichten"
 
-msgid "schedule.import.rooms.name"
-msgstr "Name"
-
 msgid "schedule.import.shift.dates"
 msgstr "Zeit"
 
@@ -2031,7 +1894,7 @@ msgstr "Einstellungen"
 msgid "settings.profile.entry_required"
 msgstr "Pflichtfeld"
 
-msgid "settings.profile.nick"
+msgid "nick.nick"
 msgstr "Nick"
 
 msgid "settings.profile.nick.already-taken"
@@ -2055,9 +1918,6 @@ msgstr "Geplanter Ankunftstag"
 msgid "settings.profile.planned_departure_date"
 msgstr "Geplanter Abreisetag"
 
-msgid "settings.profile.dect"
-msgstr "DECT"
-
 msgid "settings.profile.mobile"
 msgstr "Handy"
 
@@ -2287,9 +2147,6 @@ msgstr "Nachricht"
 msgid "angel"
 msgstr "Engel"
 
-msgid "date"
-msgstr "Datum"
-
 msgid "worklog.add"
 msgstr "Arbeitseinsatz hinzufügen"
 
@@ -2327,12 +2184,6 @@ msgstr "Dieser Engeltyp benötigt eine Einweisung bei einem Einführungstreffen.
 msgid "angeltypes.can-change-later"
 msgstr "Du kannst Deine Auswahl später in den Einstellungen ändern."
 
-msgid "angeltypes.name"
-msgstr "Name"
-
-msgid "angeltypes.dect"
-msgstr "DECT"
-
 msgid "angeltypes.email"
 msgstr "E-Mail"
 
@@ -2349,18 +2200,9 @@ msgstr "Registrieren"
 msgid "room.rooms"
 msgstr "Orte"
 
-msgid "room.name"
-msgstr "Name"
-
-msgid "room.dect"
-msgstr "DECT"
-
 msgid "room.map_url"
 msgstr "Karte"
 
-msgid "room.description"
-msgstr "Beschreibung"
-
 msgid "room.required_angels"
 msgstr "Benötigte Engel"
 
@@ -2385,9 +2227,6 @@ msgstr "Engelregistrierung"
 msgid "page.sign-up.login-data"
 msgstr "Anmeldedaten"
 
-msgid "page.sign-up.name"
-msgstr "Name"
-
 msgid "page.sign-up.event-data"
 msgstr "Eventdaten"
 

resources/lang/en_US/default.po

@@ -22,9 +22,18 @@ msgstr "Your password is incorrect. Please try it again."
 msgid "form.submit"
 msgstr "Submit"
 
-msgid "login.login"
+msgid "general.login"
 msgstr "Login"
 
+msgid "general.dect"
+msgstr "DECT"
+
+msgid "general.name"
+msgstr "Name"
+
+msgid "general.description"
+msgstr "Description"
+
 msgid "page.403.login"
 msgstr "Please log in."
 
@@ -136,9 +145,6 @@ msgstr "Shifts to update"
 msgid "schedule.import.shifts.delete"
 msgstr "Shifts to delete"
 
-msgid "schedule.import.rooms.name"
-msgstr "Name"
-
 msgid "schedule.import.shift.dates"
 msgstr "Times"
 
@@ -226,7 +232,7 @@ msgstr "Settings"
 msgid "settings.profile.entry_required"
 msgstr "Entry required"
 
-msgid "settings.profile.nick"
+msgid "nick.nick"
 msgstr "Nick"
 
 msgid "settings.profile.nick.already-taken"
@@ -250,9 +256,6 @@ msgstr "Planned date of arrival"
 msgid "settings.profile.planned_departure_date"
 msgstr "Planned date of departure"
 
-msgid "settings.profile.dect"
-msgstr "DECT"
-
 msgid "settings.profile.mobile"
 msgstr "Mobile"
 
@@ -482,9 +485,6 @@ msgstr "Message"
 msgid "angel"
 msgstr "Angel"
 
-msgid "date"
-msgstr "Date"
-
 msgid "worklog.add"
 msgstr "Add work log"
 
@@ -529,12 +529,6 @@ msgstr "This angeltype requires the attendance at an introduction meeting. "
 msgid "angeltypes.can-change-later"
 msgstr "You can change your selection later in the settings."
 
-msgid "angeltypes.name"
-msgstr "Name"
-
-msgid "angeltypes.dect"
-msgstr "DECT"
-
 msgid "angeltypes.email"
 msgstr "E-Mail"
 
@@ -561,18 +555,9 @@ msgstr "Register"
 msgid "room.rooms"
 msgstr "Locations"
 
-msgid "room.name"
-msgstr "Name"
-
-msgid "room.dect"
-msgstr "DECT"
-
 msgid "room.map_url"
 msgstr "Map"
 
-msgid "room.description"
-msgstr "Description"
-
 msgid "room.required_angels"
 msgstr "Required angels"
 
@@ -597,9 +582,6 @@ msgstr "Angel sign-up"
 msgid "page.sign-up.login-data"
 msgstr "Login data"
 
-msgid "page.sign-up.name"
-msgstr "Name"
-
 msgid "page.sign-up.event-data"
 msgstr "Event data"
 

resources/views/admin/rooms/edit.twig

@@ -11,13 +11,13 @@
 
         <div class="row">
             <div class="col-lg-6">
-                {{ f.input('name', __('room.name'), {
+                {{ f.input('name', __('general.name'), {
                     'required': true,
                     'required_icon': true,
-                    'value': f.formData('room', room ? room.name : ''),
+                    'value': f.formData('room', room ? general.name : ''),
                 }) }}
 
-                {{ f.input('dect', __('room.dect'), {
+                {{ f.input('dect', __('general.dect'), {
                     'value': f.formData('dect', room ? room.dect : ''),
                 }) }}
                 {{ f.input('map_url', __('room.map_url'), {
@@ -26,7 +26,7 @@
                     'info': __('room.map_url.info'),
                 }) }}
 
-                {{ f.textarea('description', __('room.description'), {
+                {{ f.textarea('description', __('general.description'), {
                     'value': f.formData('description', room ? room.description : ''),
                     'rows': 5,
                     'info': __('form.markdown')

resources/views/admin/rooms/index.twig

@@ -24,8 +24,8 @@
                         <table class="table table-striped">
                             <thead>
                             <tr>
-                                <th>{{ __('room.name') }}</th>
+                                <th>{{ __('general.name') }}</th>
-                                <th>{{ __('room.dect') }}</th>
+                                <th>{{ __('general.dect') }}</th>
                                 <th>{{ __('room.map_url') }}</th>
                                 <th></th>
                             </tr>
@@ -37,7 +37,7 @@
                                     <td>
                                         {{ m.icon('pin-map-fill') }}
                                         <a href="{{ url('/rooms', {'action': 'view', 'room_id': room.id}) }}">
-                                            {{ room.name }}
+                                            {{ general.name }}
                                         </a>
                                     </td>
 

resources/views/admin/schedule/load.twig

@@ -33,14 +33,14 @@
         <table class="table table-striped">
             <thead>
             <tr>
-                <th>{{ __('schedule.import.rooms.name') }}</th>
+                <th>{{ __('general.name') }}</th>
             </tr>
             </thead>
 
             <tbody>
             {% for room in rooms %}
                 <tr>
-                    <td>{{ room.name }}</td>
+                    <td>{{ general.name }}</td>
                 </tr>
             {% endfor %}
             </tbody>
@@ -66,7 +66,7 @@
                     <td>{{ shift.date.format(__('Y-m-d H:i')) }} - {{ shift.endDate.format(__('H:i')) }}</td>
                     <td>{{ shift.type }}</td>
                     <td>{{ shift.title }}{% if shift.subtitle %}<br><small>{{ shift.subtitle }}</small>{% endif %}</td>
-                    <td>{{ shift.room.name }}</td>
+                    <td>{{ shift.general.name }}</td>
                 </tr>
             {% endfor %}
             </tbody>

resources/views/api/ical.twig

@@ -13,7 +13,7 @@ DTEND:{{ entry.shift.end.utc().format(dateFormat) }}
 STATUS:CONFIRMED
 TRANSP:OPAQUE
 SUMMARY:{{ (entry.shift.shiftType.name ~ ' (' ~ entry.shift.title ~ ')') | replace(replacement) | raw }}
-LOCATION:{{ entry.shift.room.name | replace(replacement) | raw }}
+LOCATION:{{ entry.shift.general.name | replace(replacement) | raw }}
 DESCRIPTION:{{
     (
         entry.shift.shiftType.description

resources/views/emails/worklog-from-shift.twig

@@ -8,7 +8,7 @@
 {{ name }}
 {{ title }}
 {{ start.format(__('Y-m-d H:i')) }} - {{ end.format(__('Y-m-d H:i')) }}
-{{ room.name }}
+{{ general.name }}
 
 {% if start <= date() and not freeloaded %}
 {{ __('notification.shift.deleted.worklog') }}

resources/views/errors/403.twig

@@ -10,6 +10,6 @@
         {% do session_set('previous_page', request.url) %}
 
         <p>{{ __('page.403.login') }}</p>
-        <p>{{ m.button(__('login.login'), url('login')) }}</p>
+        <p>{{ m.button(__('general.login'), url('login')) }}</p>
     {% endif %}
 {% endblock %}

resources/views/layouts/parts/navbar.twig

@@ -63,7 +63,7 @@
                     {% endif %}
 
                     {% if has_permission_to('login') %}
-                        {{ _self.toolbar_item(__('login.login'), url('login'), 'login', 'box-arrow-in-right') }}
+                        {{ _self.toolbar_item(__('general.login'), url('login'), 'login', 'box-arrow-in-right') }}
                     {% endif %}
                 {% endif %}
 

resources/views/pages/angeltypes/about.twig

@@ -20,7 +20,7 @@
                         </a>
                     {% endif %}
                     <a href="{{ url('/login') }}" class="btn btn-secondary back">
-                        {{ __('login.login') }}
+                        {{ __('general.login') }}
                     </a>
                 {% endif %}
 
@@ -74,8 +74,8 @@
                         {% if angeltype.hasContactInfo() %}
                             <dl class="row card-text">
                                 {% for type, info in {
-                                    'contact_name': {'name': __('angeltypes.name')},
+                                    'contact_name': {'name': __('general.name')},
-                                    'contact_dect': {'name': __('angeltypes.dect'), 'url': 'tel'},
+                                    'contact_dect': {'name': __('general.dect'), 'url': 'tel'},
                                     'contact_email': {'name': __('angeltypes.email'), 'url': 'mailto'},
                                 } %}
                                     {% if angeltype[type] and (type != 'contact_dect' or config('enable_dect')) %}

resources/views/pages/login.twig

@@ -1,7 +1,7 @@
 {% extends "layouts/app.twig" %}
 {% import 'macros/base.twig' as m %}
 
-{% block title %}{{ __('login.login') }}{% endblock %}
+{% block title %}{{ __('general.login') }}{% endblock %}
 
 {% block content %}
     <div class="col-md-12">
@@ -51,7 +51,7 @@
                                         type="text"
                                         name="login"
                                         value=""
-                                        placeholder="{{ __('Nick') }}"
+                                        placeholder="{{ __('nick.nick') }}"
                                         autofocus>
                                 </div>
                             </div>
@@ -70,7 +70,7 @@
 
                             <div class="mb-3 text-center">
                                 <button class="btn btn-primary btn-lg btn-block" type="submit" name="submit">
-                                    {{ __('login.login') }}
+                                    {{ __('general.login') }}
                                 </button>
                             </div>
 

resources/views/pages/messages/overview.twig

@@ -32,7 +32,7 @@
             <tr>
                 <th>{{ __('angel') }}</th>
                 <th>{{ __('message.message') }}</th>
-                <th>{{ __('date') }}</th>
+                <th>{{ __('Date') }}</th>
             </tr>
             </thead>
             <tbody>

resources/views/pages/settings/profile.twig

@@ -79,7 +79,7 @@
         <div class="row g-4">
             {% if config('enable_dect') %}
                 <div class="col-md-6">
-                    {{ f.input('dect', __('settings.profile.dect'), {
+                    {{ f.input('dect', __('general.dect'), {
                         'value': user.contact.dect,
                         'max_length': 40,
                     }) }}

resources/views/pages/sign-up.twig

@@ -147,7 +147,7 @@
 
         {% if isFullNameEnabled %}
             <div class="mb-5">
-                <h2>{{ __('page.sign-up.name') }}</h2>
+                <h2>{{ __('general.name') }}</h2>
                 <div class="row">
                     <div class="col-md-6">
                         {{ f.input(