diff --git a/includes/pages/admin_user_angeltypes.php b/includes/pages/admin_user_angeltypes.php
index b3fca7c0..9377dc20 100644
--- a/includes/pages/admin_user_angeltypes.php
+++ b/includes/pages/admin_user_angeltypes.php
@@ -23,9 +23,9 @@ function admin_user_angeltypes() {
       }
       sql_query("UPDATE `UserAngelTypes` SET `confirm_user_id`=" . sql_escape($_SESSION['uid']) . " WHERE `angeltype_id`=" . sql_escape($_REQUEST['confirm_all']) . " LIMIT 1");
       engelsystem_log("Confirmed all " . $angel_type_source[0]['name']);
-      success("Confirmed all.");
+      success(_("Confirmed all."));
     }
-    else error("Entry not found.");
+    else error(_("Entry not found."));
     redirect(page_link_to('admin_user_angeltypes'));
   }
 
@@ -107,7 +107,7 @@ function admin_new_user_angeltypes() {
     $unconfirmed_angeltypes = sql_num_query("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON `UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` WHERE `UserAngelTypes`.`angeltype_id` IN (SELECT `angeltype_id` FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user['UID']) . ") AND `AngelTypes`.`restricted`=1 AND `UserAngelTypes`.`confirm_user_id` IS NULL LIMIT 1") > 0;
 
     if ($unconfirmed_angeltypes)
-      return info('<a href="' . page_link_to('admin_user_angeltypes') . '">There are unconfirmed angeltypes!</a>', true);
+      return info('<a href="' . page_link_to('admin_user_angeltypes') . '">' . _("There are unconfirmed angeltypes!") . '</a>', true);
   }
   return "";
 }
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index d082b411..9c7a6b94 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -119,7 +119,7 @@ function user_news_comments() {
     <input type="submit" value="' . _("Save") . '">
     </form>';
   } else {
-    $html .= _("Fehlerhafter Aufruf!");
+    $html .= _("Invalid request.");
   }
 
   return $html;
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index d3aaa421..09e981dc 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 7ed07542..a1fa396e 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2013-11-25 22:01+0100\n"
-"PO-Revision-Date: 2013-11-25 22:04+0100\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"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -17,58 +17,178 @@ msgstr ""
 "X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n"
 "X-Poedit-SearchPath-1: .\n"
 
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:169
+msgid "No data found."
+msgstr "Nichts gefunden."
+
 #: /Users/msquare/workspace/projects/engelsystem/includes/helper/internationalization_helper.php:40
 msgid "Language"
 msgstr "Sprache"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:3
 msgid "Active angels"
+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 ""
 
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:39
+msgid "Marked angels."
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:82
+msgid "back"
+msgstr "zurück"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:41
+msgid "apply"
+msgstr "anwenden"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:51
+msgid "Angel has been marked as active."
+msgstr ""
+
+#: /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 ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:60
+msgid "Angel has been marked as not active."
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:69
+msgid "Angel has got a t-shirt."
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:78
+msgid "Angel has got no t-shirt."
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:54
+msgid "yes"
+msgstr "Ja"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:110
+msgid "set active"
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:112
+msgid "remove active"
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:113
+msgid "got t-shirt"
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:116
+msgid "remove t-shirt"
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:124
+msgid "Search angel:"
+msgstr ""
+
+#: /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 ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:128
+msgid "How much angels should be active?"
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:129
+msgid "Preview"
+msgstr "Vorschau"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:70
+msgid "Nickname"
+msgstr "Nick"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:134
+msgid "Size"
+msgstr "Größe"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:135
+msgid "Shifts"
+msgstr "Schichten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:136
+msgid "Length"
+msgstr "änge"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:137
+msgid "Active?"
+msgstr "Aktiv?"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:138
+msgid "T-shirt?"
+msgstr "T-Shirt?"
+
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_angel_types.php:3
 msgid "Angeltypes"
-msgstr ""
+msgstr "Engeltypen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:3
 msgid "Arrived angels"
-msgstr ""
+msgstr "Angekommene Engel"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55
+msgid "reset"
+msgstr "zurücksetzen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55
+msgid "arrived"
+msgstr "angekommen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:71
+msgid "Arrived?"
+msgstr "Angekommen?"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_faq.php:3
 msgid "Edit FAQs"
-msgstr ""
+msgstr "FAQs bearbeiten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:3
 msgid "Free angels"
-msgstr ""
+msgstr "Freie Engel"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:3
 msgid "Grouprights"
-msgstr ""
+msgstr "Gruppenrechte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:3
 msgid "Pentabarf import"
-msgstr ""
+msgstr "Fahrplan Import"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:3
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:3
 msgid "Answer questions"
-msgstr ""
+msgstr "Fragen beantworten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:3
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:683
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:686
 msgid "Rooms"
-msgstr ""
+msgstr "Räume"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:3
 msgid "Create shifts"
-msgstr ""
+msgstr "Schichten erstellen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:3
 msgid "All Angels"
-msgstr ""
+msgstr "Engelliste"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:152
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:68
@@ -78,6 +198,7 @@ msgstr ""
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:194
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:156
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:86
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:23
@@ -86,51 +207,65 @@ msgstr "Speichern"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:332
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:466
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:469
 msgid "edit"
-msgstr ""
+msgstr "bearbeiten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:3
 msgid "Confirm angeltypes"
-msgstr ""
+msgstr "Engeltypen bestätigen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:26
+msgid "Confirmed all."
+msgstr "Alle bestätigt."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:24
+msgid "Entry not found."
+msgstr "Eintrag nicht gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:82
 msgid "confirm"
-msgstr ""
+msgstr "bestätigen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:84
 msgid "deny"
-msgstr ""
+msgstr "ablehnen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:87
 msgid "confirm all"
-msgstr ""
+msgstr "Alle bestätigen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:87
 msgid "deny all"
-msgstr ""
+msgstr "Alle ablehnen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user_angeltypes.php:110
+msgid "There are unconfirmed angeltypes!"
+msgstr "Es gibt nicht freigeschaltete Engeltypen!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_credits.php:3
 msgid "Credits"
-msgstr ""
+msgstr "Credits"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_faq.php:3
 msgid "FAQ"
-msgstr ""
+msgstr "FAQ"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:3
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:219
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:217
 msgid "Login"
-msgstr ""
+msgstr "Login"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:7
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:161
 msgid "Register"
-msgstr ""
+msgstr "Registrieren"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:11
 msgid "Logout"
-msgstr ""
+msgstr "Logout"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:47
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:44
@@ -152,200 +287,220 @@ msgstr "Die E-Mail Adresse ist nicht in Ordnung."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:59
 msgid "Please enter your e-mail."
-msgstr ""
+msgstr "Bitte gib Deine E-Mail-Adresse ein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:71
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:68
 msgid "Please check your jabber account information."
-msgstr ""
+msgstr "Bitte überprüfe deine Jabber Account Eingabe."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:80
 msgid "Please select your shirt size."
-msgstr ""
+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 ""
+msgstr "Deine Passwörter stimmten nicht überein."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:91
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:124
 msgid "Your password is to short (please use at least 6 characters)."
-msgstr ""
+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 ""
+msgstr "Engel erfolgreich registriert!"
 
 #: /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."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:143
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:51
 msgid "Nick"
-msgstr ""
+msgstr "Nick"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:144
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170
 msgid "Last name"
-msgstr ""
+msgstr "Nachname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:145
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:171
 msgid "First name"
-msgstr ""
+msgstr "Vorname"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:146
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172
 msgid "Age"
-msgstr ""
+msgstr "Alter"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:147
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:148
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
 msgid "DECT"
-msgstr ""
+msgstr "DECT"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:149
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
 msgid "Mobile"
-msgstr ""
+msgstr "Handy"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:150
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:151
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:152
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:153
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
 msgid "Hometown"
-msgstr ""
+msgstr "Wohnort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:154
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
 msgid "Shirt size"
-msgstr ""
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:155
-msgid ""
-"Did you help at former CCC events and which tasks have you performed then?"
-msgstr ""
+msgstr "T-Shirt Größe"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:156
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
 msgid "What do you want to do?"
-msgstr ""
+msgstr "Was möchtest Du machen?"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:156
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
 msgid "Description of job types"
-msgstr ""
+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."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:158
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:216
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:159
 msgid "Confirm password"
-msgstr ""
+msgstr "Passwort wiederholen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:160
 msgid "Entry required!"
-msgstr ""
+msgstr "Pflichtfeld!"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:189
 msgid "Your password is incorrect.  Please try it again."
-msgstr ""
+msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:193
 msgid "Please enter a password."
-msgstr ""
+msgstr "Gib bitte ein Passwort ein."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:198
+#: /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."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:201
 msgid "Please enter a nickname."
-msgstr ""
+msgstr "Gib bitte einen Nick an."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
+#: /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 ""
+msgstr "Logg Dich bitte ein:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:219
 msgid "Please note: You have to activate cookies!"
-msgstr ""
+msgstr "Hinweis: Cookies müssen aktiviert sein!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:3
 msgid "Messages"
-msgstr ""
+msgstr "Nachrichten"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:13
 #, php-format
-msgid "You have %s new messages."
-msgstr ""
+msgid "You have %s new message."
+msgid_plural "You have %s new messages."
+msgstr[0] "Du hast %s neue Nachricht."
+msgstr[1] "Du hast %s neue Nachrichten."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:26
+msgid "Select recipient..."
+msgstr "Empfänger auswählen..."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:16
+msgid "Unable to load user."
+msgstr "Konnte Benutzer nicht laden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:49
 msgid "mark as read"
-msgstr ""
+msgstr "als gelesen markieren"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:51
 msgid "delete message"
-msgstr ""
+msgstr "Nachricht löschen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:58
+#, php-format
+msgid "Hello %s, here can you leave messages for other angels"
+msgstr "Hallo %s, hier kannst Du anderen Engeln Nachrichten schreiben."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:60
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:61
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:50
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:81
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62
 msgid "Transmitted"
-msgstr ""
+msgstr "Gesendet"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:63
 msgid "Recipient"
-msgstr ""
+msgstr "Empfänger"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:64
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:177
 msgid "Message"
-msgstr ""
+msgstr "Nachricht"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:90
@@ -355,7 +510,7 @@ msgstr ""
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:83
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:97
 msgid "No Message found."
-msgstr ""
+msgstr "Keine Nachricht gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:107
 msgid "Transmitting was terminated with an Error."
@@ -366,18 +521,29 @@ msgid "Wrong action."
 msgstr ""
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:249
 msgid "My shifts"
-msgstr ""
+msgstr "Meine Schichten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:23
+msgid "Key changed."
+msgstr "Key geändert."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:38
+msgid "Shift saved."
+msgstr "Schicht gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:52
 msgid "You have been signed off from the shift."
-msgstr ""
+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."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:92
 msgid "sign off"
@@ -385,7 +551,7 @@ msgstr ""
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:99
 msgid "Sum:"
-msgstr ""
+msgstr "Summe:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:109
 #, php-format
@@ -394,31 +560,34 @@ msgid ""
 "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"
-msgstr ""
+msgstr "Tag"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:116
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:674
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:677
 msgid "Time"
-msgstr ""
+msgstr "Zeit"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:117
 msgid "Location"
-msgstr ""
+msgstr "Ort"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:118
 msgid "Name &amp; workmates"
-msgstr ""
+msgstr "Name &amp; Kollegen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:119
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:120
 msgid "Action"
-msgstr ""
+msgstr "Aktion"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:122
 #, php-format
@@ -426,84 +595,85 @@ 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"
-msgstr ""
+msgstr "Exporte"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:123
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:693
+#: /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>)."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:3
 msgid "News comments"
-msgstr ""
+msgstr "News Kommentare"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:7
 msgid "News"
-msgstr ""
+msgstr "News"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:11
 msgid "Meetings"
-msgstr ""
+msgstr "Treffen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:31
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:156
 msgid "Page:"
-msgstr ""
+msgstr "Seite:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:57
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:85
 msgid "Comments"
-msgstr ""
+msgstr "Kommentare"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:79
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:140
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:24
 msgid "Entry saved."
-msgstr ""
+msgstr "Eintrag gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:107
 msgid "New Comment:"
-msgstr ""
+msgstr "Neuer Kommentar:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:114
 msgid "Message:"
-msgstr ""
+msgstr "Nachricht:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:122
-msgid "Fehlerhafter Aufruf!"
+msgid "Invalid request."
 msgstr ""
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:167
 msgid "Create news:"
-msgstr ""
+msgstr "News anlegen:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:173
 msgid "Subject"
-msgstr ""
+msgstr "Betreff"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:182
 msgid "Meeting"
-msgstr ""
+msgstr "Treffen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:3
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29
 msgid "Ask an archangel"
-msgstr ""
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:16
-msgid "Unable to load user."
-msgstr ""
+msgstr "Frage einen Erzengel"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:29
 msgid "Please enter a question!"
-msgstr ""
+msgstr "Gib eine Frage ein!"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:35
 msgid "Incomplete call, missing Question ID."
@@ -511,27 +681,31 @@ msgstr ""
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:42
 msgid "No question found."
-msgstr ""
+msgstr "Keine Frage gefunden."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:3
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:115
 msgid "Settings saved."
-msgstr ""
+msgstr "Einstellungen gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:122
 msgid "-> not OK. Please try again."
-msgstr ""
+msgstr "Nicht OK. Bitte erneut versuchen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128
 msgid "Password saved."
-msgstr ""
+msgstr "Passwort gespeichert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:130
 msgid "Failed setting password."
-msgstr ""
+msgstr "Konnte Passwort nicht speichern."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:143
+msgid "Theme changed."
+msgstr "Aussehen geändert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:164
 #, php-format
@@ -539,111 +713,213 @@ 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."
-msgstr ""
+msgstr "Hier kannst Du Deine Details ändern."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:185
 msgid "Here you can change your password."
-msgstr ""
+msgstr "Hier kannst Du Dein Passwort ändern."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:186
 msgid "Old password:"
-msgstr ""
+msgstr "Altes Passwort:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:187
 msgid "New password:"
-msgstr ""
+msgstr "Neues Passwort:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
 msgid "Password confirmation:"
-msgstr ""
+msgstr "Passwort wiederholen:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:192
 msgid "Here you can choose your color settings:"
-msgstr ""
+msgstr "Hier kannst Du das Aussehen auswählen:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:193
 msgid "Color settings:"
-msgstr ""
+msgstr "Aussehen:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:197
 msgid "Here you can choose your language:"
-msgstr ""
+msgstr "Hier kannst Du Deine Sprache auswählen:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:198
-#, fuzzy
 msgid "Language:"
-msgstr "Sprache"
+msgstr "Sprache:"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:3
 msgid "All Shifts"
+msgstr "Alle Schichten"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:22
+msgid "Shift entry deleted."
+msgstr "Schicht-Eintrag gelöscht."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:89
+msgid "Please select a room."
+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 ""
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:290
-msgid "occupied"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:103
+msgid "Please enter a valid ending time for the shifts."
 msgstr ""
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:294
-msgid "free"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:108
+msgid "The ending time has to be after the starting time."
 msgstr ""
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:466
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:494
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:592
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:617
+#: /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 ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:130
+msgid "Shift updated."
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:148
+msgid "This page is much more comfortable with javascript."
+msgstr ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:150
+msgid "Name/Description:"
+msgstr "Name/Beschreibung:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:151
+msgid "Room:"
+msgstr "Raum:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:152
+msgid "Start:"
+msgstr "Start:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:153
+msgid "End:"
+msgstr "Ende:"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:154
+msgid "Needed angels"
+msgstr "Benötigte Engel"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:178
+msgid "Shift deleted."
+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 ""
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:469
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:497
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:595
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:620
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12
 msgid "delete"
-msgstr ""
+msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:499
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:624
+#: /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."
+
+#: /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."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:249
+msgid "You are subscribed. Thank you!"
+msgstr "Du bist eingetragen. Danke!"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:293
+msgid "occupied"
+msgstr "belegt"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:297
+msgid "free"
+msgstr "frei"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:502
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:627
 #, php-format
 msgid "%d helper needed"
 msgid_plural "%d helpers needed"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Helfer benötigt"
+msgstr[1] "%d Helfer benötigt"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:674
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:527
+msgid "You are not confirmed for this angel type."
+msgstr "Du bist für diesen Engeltyp noch nicht freigeschaltet."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:543
+msgid "Add more angels"
+msgstr "Neue Engel hinzufügen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:677
 msgid "Room"
-msgstr ""
+msgstr "Raum"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:675
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:678
 msgid "Entries"
-msgstr ""
+msgstr "Einträge"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:688
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:691
 msgid "Tasks"
-msgstr ""
+msgstr "Aufgaben"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:689
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:692
 msgid "Occupancy"
 msgstr ""
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:690
+#: /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! <a href=\"https://events.ccc.de/congress/2012/wiki/"
-"Volunteers#What_kind_of_volunteers_are_needed.3F\">Description of the jobs</"
-"a>."
+"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:694
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:693
+msgid "Description of the jobs."
+msgstr "Beschreibung der Aufgaben."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:696
+msgid "iCal export"
+msgstr "iCal Export"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:697
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:728
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:731
 msgid "All"
-msgstr ""
+msgstr "Alle"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:729
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:732
 msgid "None"
-msgstr ""
+msgstr "Keine"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:3
 msgid "Wakeup"
-msgstr ""
+msgstr "Wecker"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_wakeup.php:26
 msgid "Broken date!"
@@ -735,21 +1011,29 @@ msgstr ""
 msgid "Comment (for your eyes only):"
 msgstr ""
 
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:7
+msgid "Please select..."
+msgstr "Bitte auswählen..."
+
 #: /Users/msquare/workspace/projects/engelsystem/public/index.php:181
 msgid "No Access"
-msgstr ""
+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."
 
 #: /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 "asdf"
 #~ msgstr "fdsa"