Update Mo-Phase und Bachleor-Ophase, auch in Englisch jetzt

content/studies/ophase/_index.en.md

@@ -7,19 +7,58 @@ menu:
 showDate: true
 ---
 
-{{< unsafe >}}
-<p><br/><a type="button" class="btn btn-success" href='bachelor'>More information about the upcoming Bachelor O-Phase 2024</a><br/></p>
-{{</ unsafe >}}
-
 
 ## What is the O-Phase?
-The orientation phase, or O-Phase for short, is a 1-2 week event that we organize for all prospective students at our faculty. During this week, we explain the basics of studying, show you around the campus and give you the opportunity to get a first insight into the many institutes of our faculty.
+The orientation phase, or O-Phase for short, is a 1-2 week event that we organize for all prospective students at our Faculty of Electrical Engineering and Information Technology (ETIT). During this week, we explain everything you need to know about studying, show you around the campus and give you the opportunity to get a first impression of the many institutes in our faculty.
 Above all, the O-Phase is a week full of fun! Here you have the chance to get to know your new fellow students.
+The O-Phase is divided into the Bachelor O-Phase and the Master O-Phase. Although these two events overlap to some extent, they are aimed at either Bachelor's or Master's first-year students. The following text will mainly refer to the Bachelor's O-Phase, but is also applicable to the Master's O-Phase, unless described in more detail.
 
 
 ## When?
-The Bachelor O-Phase takes place in the week or two weeks before the start of lectures in October. The Master O-Phase "MoPhase" is happening in the winter as well as the summer term. The winter semester Master O-Phase takes place in the week before the first week of lectures of the winter semester in October. The summer semester Master O-Phase takes place in the week before the first week of lectures of the summer semester in April.
-All new students enrolled in a Bachelor's or Master's program of our faculty will receive an invitation to the O-Phase a few weeks before the O-Phase. 
+The Bachelor O-Phase takes place from 07.10.2024 to 18.10.2024. The Master O-Phase “MoPhase” takes place in both the winter semester and the summer semester. The Master O-Phase is expected to take place in the week before the lectures (14.10. to 18.10).
+
+## How do I take part?
+If you have enrolled at KIT in Electrical Engineering, Medical Engineering or Mechatronics for the winter semester 2024/25, you will soon receive an e-mail containing all the important information and a link to register for the O-Phase.
+
+
+## Do I have to take part in the O-Phase?
+In itself, the O-Phase is not a compulsory event, but we strongly recommend that you take part. You will never again have such a good opportunity to get to know fellow students, the university and the city during your studies. Most students describe the O-Phase as the best time of their studies. Don't miss it under any circumstances!
+
+
+## What does the O phase consist of?
+The O-Phase consists of a two-week mix of information, get-to-know-you and fun events. You can find a detailed list of events in our Bachelor O-Phase calendar (Master O-Phase calendar)
+
+## Who organizes the O-Phase?
+The ETIT student council organizes the O-Phases. The ETIT student council is the student representation of all students of the ETIT faculty, i.e. students of electrical engineering, medical engineering and mechatronics. We are students who are committed to the student body alongside their studies. We organize the O-Phase and parties, represent the students' opinions to the university and advise students.
+If you want to find out more about us, you can read [here](https://bestefachschaftderwelt.de/about-us/who-are-we/) and [here](https://bestefachschaftderwelt.de/about-us/was-machen-wir/).
+If you want to get socially involved during your studies and do voluntary work, then you've come to the right place. If you want to find out more about joining the student council, you can find out more [here](https://bestefachschaftderwelt.de/about-us/participate/).
+
+If you have any questions about the O-Phase, you can contact the O-Phase organization directly at “o-phase@fs-etit.kit.edu”.
+
+Since mechatronics is a joint degree program of electrical engineering and mechanical engineering, the [Arbeitskreis Mechatronik](https://ak-mit.vs.kit.edu/) coordinates a combination of the O-phases of both faculties for mechatronics students, in which mechatronics students get all the highlights of both O-phases.
+
+The organizer of the O-phases in the legal sense is the Fachschaft Elektro- und Informationstechnik Karlsruhe Kasse e.V.
+
+## How can I help?
+If you are already studying in the ETIT faculty, you can participate as a tutor in the Bachelor-O-Phase. You can find the link to register [here](https://survey.fs-etit.kit.edu/252681?lang=de-informal). You can find all the information you need in the [Info for tutors](/infos_fuer_tutoren.pdf).
+
+You can find the link to register for the Master O-Phase [here](https://survey.fs-etit.kit.edu/895248?lang=de-informal).
+
+
+## Do I have to prepare/pay anything for the O-Phase?
+No. Taking part is everything. Participation in the O-Phase is completely free of charge. Only at some events do the drinks and food cost something. It is therefore best to always have some cash with you. You don't have to prepare for the O-Phase.
+
+## How do I join the O-Phase WhatsApp group and the O-Phase Discord?
+We will put the links for our WA groups and our Discord in the invitation email. These links will not be published anywhere else!!! All other WA groups are unofficial. Unfortunately, for some years now, some companies have been creating unofficial freshman groups in order to sell advertising in these groups to other companies.
+
+
+{{< unsafe >}}
+<p><br/><a type="button" class="btn btn-success" href='bachelor'>More information about the upcoming Bachelor O-Phase 2024</a><br/></p>
+{{</ unsafe >}}
+
+{{< unsafe >}}
+<p><br/><a type="button" class="btn btn-success" href='master'>More information about the upcoming Master O-Phase 2024</a><br/></p>
+{{</ unsafe >}}
 
 **Below, you'll find the slides of our introductory events from April 2024:**
 - [MIT](/IntroEvent_MIT.pdf)

content/studies/ophase/_index.md

@@ -46,6 +46,8 @@ Veranstalter der O-Phasen im rechtlichen Sinne ist der Fachschaft Elektro- und I
 ## Wie kann ich helfen?
 Wenn du bereits in der Fakultät ETIT studierst kannst du dich als Tutor an der Bachelor-O-Phase beteiligen. Den Link zur Anmeldung findest du [hier](https://survey.fs-etit.kit.edu/252681?lang=de-informal). Alle Infos die du dafür benötigst kannst du in den [Infos für Tutoren](/infos_fuer_tutoren.pdf) nachlesen.
 
+Den Link zur Anmeldung zum helfen der Master O-Phase findest du [hier](https://survey.fs-etit.kit.edu/895248?lang=de-informal).
+
 
 ## Muss ich irgendwas für die O-Phase verbereiten/bezahlen?
 Nein. Dabeisein ist alles. Die Teilnahme an der O-Phase ist komplett kostenlos. Nur bei einigen Events kosten die Getränke und dass Essen etwas. Hab deswegen am besten immer ein bisschen Bargeld dabei. Vorbereiten musst du dich auf die O-Phase nicht.

content/studies/ophase/bachelor.md

@@ -43,7 +43,7 @@ Die Highlights der O-Phase sind:
 
 **Fakten mit Simon**
 
-- Wir zeigen Dir wie Du durch die Uni-IT navigierst, an welche Regularien Du und die Uni sich halten müssen und gibt Dir alle Informationen die du für ein erfolgreiches Studium benötigst.
+- Wir zeigen Dir wie Du durch die Uni-IT navigierst, an welche Regularien Du und die Uni sich halten müssen und geben Dir alle Informationen, die du für ein erfolgreiches Studium benötigst.
 
 
 

content/studies/ophase/master.en.md

@@ -3,8 +3,41 @@ title: "Master O-Phase"
 showDate: true
 ---
 
-Coming soon in english.
+The upcoming Master O phase will take place from 14.10.2024 to 18.10.2024 with various events on all days. You will find a calendar with a detailed list at the end of this text.
+
+In the following, we will briefly explain what awaits you at the individual events:
+
+**The introductory event**
+
+ - The faculty and the student council introduce themselves. We will also explain which events await you during the MO phase. The event will take place in the Engelbert-Arnold-Saal in the ETI (building 11.10) in Engelbert-Arnold-Straße 5, 76131 Karlsruhe.
+
+**Campus Tour**
+
+ - “Older” students will show you the campus.
+
+**BBQ**
+
+ - We will meet at the LTI-Hof (building 30.34) and end the evening with a barbecue. Unfortunately, due to budget restrictions, we cannot offer the food for free, so please bring some cash.
+
+**Facts with Simon**
+
+ - We will show you how to navigate through the university IT, which regulations you and the university have to adhere to and give you all the information you need for successful studies. Engelbert-Arnold-Saal, building 11.10.
+
+**O-Party**
+
+ - We have organized a big party for you at the AKK. Bring a good mood and some cash!
+
+**International breakfast**
+
+ - This breakfast is for international students to talk about the bureaucratic obstacles of studying at KIT or in Germany. The international bachelor students will also participate. Meeting point: Z10, Zähringerstraße 10, 76131 Karlsruhe.
+
+**Scavenger Hunt**
+
+ - Together with your team, you will solve puzzles around the campus and the city, getting to know the campus and the city once again. Afterwards there will be some karaoke in front of the student council. Meeting point in front of the student council (building 11.10).
+
+**Museum afternoon**
+
+ - As a student, you have free entry to many museums in Karlsruhe on fridays, so we will be taking a trip to one or more museums depending on how busy they are. Meeting point is in front of the student council (Building 11.10).
 
-Die kommende Master O-Phase wird vom 14.10.2024 bis zum 18.10.2024 mit verschiedenen Events an allen Tagen stattfinden. Einen Kalender mit der Detaillierten Auflistung findest Du bald im Anschluss dieses Textes.
 
 {{< calendar ics="https://caldav.fs-etit.kit.edu/public.php/ophase/master" initialDate="2024-10-14" >}}
\ No newline at end of file

content/studies/ophase/master.md

@@ -3,6 +3,40 @@ title: "Master O-Phase"
 showDate: true
 ---
 
-Die kommende Master O-Phase wird vom 14.10.2024 bis zum 18.10.2024 mit verschiedenen Events an allen Tagen stattfinden. Einen Kalender mit der Detaillierten Auflistung findest Du bald im Anschluss dieses Textes.
+Die kommende Master O-Phase wird vom 14.10.2024 bis zum 18.10.2024 mit verschiedenen Events an allen Tagen stattfinden. Einen Kalender mit der detaillierten Auflistung findest Du im Anschluss dieses Textes.
+
+Im weiteren Verlauf wollen wir dir kurz erklären was bei den einzelnen Events auf dich wartet:
+
+**Die Einführungsveranstaltung**
+
+ - Die Fakultät und die Fachschaft stellen sich vor. Des Weiteren wird Dir erklärt, welche Events in der MO-Phase auf dich wartet. Die Veranstaltung findet im Engelbert-Arnold-Saal im ETI (Geb. 11.10) in der Engelbert-Arnold-Straße 5, 76131 Karlsruhe statt.
+
+**Campus Tour**
+
+ - "Ältere" Studierende zeigen Dir den Campus.
+
+**Grillen**
+
+ - Wir treffen uns auf dem LTI-Hof (Geb. 30.34) und lassen den Abend bei gemeinsamen Grillen ausklingen. Leider können wir aufgrund von Budget-Beschränkungen das Essen nicht kostenlos anbieten, bring also bitte ein bisschen Bargeld mit.
+
+**Fakten with Simon**
+
+ - Wir zeigen Dir wie Du durch die Uni-IT navigierst, an welche Regularien Du und die Uni sich halten müssen und geben Dir alle Informationen, die du für ein erfolgreiches Studium benötigst. Engelbert-Arnold-Saal, Geb. 11.10.
+
+**O-Party**
+
+ - Wir haben für Dich eine große Party im AKK organisiert. Bring richtig Stimmung und ein bisschen Bargeld mit!
+
+**Internationales Frühstück**
+
+ - Dieses Frühstück ist für die internationalen Studierenden um sich über die bürokratischen Hindernisse beim Studium am KIT oder in Deutschland auszutauschen. Ebenfalls werden die internationalen Studierenden des Bachelor daran teilnehmen. Treffpunkt: Z10, Zähringerstraße 10, 76131 Karlsruhe.
+
+**Scavenger Hunt**
+
+ - Zusammen mit deinem Team löst du Rätsel rund um den Campus und die Stadt, wobei du nochmals den Campus und die Stadt kennen lernst. Im Anshcluss wird es noch etwas Karaoke vor der Fachschaft geben. Treffpunkt vor der Fachschaft (Geb. 11.10).
+
+**Museumsnachmittag**
+
+ - Als Studierender hat man Freitags kostenlosen Eintritt in viele Museen in Karlsruhe, deshalb werden wir je nach Andrang einen Ausflug in ein oder mehrere Museen machen. Treffpunkt ist vor der Fachschaft (Geb. 11.10).
 
 {{< calendar ics="https://caldav.fs-etit.kit.edu/public.php/ophase/master" initialDate="2024-10-14" >}}
\ No newline at end of file