diff --git a/resources/lang/en_US/additional.po b/resources/lang/en_US/additional.po
index df1bb12..9a534e0 100644
--- a/resources/lang/en_US/additional.po
+++ b/resources/lang/en_US/additional.po
@@ -252,7 +252,7 @@ msgid "notification.angeltype.added.text"
msgstr "You can find a description at %2$s"
msgid "angeltype.add.success"
-msgstr "Successfully joined angel type"
+msgstr "Successfully joined elf type"
msgid "notification.shift.deleted"
msgstr "Your shift was deleted"
@@ -385,7 +385,7 @@ msgid "config.features"
msgstr "Features"
msgid "config.enable_dect.info"
-msgstr "Enables DECT numbers for users, locations and angel types"
+msgstr "Enables DECT numbers for users, locations and elf types"
msgid "config.enable_mobile_show"
msgstr "Display mobile number"
@@ -460,13 +460,13 @@ msgid "config.supporters_can_promote"
msgstr "Supporters can promote"
msgid "config.supporters_can_promote.info"
-msgstr "Supporters of an angel type (team) can promote other users of the angel type to supporter"
+msgstr "Supporters of an elf type (team) can promote other users of the elf type to supporter"
msgid "config.join_qr_code"
msgstr "Join QR code"
msgid "config.join_qr_code.info"
-msgstr "Allow joining an angel type via generated QR code, requires app_key"
+msgstr "Allow joining an elf type via generated QR code, requires app_key"
msgid "config.certificates"
msgstr "Certificates"
@@ -738,7 +738,7 @@ msgid "config.jwt_expiration_time"
msgstr "JWT expiration time in minutes"
msgid "config.jwt_expiration_time.info"
-msgstr "Number of minutes after a JWT must expire, for example max angel type join time"
+msgstr "Number of minutes after a JWT must expire, for example max elf type join time"
msgid "config.guzzle_timeout"
msgstr "HTTP request timeout"
diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po
index eec1286..be6ef50 100644
--- a/resources/lang/en_US/default.po
+++ b/resources/lang/en_US/default.po
@@ -19,8 +19,8 @@ msgstr ""
# Translated plural form must exist to be shown
msgid "There are unconfirmed angels in %d angel type. Angel type that needs approval:"
msgid_plural "There are unconfirmed angels in %d angel types. Angel types that need approval:"
-msgstr[0] "There are unconfirmed angels in %d angel type. Angel type that needs approval:"
-msgstr[1] "There are unconfirmed angels in %d angel types. Angel types that need approval:"
+msgstr[0] "There are unconfirmed elves in %d elf type. Elf type that needs approval:"
+msgstr[1] "There are unconfirmed elves in %d elf types. Elf types that need approval:"
# Translated plural form must exist to be shown
msgid "%d helper needed"
@@ -194,7 +194,7 @@ msgid "schedule.shift-type"
msgstr "Shift type"
msgid "schedule.needed-from-shift-type"
-msgstr "Load angel types from shift type (else from location)"
+msgstr "Load elf types from shift type (else from location)"
msgid "schedule.minutes-before"
msgstr "Add minutes before talk begins"
@@ -332,7 +332,7 @@ msgid "settings.profile.pronoun"
msgstr "Pronoun"
msgid "settings.profile.pronoun.info"
-msgstr "Will be shown on your profile page and in angel lists."
+msgstr "Will be shown on your profile page and in elf lists."
msgid "settings.profile.firstname"
msgstr "First name"
@@ -378,7 +378,7 @@ msgid "settings.profile.email_messages"
msgstr "Notify me on new private messages."
msgid "settings.profile.email_by_human_allowed"
-msgstr "Allow Heaven Angels to contact me by e-mail."
+msgstr "Allow Infodesk elves to contact me by e-mail."
msgid "settings.profile.email_goodie"
msgstr "To possibly receive vouchers for the next similar event, I consent "
@@ -403,7 +403,7 @@ msgid "settings.profile.shirt.link"
msgstr "More information"
msgid "settings.profile.angeltypes.info"
-msgstr "You can manage your angel types here."
+msgstr "You can manage your elf types here."
msgid "profile.my_shifts"
msgstr "My shifts"
@@ -534,22 +534,22 @@ msgid "angeltype.ifsg.own"
msgstr "My health instruction"
msgid "angeltype.ifsg.required.info.preview"
-msgstr "This angel type requires a health instruction."
+msgstr "This elf type requires a health instruction."
msgid "angeltype.ifsg.required.info"
-msgstr "This angel type requires a health instruction. Please enter your health instruction information!"
+msgstr "This elf type requires a health instruction. Please enter your health instruction information!"
msgid "angeltype.ifsg.required.info.here"
-msgstr "You joined an angel type which requires a health instruction. "
+msgstr "You joined an elf type which requires a health instruction. "
"Please edit your health instruction information here: %s."
msgid "angeltype.driving_license.required.info.here"
msgstr ""
-"You joined an angel type which requires a driving license. "
+"You joined an elf type which requires a driving license. "
"Please edit your driving license information here: %s."
msgid "angeltype.driving_license.required.info.preview"
-msgstr "This angel type requires a driver's license."
+msgstr "This elf type requires a driver's license."
msgid "ifsg.info"
msgstr "Health instruction information"
@@ -710,7 +710,7 @@ msgid "message.title"
msgstr "Messages"
msgid "message.choose_angel"
-msgstr "Choose an Angel"
+msgstr "Choose an elf"
msgid "message.to_conversation"
msgstr "To Conversation"
@@ -719,7 +719,7 @@ msgid "message.message"
msgstr "Message"
msgid "angel"
-msgstr "Angel"
+msgstr "elf"
msgid "worklog.add"
msgstr "Add work log"
@@ -752,10 +752,10 @@ msgid "voucher.edit"
msgstr "Edit vouchers"
msgid "voucher.eligible"
-msgstr "Angel can receive another %d vouchers."
+msgstr "Elf can receive another %d vouchers."
msgid "voucher.eligible.force"
-msgstr "Angel can receive %d unlimited vouchers."
+msgstr "Elf can receive %d unlimited vouchers."
msgid "voucher.count"
msgstr "Number of vouchers handed out"
@@ -767,7 +767,7 @@ msgid "user.state.vouchers.force"
msgstr " %d unlimited"
msgid "angeltypes.angeltypes"
-msgstr "Angel types"
+msgstr "Elf types"
msgid "angeltypes.about"
msgstr "Team/Task description"
@@ -780,19 +780,19 @@ msgid "angeltypes.restricted"
msgstr "Requires introduction"
msgid "angeltypes.restricted.info"
-msgstr "Angel types that require introduction can only be joined by Angels "
+msgstr "Elf types that require introduction can only be joined by elves"
"after being enabled by a supporter (double opt-in)."
msgid "angeltypes.restricted.hint"
-msgstr "This angel type requires attendance at an introduction meeting. "
+msgstr "This elf type requires attendance at an introduction meeting. "
"You might find additional information in the description."
msgid "angeltypes.can-change-later"
msgstr "You can change your selection later in the settings."
msgid "angeltypes.shift.self_signup.info"
-msgstr "Angel types with shift self-signup enabled allow Angels to sign up for their own shifts. "
-"If shift self-signup is disabled, only supporters and admins can assign Angels to shifts for these angel types."
+msgstr "Elf types with shift self-signup enabled allow elves to sign up for their own shifts. "
+"If shift self-signup is disabled, only supporters and admins can assign elves to shifts for these elf types."
msgid "shift.self_signup"
msgstr "Shift self-signup"
@@ -804,11 +804,11 @@ msgid "angeltypes.hide_on_shift_view"
msgstr "Hide on shift view"
msgid "angeltypes.hide_on_shift_view.info"
-msgstr "If checked, only admins and members of the angel type "
-"can see the filter option for this angel type on the shifts page."
+msgstr "If checked, only admins and members of the elf type "
+"can see the filter option for this elf type on the shifts page."
msgid "angeltypes.qr"
-msgstr "Join angel type \"%s\" QR code"
+msgstr "Join elf type \"%s\" QR code"
msgid "angeltypes.qr.expires"
msgstr "Expires %c"
@@ -832,7 +832,7 @@ msgid "location.map_url"
msgstr "Map"
msgid "location.required_angels"
-msgstr "Required angels (on schedule import or copy)"
+msgstr "Required elves (on schedule import or copy)"
msgid "location.map_url.info"
msgstr "The map will be embedded on the location page as an iframe."
@@ -859,7 +859,7 @@ msgid "shifttype.delete.title"
msgstr "Delete shift type \"%s\""
msgid "shifttype.required_angels"
-msgstr "Required angels (on schedule import or copy)"
+msgstr "Required elves (on schedule import or copy)"
msgid "shifttype.edit.signup_advance_hours"
msgstr "Self signup advance hours"
@@ -874,7 +874,7 @@ msgid "dashboard.day"
msgstr "Day"
msgid "registration.title"
-msgstr "Angel registration"
+msgstr "Elf registration"
msgid "registration.login_data"
msgstr "Login data"
@@ -966,7 +966,7 @@ msgstr "User info"
msgid "user.info.hint"
msgstr ""
"Is displayed for shift coordinators and admins in the user view. "
-"If an Angel is not marked as arrived, a user info removes the not-arrived notification in the Angel's system menu."
+"If an elf is not marked as arrived, a user info removes the not-arrived notification in the elf's system menu."
msgid "user_info.not_arrived_hint"
msgstr "If you want to sign up for shifts, feel free to drop by Heaven."
@@ -1019,7 +1019,7 @@ msgid "general.shift"
msgstr "Shift"
msgid "shift.angeltype_source"
-msgstr "Needed angels from: %s"
+msgstr "Needed elves from: %s"
msgid "shift.angeltype_source.shift_type"
msgstr "Schedule %s via shift type %s"
@@ -1076,7 +1076,7 @@ msgid "login.cookies"
msgstr "Please note: You have to activate cookies!"
msgid "general.angel"
-msgstr "Angel"
+msgstr "Elf"
msgid "title.date"
msgstr "Date"
@@ -1135,7 +1135,7 @@ msgid "admin_shifts.no_shifttypes"
msgstr "No shift type has been created yet. Shifts cannot be created without one."
msgid "admin_shifts.no_angeltypes"
-msgstr "No angel type has been created yet. Shifts cannot be created without one."
+msgstr "No elf type has been created yet. Shifts cannot be created without one."
msgid "shift.sign_out.hint"
msgstr "You can sign yourself out up to %s hours before the start of the shift. "
@@ -1155,13 +1155,13 @@ msgstr "You were not present for at least %s shifts. Therefore, shift registrati
msgid "freeload.freeloaded.info.goodie"
msgstr ""
-"If an Angel was not present for a shift, double the shift length is deducted from the %s. "
-"If %s shifts are freeloaded, shift registration is blocked for the Angel."
+"If an elf was not present for a shift, double the shift length is deducted from the %s. "
+"If %s shifts are freeloaded, shift registration is blocked for the elf."
msgid "freeload.freeloaded.info"
msgstr ""
-"The Angel was not present for a shift. "
-"If %s shifts are freeloaded, shift registration is blocked for the Angel."
+"The elf was not present for a shift. "
+"If %s shifts are freeloaded, shift registration is blocked for the elf."
msgid "config.config"
msgstr "Config"