diff --git a/www/web/locale/de/LC_MESSAGES/django.po b/www/web/locale/de/LC_MESSAGES/django.po
index 50cb2da7870d48a337799def9514f5f76a3cd6d5..47a3cd5ce865a3d8a4f10e309f3ea7a873a09486 100644
--- a/www/web/locale/de/LC_MESSAGES/django.po
+++ b/www/web/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-23 12:32+0200\n"
+"POT-Creation-Date: 2016-09-24 03:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,6 +35,32 @@ msgstr "Administration"
 msgid "pizza_sheet"
 msgstr "PizzaSheet"
 
+#: templates/base.html:75
+#, fuzzy
+#| msgid "pizza_service"
+msgid "services"
+msgstr "Services"
+
+#: templates/base.html:88
+msgid "internal"
+msgstr "Intern"
+
+#: templates/base.html:92
+#, fuzzy
+#| msgid "registration"
+msgid "administration"
+msgstr "Registrierung"
+
+#: templates/base.html:93
+#, fuzzy
+#| msgid "admin"
+msgid "ldap_admin"
+msgstr "LDAP Admin"
+
+#: templates/base.html:94
+msgid "postfix_admin"
+msgstr "Postfix Admin"
+
 #: templates/two_factor/core/login.html:5
 msgid "login"
 msgstr "Login"
@@ -193,11 +219,11 @@ msgstr "Passwort wurde erfogreich geändert"
 
 #: warpauth/templates/warpauth/profile/change_password.html:15
 msgid "current_password"
-msgstr "aktuelles Passwort"
+msgstr "Aktuelles Passwort"
 
 #: warpauth/templates/warpauth/profile/change_password.html:21
 msgid "new_password"
-msgstr "neues Paswort"
+msgstr "Neues Paswort"
 
 #: warpauth/templates/warpauth/profile/change_password.html:27
 #: warpauth/templates/warpauth/register/register.html:31
@@ -234,7 +260,7 @@ msgstr "Zurück"
 
 #: warpauth/templates/warpauth/register/activate.html:14
 msgid "msg_account_successfully_activated"
-msgstr "Account erfolgreich aktiviert"
+msgstr "Dein Account wurde erfolgreich aktiviert"
 
 #: warpauth/templates/warpauth/register/activate.html:17
 msgid "ok"
@@ -340,46 +366,46 @@ msgstr "Passwort zurücksetzen"
 
 #: warpauth/util.py:5
 msgid "mail_subj_password_changed_recently"
-msgstr "Passwort wurde kürzlichg geändert"
+msgstr "Dein Passwort wurde kürzlich geändert"
 
 #: warpauth/util.py:5
 msgid "mail_content_password_changed_recently"
-msgstr ""
+msgstr "Hallo, \n du hast gerade dein Passwort geändert. Wenn dies nicht der Fall ist, wende dich bitte an das WarpInfra-Team. \n Mit freundlichen Grüßen \nDas WarpInfra-Team"
 
 #: warpauth/views/register.py:16
 #, python-format
 msgid "https://infra.warpzone.ms/account/registration/activate/%(token)s"
-msgstr ""
+msgstr "Hallo, \n bitte klicke auf den folgenden Link um deinen Account zu aktivieren:\n https://infra.warpzone.ms/account/registration/activate/%(token)s \n Mit freundlichen Grüßen \nDas WarpInfra-Team"
 
 #: warpauth/views/register.py:17
 msgid "Your registration for WarpInfra"
-msgstr "Your registration for WarpInfra"
+msgstr "Deine Registrierung für WarpInfra"
 
-#: warpauth/views/register.py:37
+#: warpauth/views/register.py:39
 msgid "err_fill_all_fields"
-msgstr "bitte alle Felder ausfüllen"
+msgstr "Bitte alle Felder ausfüllen"
 
-#: warpauth/views/register.py:39
+#: warpauth/views/register.py:41
 msgid "err_invalid_username"
 msgstr "Benutzername ist ungültig"
 
-#: warpauth/views/register.py:41 warpauth/views/reset_password.py:57
+#: warpauth/views/register.py:43 warpauth/views/reset_password.py:57
 msgid "err_passwords_not_matching"
 msgstr "Die eingegebenen Passwörter stimmen nicht überein"
 
-#: warpauth/views/register.py:64
+#: warpauth/views/register.py:66
 msgid "err_sending_mail"
 msgstr "E-mail konnt enicht gesendet werden"
 
-#: warpauth/views/register.py:68
+#: warpauth/views/register.py:70
 msgid "err_username_not_available"
 msgstr "Der Benutzername ist bereits registriert"
 
-#: warpauth/views/register.py:81
+#: warpauth/views/register.py:83
 msgid "err_token_invalid"
 msgstr "Der Token ist ungültig"
 
-#: warpauth/views/register.py:92 warpauth/views/register.py:95
+#: warpauth/views/register.py:94 warpauth/views/register.py:97
 msgid "err_processing_request"
 msgstr "Fehler bei der Verarbeitung"
 
@@ -404,15 +430,22 @@ msgstr "Der Token ist kapott"
 msgid "create_food_sheet"
 msgstr "Neues Sheet erstellen"
 
-#: warpfood/templates/warpfood/main.html:25
+#: warpfood/templates/warpfood/main.html:17
+#, fuzzy
+#| msgid "create_food_sheet"
+msgid "create_food_service"
+msgstr "Neues Sheet erstellen"
+
+#: warpfood/templates/warpfood/main.html:26
+#: warpfood/templates/warpfood/view.html:17
 msgid "estimated_order_time"
 msgstr "Eventuell beabsichtigte Bestellzeit"
 
-#: warpfood/templates/warpfood/main.html:25
+#: warpfood/templates/warpfood/main.html:26
 msgid "pizza_service"
 msgstr "Pizza Service"
 
-#: warpfood/templates/warpfood/main.html:25
+#: warpfood/templates/warpfood/main.html:26
 msgid "status"
 msgstr "Status"
 
@@ -525,7 +558,7 @@ msgstr "Support"
 
 #: warpmain/templates/warpmain/about.html:23
 msgid "support_text"
-msgstr "WTF? Support ?"
+msgstr "WTF? Support?"
 
 #: warpmain/templates/warpmain/about.html:41
 msgid "open_source_licenses"
@@ -551,3 +584,8 @@ msgstr "Erstellt von"
 msgid "News"
 msgstr "News"
 
+#: warppay/templates/warppay/main.html:17
+#, fuzzy
+#| msgid "created_by"
+msgid "Created by"
+msgstr "Erstellt von"
diff --git a/www/web/locale/en/LC_MESSAGES/django.po b/www/web/locale/en/LC_MESSAGES/django.po
index 2164936e92368bfbf42007293264d540e6abbe06..546788b7bb16d6e7fcec51a5bb6137abf9d1bc17 100644
--- a/www/web/locale/en/LC_MESSAGES/django.po
+++ b/www/web/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-23 12:32+0200\n"
+"POT-Creation-Date: 2016-09-24 03:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,6 +35,32 @@ msgstr "Admin"
 msgid "pizza_sheet"
 msgstr "PizzaSheet"
 
+#: templates/base.html:75
+#, fuzzy
+#| msgid "pizza_service"
+msgid "services"
+msgstr "Services"
+
+#: templates/base.html:88
+msgid "internal"
+msgstr "Internal"
+
+#: templates/base.html:92
+#, fuzzy
+#| msgid "registration"
+msgid "administration"
+msgstr "Registration"
+
+#: templates/base.html:93
+#, fuzzy
+#| msgid "admin"
+msgid "ldap_admin"
+msgstr "Admin"
+
+#: templates/base.html:94
+msgid "postfix_admin"
+msgstr ""
+
 #: templates/two_factor/core/login.html:5
 msgid "login"
 msgstr "Login"
@@ -355,31 +381,31 @@ msgstr ""
 msgid "Your registration for WarpInfra"
 msgstr "Your registration for WarpInfra"
 
-#: warpauth/views/register.py:37
+#: warpauth/views/register.py:39
 msgid "err_fill_all_fields"
 msgstr "requred fields are empty"
 
-#: warpauth/views/register.py:39
+#: warpauth/views/register.py:41
 msgid "err_invalid_username"
 msgstr "invalid username"
 
-#: warpauth/views/register.py:41 warpauth/views/reset_password.py:57
+#: warpauth/views/register.py:43 warpauth/views/reset_password.py:57
 msgid "err_passwords_not_matching"
 msgstr "Password do not match"
 
-#: warpauth/views/register.py:64
+#: warpauth/views/register.py:66
 msgid "err_sending_mail"
 msgstr "error sending mail"
 
-#: warpauth/views/register.py:68
+#: warpauth/views/register.py:70
 msgid "err_username_not_available"
 msgstr "username is not available"
 
-#: warpauth/views/register.py:81
+#: warpauth/views/register.py:83
 msgid "err_token_invalid"
 msgstr "invalid token"
 
-#: warpauth/views/register.py:92 warpauth/views/register.py:95
+#: warpauth/views/register.py:94 warpauth/views/register.py:97
 msgid "err_processing_request"
 msgstr "error processing request"
 
@@ -404,15 +430,22 @@ msgstr "invalid token"
 msgid "create_food_sheet"
 msgstr "Create Sheet"
 
-#: warpfood/templates/warpfood/main.html:25
+#: warpfood/templates/warpfood/main.html:17
+#, fuzzy
+#| msgid "create_food_sheet"
+msgid "create_food_service"
+msgstr "Create Sheet"
+
+#: warpfood/templates/warpfood/main.html:26
+#: warpfood/templates/warpfood/view.html:17
 msgid "estimated_order_time"
 msgstr "estimated order time"
 
-#: warpfood/templates/warpfood/main.html:25
+#: warpfood/templates/warpfood/main.html:26
 msgid "pizza_service"
 msgstr "pizza service"
 
-#: warpfood/templates/warpfood/main.html:25
+#: warpfood/templates/warpfood/main.html:26
 msgid "status"
 msgstr "Status"
 
@@ -551,3 +584,8 @@ msgstr "Created by"
 msgid "News"
 msgstr "News"
 
+#: warppay/templates/warppay/main.html:17
+#, fuzzy
+#| msgid "created_by"
+msgid "Created by"
+msgstr "Created by"