Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/ILIAS/Mail/classes/class.ilMailFolderGUI.php
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ protected function showFolder(): void
if ($this->folder->isInbox()) {
$mail_options = new ilMailOptions($this->user->getId());
if ($mail_options->getIncomingType() === ilMailOptions::INCOMING_EMAIL) {
$message_box = $this->ui_factory->messageBox()->info($this->lng->txt('incoming_local_no_new_mails_inbox'));
$message_box = $this->ui_factory->messageBox()->info($this->lng->txt('mail_inbox_external_delivery_only_info'));
$components = [$message_box, ...$components];
}
}
Expand Down
2 changes: 1 addition & 1 deletion lang/ilias_de.lang
Original file line number Diff line number Diff line change
Expand Up @@ -11498,7 +11498,6 @@ mail#:#deleteTemplate#:#Löschen
mail#:#first_email_missing_info#:#Auswahl nicht möglich, da keine E-Mail-Adresse eingetragen wurde
mail#:#forward#:#Weiterleiten
mail#:#goto_invitation_chat#:#Chatraum öffnen
mail#:#incoming_local_no_new_mails_inbox#:#Ihr Konto ist so konfiguriert, dass E-Mails an Ihre E-Mail-Adresse empfangen werden. <br>Sie können E-Mails in diesem Posteingang nur sehen, wenn Ihr Konto so konfiguriert ist, dass diese lokal empfangen werden.
mail#:#invite_to_chat#:#in Chat einladen
mail#:#link_check_affected_links#:#Betroffene Links
mail#:#link_check_introduction#:#die folgenden Externen Links sind ungültig:
Expand Down Expand Up @@ -11603,6 +11602,7 @@ mail#:#mail_global_reply_to_addr#:#Reply-To
mail#:#mail_global_reply_to_addr_info#:#Bitte tragen Sie hier die gewünschte 'Reply-To'-E-Mail-Adresse ein.
mail#:#mail_grp_roles#:#alle Personen mit folgenden lokalen Rollen. Label is now generalised for all components that support ‘mail to members‘
mail#:#mail_hint_add_placeholder_x#:#Füge Platzhalter „%s“ in den Textkörper der Nachricht ein.
mail#:#mail_inbox_external_delivery_only_info#:#Ihr Konto ist so konfiguriert, dass E-Mails an Ihre E-Mail-Adresse gesendet werden. <br>Sie können E-Mails in diesem Posteingang nur sehen, wenn Ihr Konto so konfiguriert ist, dass diese (auch) lokal empfangen werden.
mail#:#mail_incoming#:#Maileingang
mail#:#mail_incoming_both#:#Lokal und Weiterleitung an E-Mail
mail#:#mail_incoming_local#:#Nur lokal empfangen
Expand Down
4 changes: 2 additions & 2 deletions lang/ilias_en.lang
Original file line number Diff line number Diff line change
Expand Up @@ -11499,7 +11499,6 @@ mail#:#deleteTemplate#:#Delete
mail#:#first_email_missing_info#:#Selection not possible because no e-mail address has been entered
mail#:#forward#:#Forward
mail#:#goto_invitation_chat#:#Open Chat Room
mail#:#incoming_local_no_new_mails_inbox#:#Your account is configured to receive mails to your mail address. <br>You can only see mails in this inbox if your account is configured to receive them locally.
mail#:#invite_to_chat#:#Invite to Chat
mail#:#link_check_affected_links#:#Affected Links
mail#:#link_check_introduction#:#the following weblinks are invalid:
Expand Down Expand Up @@ -11604,6 +11603,7 @@ mail#:#mail_global_reply_to_addr#:#Reply-To
mail#:#mail_global_reply_to_addr_info#:#Please enter the desired 'Reply-To' address.
mail#:#mail_grp_roles#:#Send Mail to Group Roles
mail#:#mail_hint_add_placeholder_x#:#Add the placeholder '%s' to the message body.
mail#:#mail_inbox_external_delivery_only_info#:#Your account is configured to receive messages at an external email address.<br>You can only see mails in this inbox if your account is configured to (also) receive them locally.
mail#:#mail_incoming#:#Incoming Mail
mail#:#mail_incoming_both#:#Receive Mail Locally and Forward to:
mail#:#mail_incoming_local#:#Receive Mail Locally Only
Expand Down Expand Up @@ -15095,7 +15095,7 @@ rep#:#rep_fav_intro1#:#You have not yet selected any favourites. To do so, there
rep#:#rep_fav_intro2#:#Click on '%s' and select a learning object from those available, for example a learning module or a forum.
rep#:#rep_fav_intro3#:#When you have found something that interests you, you can easily add it to your favourites. Select the desired item in the <i>Actions</i> menu and select "<i>Add to favourites</i>".
rep#:#rep_favourites#:#Favourites
rep#:#rep_favourites_info#:#Users can mark individual repository items as favourites. A 'Favourites' list can be activated for the dashboard and the main menu.
rep#:#rep_favourites_info#:#Users can mark individual repository items as favourites. A 'Favourites' list can be activated for the dashboard and the main menu.
rep#:#rep_input_not_empty#:#This field must not be empty, please provide a value.
rep#:#rep_intro#:#Welcome to the Repository!
rep#:#rep_intro1#:#In this area you can create learning and working resources for all users. All resources are organised in categories. Categories can reflect the structure of your organisation (e.g. departments), a hierarchy of disciplines, or classes of a school.
Expand Down
Loading