diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php index 0fb81faae..f5b512778 100644 --- a/includes/controller/shift_entries_controller.php +++ b/includes/controller/shift_entries_controller.php @@ -327,7 +327,7 @@ function shift_entry_delete_controller() $signout_user = $shiftEntry->user; if (!Shift_signout_allowed($shift, $angeltype, $signout_user->id)) { error(__( - 'You are not allowed to remove this shift entry. If necessary, ask your supporter or heaven to do so.' + 'You are not allowed to remove this shift entry. If necessary, ask a staff member or the Info Desk to do so.' )); throw_redirect(user_link($signout_user->id)); } diff --git a/includes/mailer/users_mailer.php b/includes/mailer/users_mailer.php index 1438a5a9c..fb87ee953 100644 --- a/includes/mailer/users_mailer.php +++ b/includes/mailer/users_mailer.php @@ -12,7 +12,7 @@ function mail_user_delete($user) $user, __('Your account has been deleted.'), __( - 'Your %s account has been deleted. If you have any questions regarding your account deletion, please contact heaven.', + 'Your %s account has been deleted. If you have any questions regarding your account deletion, please contact the Info Desk.', [config('app_name')] ) ); diff --git a/includes/sys_menu.php b/includes/sys_menu.php index a2e22760d..120a1651b 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -61,7 +61,7 @@ function make_navigation() 'meetings' => [__('news.title.meetings'), 'user_meetings'], 'user_shifts' => __('general.shifts'), 'angeltypes' => __('angeltypes.angeltypes'), - 'questions' => [__('Ask the Heaven'), 'question.add'], + 'questions' => [__('Ask the Info Desk'), 'question.add'], ]; foreach ($pages as $menu_page => $options) { diff --git a/includes/view/User_view.php b/includes/view/User_view.php index e17c8d779..9f8082ed0 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -1054,7 +1054,7 @@ function render_user_arrived_hint(bool $is_sys_menu = false) if (!empty($buildup) && $buildup->lessThan(new Carbon())) { return $user->state->user_info ? ($is_sys_menu ? null : __('user_info.not_arrived_hint')) - : __('You are not marked as arrived. Please go to heaven, get your angel badge and/or tell them that you arrived already.'); + : __('You are not marked as arrived. Please go to the Info Desk and tell them that you arrived already.'); } } diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index f6421889c..bfb1f2731 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -237,11 +237,11 @@ msgid "You are subscribed. Thank you!" msgstr "Du bist eingetragen. Danke!" msgid "" -"You are not allowed to remove this shift entry. If necessary, ask your " -"supporter or heaven to do so." +"You are not allowed to remove this shift entry. If necessary, ask a " +"staff member or the Info Desk to do so." msgstr "" "Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage " -"deinen Supporter oder im Himmel danach." +"beim Staff oder beim Info Desk danach." msgid "Shift entry removed." msgstr "Schichteintrag gelöscht." @@ -436,10 +436,10 @@ msgstr "Dein Konto wurde gelöscht." msgid "" "Your %s account has been deleted. If you have any questions regarding your " -"account deletion, please contact heaven." +"account deletion, please contact the Info Desk. msgstr "" "Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere bitte " -"den Himmel." +"den Info Desk." msgid "Active angels" msgstr "Aktive Critter" @@ -742,8 +742,8 @@ msgstr "Gib bitte einen Schwänz-Kommentar ein!" msgid "Shift saved." msgstr "Schicht gespeichert." -msgid "Ask the Heaven" -msgstr "Frag den Himmel" +msgid "Ask the Info Desk" +msgstr "Frag den Info Desk" msgid "The administration has not configured any locations yet." msgstr "Die Administratoren habe noch keine Orte eingerichtet." @@ -1207,11 +1207,11 @@ msgid "Rights" msgstr "Berechtigungen" msgid "" -"You are not marked as arrived. Please go to heaven, get your angel " -"badge and/or tell them that you arrived already." +"You are not marked as arrived. Please go to the Info Desk and " +"tell them that you arrived already." msgstr "" -"Du bist nicht als angekommen markiert. Geh bitte zum Himmel, " -"hole Dein Badge ab und/oder melde dich als angekommen." +"Du bist nicht als angekommen markiert. Geh bitte zum Info Desk, " +"und melde dich als angekommen." msgid "" "Please enter your planned date of departure on your settings page to give us " @@ -1561,7 +1561,7 @@ msgid "settings.profile.email_messages" msgstr "Benachrichtige mich bei neuen privaten Nachrichten." msgid "settings.profile.email_by_human_allowed" -msgstr "Erlaube Himmel-Crittern mich per E-Mail zu kontaktieren." +msgstr "Erlaube Info Desk-Crittern mich per E-Mail zu kontaktieren." msgid "settings.profile.email_goodie" msgstr "Um gegebenenfalls Voucher für das nächste gleichartige Event zu erhalten stimme ich zu, " @@ -1791,7 +1791,7 @@ msgid "faq.faq" msgstr "FAQ" msgid "faq.questions_link" -msgstr "Wenn deine Frage hier nicht beantwortet wurde, frag den Himmel." +msgstr "Wenn deine Frage hier nicht beantwortet wurde, frag den Info Desk." msgid "faq.edit" msgstr "FAQ Eintrag bearbeiten" @@ -2018,7 +2018,7 @@ msgstr "" "entfernt eine Benutzer Info die nicht-angekommen Nachricht im Systemmenü des Critters." msgid "user_info.not_arrived_hint" -msgstr "Wenn du dich für Schichten eintragen willst, komm gerne im Himmel vorbei." +msgstr "Wenn du dich für Schichten eintragen willst, komm gerne beim Info Desk vorbei." msgid "design.title" msgstr "Design" @@ -2058,7 +2058,7 @@ msgstr "Es wurde noch kein Crittertyp erstellt. Ohne können keine Schichten ers msgid "shift.sign_out.hint" msgstr "Du kannst dich bis %s Stunden vor dem Start der Schicht austragen. " -"Wenn du nicht zu deiner Schicht kommen kannst, lass dich vom Himmel austragen." +"Wenn du nicht zu deiner Schicht kommen kannst, lass dich vom Info Desk austragen." msgid "Password reset in progress" msgstr "Passwort zurücksetzen aktiv" @@ -2066,16 +2066,16 @@ msgstr "Passwort zurücksetzen aktiv" msgid "freeload.info.goodie" msgstr "Du warst bei dieser Schicht nicht anwesend. " "Die doppelte Länge der Schicht wurde von deinem %s abgezogen. " -"Bitte wende dich bei Fragen an den Himmel." +"Bitte wende dich bei Fragen an den Info Desk." msgid "freeload.info" msgstr "Du warst bei dieser Schicht nicht anwesend. " -"Bitte wende dich bei Fragen an den Himmel." +"Bitte wende dich bei Fragen an den Info Desk." msgid "freeload.freeloader.info" msgstr "" "Du warst bei mindestens %s Schichten nicht anwesend. Deshalb ist die Schicht-Registrierung " -"gesperrt. Bitte gehe zum Himmel um wieder entsperrt zu werden." +"gesperrt. Bitte gehe zum Info Desk um wieder entsperrt zu werden." msgid "freeload.freeloaded.info.goodie" msgstr "" diff --git a/resources/lang/en_US/additional.po b/resources/lang/en_US/additional.po index 8c6c7f2e9..67bea12dc 100644 --- a/resources/lang/en_US/additional.po +++ b/resources/lang/en_US/additional.po @@ -10,7 +10,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "auth.not-found" -msgstr "No user was found or password is wrong. Please try again. If you are still having problems, ask Heaven." +msgstr "No user was found or password is wrong. Please try again. If you are still having problems, ask the Info Desk." msgid "validation.password.required" msgstr "The password is required." diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po index d863e0857..e36032440 100644 --- a/resources/lang/en_US/default.po +++ b/resources/lang/en_US/default.po @@ -340,7 +340,7 @@ msgid "settings.profile.email_messages" msgstr "Notify me on new private messages." msgid "settings.profile.email_by_human_allowed" -msgstr "Allow heaven critters to contact me by e-mail." +msgstr "Allow Info Desk critters to contact me by e-mail." msgid "settings.profile.email_goodie" msgstr "To possibly receive vouchers for the next similar event, I consent " @@ -576,7 +576,7 @@ msgid "faq.faq" msgstr "FAQ" msgid "faq.questions_link" -msgstr "If you don't find an answer, you can ask the heaven." +msgstr "If you don't find an answer, you can ask the Info Desk." msgid "faq.edit" msgstr "Edit FAQ entry" @@ -845,7 +845,7 @@ msgstr "" "If an angel is not marked as arrived a user-info removes the not-arrived notification in the angels sysmenu." msgid "user_info.not_arrived_hint" -msgstr "If you want to sign up for shifts, feel free to drop by heaven." +msgstr "If you want to sign up for shifts, feel free to drop by the Info Desk." msgid "email.greeting" msgstr "Hi %s," @@ -1012,19 +1012,19 @@ msgstr "No crittertype has been created yet. Shifts can't be created without one msgid "shift.sign_out.hint" msgstr "You can self sign out up to %s hours before the start of the shift. " -"If you can't attend your shift, ask heaven to sign you out." +"If you can't attend your shift, ask Info Desk to sign you out." msgid "freeload.info.goodie" msgstr "You were not present for this shift. " -"The double length of the shift was deducted from your %s. Please contact heaven if you have questions." +"The double length of the shift was deducted from your %s. Please contact the Info Desk if you have questions." msgid "freeload.info" msgstr "You were not present for this shift. " -"Please contact heaven if you have questions." +"Please contact Info Desk if you have questions." msgid "freeload.freeloader.info" msgstr "You were not present for at least %s shifts. Therefore, shift registration is blocked. " -"Please go to heaven to be unlocked again." +"Please go to Info Desk to be unlocked again." msgid "freeload.freeloaded.info.goodie" msgstr "" diff --git a/resources/views/layouts/maintenance.html b/resources/views/layouts/maintenance.html index 4f4b4732f..edd6cba90 100644 --- a/resources/views/layouts/maintenance.html +++ b/resources/views/layouts/maintenance.html @@ -47,7 +47,7 @@

This may be due to