diff --git a/src/plainui/jinja2/plainui/channel_events.html.j2 b/src/plainui/jinja2/plainui/channel_events.html.j2
deleted file mode 100644
index 7581cb7e7061a5ace5f4e0bdffd7a880a9dd5330..0000000000000000000000000000000000000000
--- a/src/plainui/jinja2/plainui/channel_events.html.j2
+++ /dev/null
@@ -1,131 +0,0 @@
-{% extends "plainui/base.html.j2" %}
-{% import "plainui/components/markdown.html.j2" as markdownMacro %}
-{% import "plainui/components/list_events.html.j2" as listEventsMacro with context %}
-{% from "plainui/components/calendar.html.j2" import calendar with context %}
-{% block head %}
- <script src="{{ static('plainui/js/player.js') }}"></script>
- <script async src="{{ static('plainui/js/modal.js') }}"></script>
-{% endblock head %}
-{% block title %}
- {{ conf.name }} - {{ _("Main Program") }}
-{% endblock title %}
-{% block content %}
- {{ titleMacro.title(title=_("Main Program") ) }}
-
- <div class="d-flex flex-row-reverse p-3">
- <a href="{{ url('plainui:public_fahrplan') }}"
- target="_blank"
- role="button"
- class="btn btn-black">{{ _("Fahrplan in new Tab") }}</a>
- </div>
-
- {% for room in rooms_active %}
- <div class="hub-event-overview border mb-3">
- <h3 class="bg-secondary px-3 py-1 text-dark h3 m-0 text-center">{{ _("Room %(room)s", room=room.room.name) }}</h3>
- <div class="hub-event-overview-body p-2">
- <dl class="grid-list mb-0">
- <dt class="grid-list__item grid-list__item--title">{{ _("Event") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- <p>
- {{ room.current_event.name }}
- {% if room.current_event.language %}
- <span class="fs-medium">[{{ room.current_event.language | escape }}]</span>
- {% endif %}
- <br>
- <a href="{{ url('plainui:room', slug=room.room.slug) }}"
- class="a a-bold">{{ _("participate") }}</a> //
- <a class="a a-bold"
- href="{{ url('plainui:event', event_slug=room.current_event.slug) }}">{{ _("details") }}</a>
- </p>
- </dd>
-
- <dt class="grid-list__item grid-list__item--title">{{ _("Time") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- {{ room.current_event.schedule_start | strfdates }} {{ room.current_event.schedule_start | strftimehm }} - {{ room.current_event.schedule_end | strftimehm }}
- </dd>
-
- <dt class="grid-list__item grid-list__item--title">{{ _("Abstract") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- {% if room.current_event.abstract %}
- {{ room.current_event.abstract | escape }}
- {% else %}
- -
- {% endif %}
- </dd>
-
- <dt class="grid-list__item grid-list__item--title">{{ _("Speakers") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- {{ room.current_event.get_all_speaker_names() | join(', ') | escape }}
- </dd>
- </dl>
- {% if room.next_event %}
- <div>
- <h3 class="py-1 text-white font-sans-serif h3 m-0 mb-2 bg-secondary text-dark text-center">{{ _("Upcoming") }}</h3>
- <dl class="mb-0">
- <dt class="grid-list__item grid-list__item--title">{{ _("Event") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- <p>
- {{ room.next_event.name }}
- <br>
- <a href="{{ url('plainui:room', slug=room.room.slug) }}"
- class="a a-bold">{{ _("participate") }}</a> //
- <a class="a a-bold"
- href="{{ url('plainui:event', event_slug=room.next_event.slug) }}">{{ _("details") }}</a>
- </p>
- </dd>
-
- <dt class="grid-list__item grid-list__item--title">{{ _("Time") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- {{ room.next_event.schedule_start | strfdates }} {{ room.next_event.schedule_start | strftimehm }} - {{ room.next_event.schedule_end | strftimehm }}
- </dd>
- </dl>
- </div>
- {% endif %}
- </div>
- </div>
- {% endfor %}
- {% if rooms_active %}
- <div class="d-flex m-0 mb-3 text-center w-100">
- <a href="{{ url('plainui:public_fahrplan') }}"
- target="_blank"
- role="button"
- class="mr-2 a a-bold">{{ _("Fahrplan in new Tab") }}</a>
- </div>
- <hr class="hub-spacer">
- {% endif %}
-
- {% for room in rooms_inactive %}
- <div class="hub-event-overview border mb-3">
- <h3 class="bg-secondary px-3 py-1 text-dark h3 m-0 text-center">{{ _("Room %(room)s", room=room.room.name) }}</h3>
- <div class="hub-event-overview-body p-2">
- <div>
- <p>no running event</p>
- </div>
- {% if room.next_event %}
- <div>
- <h3 class="py-1 text-white font-sans-serif h3 m-0 mb-2 bg-secondary text-dark text-center">{{ _("Upcoming") }}</h3>
- <dl class="mb-0">
- <dt class="grid-list__item grid-list__item--title">{{ _("Event") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- <p>
- {{ room.next_event.name }}
- <br>
- <a href="{{ url('plainui:room', slug=room.room.slug) }}"
- class="a a-bold">{{ _("participate") }}</a> //
- <a class="a a-bold"
- href="{{ url('plainui:event', event_slug=room.next_event.slug) }}">{{ _("details") }}</a>
- </p>
- </dd>
-
- <dt class="grid-list__item grid-list__item--title">{{ _("Time") }}</dt>
- <dd class="grid-list__item grid-list__item--text">
- {{ room.next_event.schedule_start | strfdates }} {{ room.next_event.schedule_start | strftimehm }} - {{ room.next_event.schedule_end | strftimehm }}
- </dd>
- </dl>
- </div>
- {% endif %}
- </div>
- </div>
- {% endfor %}
-
-{% endblock content %}
diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po
index b8649d310cd1a92de7387c2bdc3cd5927e3aa45e..185d4bb8a37e3f353d751faf0232c546c192ba39 100644
--- a/src/plainui/locale/de/LC_MESSAGES/django.po
+++ b/src/plainui/locale/de/LC_MESSAGES/django.po
@@ -264,33 +264,6 @@ msgstr "Board-Eintrag bearbeiten"
msgid "Save"
msgstr "Speichern"
-msgid "Main Program"
-msgstr "Hauptprogramm"
-
-msgid "Fahrplan in new Tab"
-msgstr "Fahrplan in neuem Tab"
-
-msgid "Event"
-msgstr "Veranstaltungen"
-
-msgid "participate"
-msgstr "teilnehmen"
-
-msgid "details"
-msgstr "Details"
-
-msgid "Time"
-msgstr "Zeit"
-
-msgid "Abstract"
-msgstr "Zusammenfassung"
-
-msgid "Speakers"
-msgstr "Speaker"
-
-msgid "Upcoming"
-msgstr "Demnächst"
-
msgid "Avatar image"
msgstr "Avatar Bild"
@@ -307,11 +280,14 @@ msgid "Save visibility"
msgstr "Sichtbarkeit speichern"
msgid "index__box-whats_happening__fahrplan_link"
-msgstr "Fahrplan anschauen"
+msgstr "Schedule anschauen"
msgid "No entries available."
msgstr "Keine Einträge vorhanden."
+msgid "Speakers"
+msgstr "Speaker"
+
msgid "No Speakers published yet"
msgstr "Noch keine Speaker bekannt gegeben"
@@ -489,7 +465,7 @@ msgid "platform"
msgstr "Plattform"
msgid "fahrplan"
-msgstr "Fahrplan"
+msgstr "Schedule"
msgid "info"
msgstr "Wiki"
@@ -696,7 +672,7 @@ msgid "Registration"
msgstr "Registrierung"
msgid "Registration Info Text"
-msgstr "Hier kannst du einen Account anlegen. Nach der Bestätigung der eingegebenen E-Mail-Adresse kannst du auch self-organized Sessions anlegen, deinen persönlichen Fahrplan zusammenstellen und noch ein wenig mehr ..."
+msgstr "Hier kannst du einen Account anlegen. Nach der Bestätigung der eingegebenen E-Mail-Adresse kannst du auch self-organized Sessions anlegen, deinen persönlichen Schedule zusammenstellen und noch ein wenig mehr ..."
msgid "Create Account"
msgstr "Neues Konto erstellen"
@@ -813,6 +789,9 @@ msgstr "Kommt bald"
msgid "under_construction__box-not_yet_published__paragraph"
msgstr "An dieser Stelle entsteht gerade der Hub für den 38c3, bitte gedulde dich noch etwas."
+msgid "Upcoming"
+msgstr "Demnächst"
+
msgid "Send PN"
msgstr "DN senden"
@@ -914,10 +893,6 @@ msgstr "fehlend"
msgid "BadgeToken"
msgstr "Einlöse-Token"
-#, python-format
-msgid "Room %(room)s"
-msgstr "Raum %(room)s"
-
#, python-format
msgid "Avatar of %(name)s"
msgstr "Avatar von %(name)s"
@@ -959,11 +934,14 @@ msgstr "privat"
msgid "Follow & Allow '%(domain)s' permanently"
msgstr "folgen & erlaube '%(domain)s' immer"
+msgid "Event"
+msgstr "Veranstaltungen"
+
msgid "Fahrplan"
-msgstr "Fahrplan"
+msgstr "Schedule"
msgid "My Fahrplan"
-msgstr "Mein Fahrplan"
+msgstr "Mein Schedule"
msgid "curated only"
msgstr "nur Kuratierte"
@@ -1021,11 +999,11 @@ msgstr "Projekt"
#, python-format
msgid "%(conf)s - Public Fahrplan"
-msgstr "%(conf)s - Öffentlicher Fahrplan"
+msgstr "%(conf)s - Öffentlicher Schedule"
#, python-format
msgid "%(conf)s Fahrplan"
-msgstr "%(conf)s Fahrplan"
+msgstr "%(conf)s Schedule"
msgid "Redeem Badge Token"
msgstr "Badge Einlöse-Token"
diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po
index 8aa86f91824b60ee667a722e7a53fdf3663caafa..a43b4716ab87f99eeb3bed7829e75efdc5696b28 100644
--- a/src/plainui/locale/en/LC_MESSAGES/django.po
+++ b/src/plainui/locale/en/LC_MESSAGES/django.po
@@ -264,33 +264,6 @@ msgstr ""
msgid "Save"
msgstr ""
-msgid "Main Program"
-msgstr ""
-
-msgid "Fahrplan in new Tab"
-msgstr ""
-
-msgid "Event"
-msgstr ""
-
-msgid "participate"
-msgstr ""
-
-msgid "details"
-msgstr ""
-
-msgid "Time"
-msgstr ""
-
-msgid "Abstract"
-msgstr ""
-
-msgid "Speakers"
-msgstr ""
-
-msgid "Upcoming"
-msgstr ""
-
msgid "Avatar image"
msgstr ""
@@ -312,6 +285,9 @@ msgstr "view the schedule"
msgid "No entries available."
msgstr ""
+msgid "Speakers"
+msgstr ""
+
msgid "No Speakers published yet"
msgstr ""
@@ -813,6 +789,9 @@ msgstr "Under Construction"
msgid "under_construction__box-not_yet_published__paragraph"
msgstr "The hub for the 38c3 is currently being built here, please be patient."
+msgid "Upcoming"
+msgstr ""
+
msgid "Send PN"
msgstr "Send DN"
@@ -914,10 +893,6 @@ msgstr "missing"
msgid "BadgeToken"
msgstr "Redeem token"
-#, python-format
-msgid "Room %(room)s"
-msgstr ""
-
#, python-format
msgid "Avatar of %(name)s"
msgstr "Avatar of %(name)s"
@@ -959,6 +934,9 @@ msgstr ""
msgid "Follow & Allow '%(domain)s' permanently"
msgstr ""
+msgid "Event"
+msgstr ""
+
msgid "Fahrplan"
msgstr "Schedule"
diff --git a/src/plainui/urls.py b/src/plainui/urls.py
index 57127fa8d5da180fbf5ac614b3698ec6f8d009ab..e01e89dd1f6af4e34b0e183bf0236048935a0f88 100644
--- a/src/plainui/urls.py
+++ b/src/plainui/urls.py
@@ -50,7 +50,8 @@ urlpatterns = [
path('board/<int:pk>', views.BoardEntryView.as_view(), name='board_entry'),
path('board/<int:pk>/edit', views.BoardEntryEditView.as_view(), name='board_entry_edit'),
path('board/<int:pk>/delete', views.BoardEntryDeleteView.as_view(), name='board_entry_delete'),
- path('fahrplan', views.FahrplanView.as_view(), name='fahrplan'),
+ path('fahrplan', views.FahrplanView.as_view()),
+ path('schedule', views.FahrplanView.as_view(), name='fahrplan'),
path('modify_favorites', views.ModifyFavoritesView.as_view(), name='modify_favorites'),
path('modify_theme', views.ModifyThemeView.as_view(), name='modify_theme'),
path('index', views.IndexView.as_view(), name='index'),