diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index b30b9dc5..29ed6626 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -698,7 +698,7 @@ function view_user_shifts() {
       'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Tasks") . '<sup>1</sup>'),
       'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")),
       'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " <a href=\"https://events.ccc.de/congress/2013/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">" . _("Description of the jobs.") . "</a>",
-      'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> Use new style if possible</label>',
+      'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>',
       'shifts_table' => $shifts_table,
       'ical_text' => '<h2>' . _("iCal export") . '</h2><p>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset') . '</p>',
       'filter' => _("Filter")
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 09e981dc..ebf5397e 100644
Binary files a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo and b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo differ
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index a1fa396e..adbdd6e0 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Engelsystem 2.0\n"
 "POT-Creation-Date: 2013-11-28 23:16+0100\n"
-"PO-Revision-Date: 2013-11-28 23:20+0100\n"
-"Last-Translator: msquare <msquare@notrademark.de>\n"
+"PO-Revision-Date: 2013-12-02 22:01+0100\n"
+"Last-Translator: e7p <engelsystem@e7p.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
@@ -31,11 +31,11 @@ msgstr "Aktive Engel"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:23
 msgid "Please enter a number of angels to be marked as active."
-msgstr ""
+msgstr "Bitte gib eine Anzahl an Engeln ein, die als Aktiv markiert werden sollen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:39
 msgid "Marked angels."
-msgstr ""
+msgstr "Engel wurden markiert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:41
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:82
@@ -48,25 +48,25 @@ msgstr "anwenden"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:51
 msgid "Angel has been marked as active."
-msgstr ""
+msgstr "Engel wurde als aktiv markiert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:53
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:62
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:80
 msgid "Angel not found."
-msgstr ""
+msgstr "Engel nicht gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:60
 msgid "Angel has been marked as not active."
-msgstr ""
+msgstr "Engel wurde als nicht aktiv markiert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:69
 msgid "Angel has got a t-shirt."
-msgstr ""
+msgstr "Engel hat ein T-Shirt bekommen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:78
 msgid "Angel has got no t-shirt."
-msgstr ""
+msgstr "Engel hat kein T-Shirt bekommen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:105
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:106
@@ -76,33 +76,33 @@ msgstr "Ja"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:110
 msgid "set active"
-msgstr ""
+msgstr "setze aktiv"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:112
 msgid "remove active"
-msgstr ""
+msgstr "entferne aktiv"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:113
 msgid "got t-shirt"
-msgstr ""
+msgstr "hat t-shirt"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:116
 msgid "remove t-shirt"
-msgstr ""
+msgstr "entferne t-shirt"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:124
 msgid "Search angel:"
-msgstr ""
+msgstr "Suche Engel:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:125
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:66
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:67
 msgid "Search"
-msgstr ""
+msgstr "Suche"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:128
 msgid "How much angels should be active?"
-msgstr ""
+msgstr "Wie viele Engel sollten aktiv sein?"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:129
 msgid "Preview"
@@ -123,7 +123,7 @@ msgstr "Schichten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:136
 msgid "Length"
-msgstr "änge"
+msgstr "Länge"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:137
 msgid "Active?"
@@ -301,7 +301,7 @@ msgstr "Bitte wähle Deine T-Shirt Größe."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:87
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:126
 msgid "Your passwords don't match."
-msgstr "Deine Passwörter stimmten nicht überein."
+msgstr "Deine Passwörter stimmen nicht überein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:91
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:124
@@ -310,15 +310,11 @@ msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:132
 msgid "Angel registration successful!"
-msgstr "Engel erfolgreich registriert!"
+msgstr "Engel-Registrierung erfolgreich!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:139
-msgid ""
-"By completing this form you're registering as a Chaos-Angel. This script "
-"will create you an account in the angel task sheduler."
-msgstr ""
-"Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in "
-"der Engel Aufgabenverwaltung."
+msgid "By completing this form you're registering as a Chaos-Angel. This script will create you an account in the angel task sheduler."
+msgstr "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in der Engel Aufgabenverwaltung."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:143
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
@@ -393,12 +389,8 @@ msgid "Description of job types"
 msgstr "Beschreibung der Aufgaben"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:157
-msgid ""
-"Restricted angel types need will be confirmed later by an archangel. You can "
-"change your selection in the options section."
-msgstr ""
-"Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet "
-"werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
+msgid "Restricted angel types need will be confirmed later by an archangel. You can change your selection in the options section."
+msgstr "Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:158
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:216
@@ -422,22 +414,16 @@ msgid "Please enter a password."
 msgstr "Gib bitte ein Passwort ein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:197
-msgid ""
-"No user was found with that Nickname. Please try again. If you are still "
-"having problems, ask an Dispatcher."
-msgstr ""
-"Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch "
-"einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher."
+msgid "No user was found with that Nickname. Please try again. If you are still having problems, ask an Dispatcher."
+msgstr "Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:201
 msgid "Please enter a nickname."
 msgstr "Gib bitte einen Nick an."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:213
-msgid ""
-"Resistance is futile! Your biological and physical parameters will be added "
-"to our collectiv! Assimilating angel:"
-msgstr "Logg Dich bitte ein:"
+msgid "Resistance is futile! Your biological and physical parameters will be added to our collectiv! Assimilating angel:"
+msgstr "Widerstand ist zwecklos! Deine biologischen und physischen Parameter werden zu unserem Kollektiv hinzugefügt! Assimiliere Engel:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:219
 msgid "Please note: You have to activate cookies!"
@@ -505,7 +491,7 @@ msgstr "Nachricht"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:90
 msgid "Incomplete call, missing Message ID."
-msgstr ""
+msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:83
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:97
@@ -514,11 +500,11 @@ msgstr "Keine Nachricht gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:107
 msgid "Transmitting was terminated with an Error."
-msgstr ""
+msgstr "Übertragung wurde mit einem Fehler abgebrochen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:112
 msgid "Wrong action."
-msgstr ""
+msgstr "Falsche Aktion."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:3
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:249
@@ -538,16 +524,12 @@ msgid "You have been signed off from the shift."
 msgstr "Du wurdest aus der Schicht ausgetragen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:54
-msgid ""
-"It's too late to sign yourself off the shift. If neccessary, as the "
-"dispatcher to do so."
-msgstr ""
-"Es ist zu spät um Dich aus der Schicht auszutragen. Wenn notwendig, frage "
-"einen Dispatcher dafür."
+msgid "It's too late to sign yourself off the shift. If neccessary, as the dispatcher to do so."
+msgstr "Es ist zu spät um Dich aus der Schicht auszutragen. Wenn notwendig, frage einen Dispatcher dafür."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:92
 msgid "sign off"
-msgstr ""
+msgstr "abmelden"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:99
 msgid "Sum:"
@@ -555,14 +537,8 @@ msgstr "Summe:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:109
 #, php-format
-msgid ""
-"These are your shifts.<br/>Please try to appear <b>15 minutes</b> before "
-"your shift begins!<br/>You can remove yourself from a shift up to %d hours "
-"before it starts."
-msgstr ""
-"Hier sind Deine Schichten.<br />Bitte versuche <b>15 Minuten</b> vor "
-"Schichtbeginn zu erscheinen.<br />Du kannst Dich von Schichten %d Stunden "
-"vor deren Beginn noch austragen."
+msgid "These are your shifts.<br/>Please try to appear <b>15 minutes</b> before your shift begins!<br/>You can remove yourself from a shift up to %d hours before it starts."
+msgstr "Hier sind Deine Schichten.<br />Bitte versuche <b>15 Minuten</b> vor Schichtbeginn zu erscheinen.<br />Du kannst Dich von Schichten %d Stunden vor deren Beginn noch austragen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:115
 msgid "Day"
@@ -591,12 +567,8 @@ msgstr "Aktion"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:122
 #, php-format
-msgid ""
-"Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
-"shifts."
-msgstr ""
-"Gehe zur <a href=\"%s\">Schicht-Tabelle</a> um Dich für Schichten "
-"einzutragen."
+msgid "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."
+msgstr "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten einzutragen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:123
 msgid "Exports"
@@ -605,14 +577,8 @@ msgstr "Exporte"
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:123
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:696
 #, php-format
-msgid ""
-"Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
-"\">JSON format</a> available (please keep secret, otherwise <a href=\"%s"
-"\">reset the api key</a>)."
-msgstr ""
-"Exportiere Deine Schichten. <a href=\"%s\">iCal Format</a> oder <a href=\"%s"
-"\">JSON Format</a> verfügbar (Link bitte geheimhalten, <a href=\"%s\">sonst "
-"API-Key zurücksetzen</a>)."
+msgid "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."
+msgstr "Exportiere Deine Schichten. <a href=\"%s\">iCal Format</a> oder <a href=\"%s\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s\">API-Key zurücksetzen</a>)."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:3
 msgid "News comments"
@@ -652,7 +618,7 @@ msgstr "Nachricht:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:122
 msgid "Invalid request."
-msgstr ""
+msgstr "Ungültige Abfrage."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:167
 msgid "Create news:"
@@ -677,7 +643,7 @@ msgstr "Gib eine Frage ein!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:35
 msgid "Incomplete call, missing Question ID."
-msgstr ""
+msgstr "Unvollständiger Aufruf, fehlende Fragen ID."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:42
 msgid "No question found."
@@ -693,7 +659,7 @@ msgstr "Einstellungen gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:122
 msgid "-> not OK. Please try again."
-msgstr "Nicht OK. Bitte erneut versuchen."
+msgstr "-> Nicht OK. Bitte erneut versuchen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128
 msgid "Password saved."
@@ -709,12 +675,8 @@ msgstr "Aussehen geändert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:164
 #, php-format
-msgid ""
-"Hello %s, here you can change your personal settings i.e. password, color "
-"settings etc."
-msgstr ""
-"Hallo %s, hier kannst Du Deine persönlichen Einstellungen (z.B. Passwort, "
-"Aussehen, usw.) ändern."
+msgid "Hello %s, here you can change your personal settings i.e. password, color settings etc."
+msgstr "Hallo %s, hier kannst Du Deine persönlichen Einstellungen (z.B. Passwort, Aussehen, usw.) ändern."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
 msgid "Here you can change your user details."
@@ -766,28 +728,28 @@ msgstr "Bitte einen Raum auswählen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:96
 msgid "Please enter a valid starting time for the shifts."
-msgstr ""
+msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:103
 msgid "Please enter a valid ending time for the shifts."
-msgstr ""
+msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:108
 msgid "The ending time has to be after the starting time."
-msgstr ""
+msgstr "Die Endzeit muss nach der Startzeit liegen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:116
 #, php-format
 msgid "Please check your input for needed angels of type %s."
-msgstr ""
+msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:130
 msgid "Shift updated."
-msgstr ""
+msgstr "Schicht aktualisiert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:148
 msgid "This page is much more comfortable with javascript."
-msgstr ""
+msgstr "Diese Seite ist mit JavaScript viel komfortabler."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:150
 msgid "Name/Description:"
@@ -816,7 +778,7 @@ msgstr "Schicht gelöscht."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:183
 #, php-format
 msgid "Do you want to delete the shift %s from %s to %s?"
-msgstr ""
+msgstr "Möchtest Du die Schicht %s von %s bis %s löschen?"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:469
@@ -830,20 +792,12 @@ msgid "delete"
 msgstr "löschen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:204
-msgid ""
-"This shift is running now or ended already. Please contact a dispatcher to "
-"join the shift."
-msgstr ""
-"Diese Schicht läuft bereits oder ist bereits vorbei. Bitte einen Dispatcher "
-"Dich nachzutragen."
+msgid "This shift is running now or ended already. Please contact a dispatcher to join the shift."
+msgstr "Diese Schicht läuft bereits oder ist bereits vorbei. Bitte einen Dispatcher Dich nachzutragen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:210
-msgid ""
-"You already subscribed to shift in the same timeslot. Please contact a "
-"dispatcher to join the shift."
-msgstr ""
-"Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen Dispatcher "
-"Dich nachzutragen."
+msgid "You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift."
+msgstr "Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen Dispatcher Dich nachzutragen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:249
 msgid "You are subscribed. Thank you!"
@@ -887,15 +841,11 @@ msgstr "Aufgaben"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:692
 msgid "Occupancy"
-msgstr ""
+msgstr "Belegung"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:693
-msgid ""
-"The tasks shown here are influenced by the preferences you defined in your "
-"settings!"
-msgstr ""
-"Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen "
-"(Engeltypen/Aufgaben) abhängig!"
+msgid "The tasks shown here are influenced by the preferences you defined in your settings!"
+msgstr "Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen (Engeltypen/Aufgaben) abhängig!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:693
 msgid "Description of the jobs."
@@ -923,93 +873,91 @@ msgstr "Wecker"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:26
 msgid "Broken date!"
-msgstr ""
+msgstr "Kaputter Termin!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:33
 msgid "Incomplete call, missing wake-up ID."
-msgstr ""
+msgstr "Unvollständiger Aufruf, fehlende Wecker ID."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:38
 msgid "Wake-up call deleted."
-msgstr ""
+msgstr "Weckruf gelöscht."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:40
 msgid "No wake-up found."
-msgstr ""
+msgstr "Keinen Wecker gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:45
 #, php-format
-msgid ""
-"Hello %s, here you can register for a wake-up call. Simply say when and "
-"where the angel should come to wake you."
-msgstr ""
+msgid "Hello %s, here you can register for a wake-up call. Simply say when and where the angel should come to wake you."
+msgstr "Hallo %s, hier kannst Du Dich für einen Weckruf registrieren. Sag einfach, wann und wo der Engel erscheinen soll, um Dich zu wecken."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:46
 msgid "All ordered wake-up calls, next first."
-msgstr ""
+msgstr "Alle sortierten Weckrufe, der nächste als erstes."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:52
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:83
 msgid "Place"
-msgstr ""
+msgstr "Platz"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:53
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:84
 msgid "Notes"
-msgstr ""
+msgstr "Notizen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:77
 msgid "Schedule a new wake-up here:"
-msgstr ""
+msgstr "Plane einen neuen Wecker hier:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:17
 msgid "Open questions"
-msgstr ""
+msgstr "Offene Fragen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:19
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:24
 msgid "Question"
-msgstr ""
+msgstr "Frage"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:22
 msgid "Answered questions"
-msgstr ""
+msgstr "Beantwortete Fragen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:25
 msgid "Answered by"
-msgstr ""
+msgstr "Antwort von"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:26
 msgid "Answer"
-msgstr ""
+msgstr "Antwort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:31
 msgid "Your Question:"
-msgstr ""
+msgstr "Deine Frage:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:17
 msgid "Angel:"
-msgstr ""
+msgstr "Engel:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18
 msgid "Date, Duration:"
-msgstr ""
+msgstr "Termin, Dauer:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:19
 msgid "Location:"
-msgstr ""
+msgstr "Ort:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:20
 msgid "Title:"
-msgstr ""
+msgstr "Titel:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:21
 msgid "Type:"
-msgstr ""
+msgstr "Typ:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:22
 msgid "Comment (for your eyes only):"
-msgstr ""
+msgstr "Kommentar (nur für Dich):"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:7
 msgid "Please select..."
@@ -1020,20 +968,12 @@ msgid "No Access"
 msgstr "Kein Zugriff"
 
 #: /Users/msquare/workspace/projects/engelsystem/public/index.php:182
-msgid ""
-"You don't have permission to view this page. You probably have to sign in or "
-"register in order to gain access!"
-msgstr ""
-"Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
-"bitte ein."
+msgid "You don't have permission to view this page. You probably have to sign in or register in order to gain access!"
+msgstr "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich bitte ein, um Zugriff zu erhalten!"
 
 #: /Users/msquare/workspace/projects/engelsystem/public/index.php:195
-msgid ""
-"You are not marked as arrived. Please go to heaven's desk, get your angel "
-"badge and/or tell them that you arrived already."
-msgstr ""
-"Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
-"hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
+msgid "You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."
+msgstr "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
 
 #~ msgid "asdf"
 #~ msgstr "fdsa"