diff --git a/www/web/locale/de/LC_MESSAGES/django.po b/www/web/locale/de/LC_MESSAGES/django.po
index e5f3a1a6e3928a42605f7e31dc7fa6968b2b58b9..34b9c83da214644304d14656cbe0c16f628acdaf 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-24 03:08+0200\n"
+"POT-Creation-Date: 2016-10-11 23:22+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"
@@ -17,47 +17,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/base.html:61
+#: templates/base.html:65
 msgid "logout"
-msgstr ""
+msgstr "Logout"
 
-#: templates/base.html:62 warpauth/templates/warpauth/profile.html.py:7
+#: templates/base.html:66 warpauth/templates/warpauth/profile.html.py:7
 msgid "profile_settings"
 msgstr "Profil Einstellungen"
 
-#: templates/base.html:65
+#: templates/base.html:69
 msgid "admin"
 msgstr "Administration"
 
-#: templates/base.html:70 warpfood/templates/warpfood/edit_sheet.html.py:6
+#: templates/base.html:74 warpfood/templates/warpfood/edit_sheet.html.py:6
 #: warpfood/templates/warpfood/main.html:6
-#: warpfood/templates/warpfood/view.html:6 warpzone/util.py:6
+#: warpfood/templates/warpfood/view.html:6 warpzone/util.py:8
 msgid "pizza_sheet"
 msgstr "PizzaSheet"
 
-#: templates/base.html:75
+#: templates/base.html:79
 #, fuzzy
 #| msgid "pizza_service"
 msgid "services"
 msgstr "Services"
 
 #: templates/base.html:88
+msgid "mailinglists"
+msgstr "Mailinglisten"
+
+#: templates/base.html:92
 msgid "internal"
 msgstr "Intern"
 
-#: templates/base.html:92
+#: templates/base.html:96
 #, fuzzy
 #| msgid "registration"
 msgid "administration"
 msgstr "Registrierung"
 
-#: templates/base.html:93
+#: templates/base.html:97
 #, fuzzy
 #| msgid "admin"
 msgid "ldap_admin"
 msgstr "LDAP Admin"
 
-#: templates/base.html:94
+#: templates/base.html:98
 msgid "postfix_admin"
 msgstr "Postfix Admin"
 
@@ -243,6 +247,7 @@ msgstr "Daten wurden gespeichert"
 
 #: warpauth/templates/warpauth/profile/information.html:20
 #: warpfood/templates/warpfood/edit_sheet.html:15
+#: warpfood/templates/warpfood/food_service.html:15
 msgid "submit"
 msgstr "Speichern"
 
@@ -255,6 +260,7 @@ msgid "activation"
 msgstr "Aktivierung"
 
 #: warpauth/templates/warpauth/register/activate.html:11
+#: warpfood/templates/warpfood/food_service.html:21
 msgid "back"
 msgstr "Zurück"
 
@@ -289,7 +295,7 @@ msgstr "Bitte registrieren"
 #: warpauth/templates/warpauth/register/resend_token.html:19
 #: warpauth/templates/warpauth/reset_password/token_gen.html:15
 #: warpauth/templates/warpauth/reset_password/token_gen.html:16
-#: warpfood/templates/warpfood/view.html:80
+#: warpfood/templates/warpfood/view.html:83
 msgid "username"
 msgstr "Benutzername"
 
@@ -370,12 +376,31 @@ msgstr "Dein Passwort wurde kürzlich geändert"
 
 #: warpauth/util.py:5
 msgid "mail_content_password_changed_recently"
-msgstr "Hallo, \n\ndu hast gerade dein Passwort geändert. Wenn dies nicht der Fall ist, wende dich bitte an das WarpInfra-Team. \n\n\nMit freundlichen Grüßen \n\nDas WarpInfra-Team"
+msgstr ""
+"Hallo, \n"
+"\n"
+"du hast gerade dein Passwort geändert. Wenn dies nicht der Fall ist, wende "
+"dich bitte an das WarpInfra-Team. \n"
+"\n"
+"\n"
+"Mit freundlichen Grüßen \n"
+"\n"
+"Das WarpInfra-Team"
 
 #: warpauth/views/register.py:16
 #, python-format
 msgid "https://infra.warpzone.ms/account/registration/activate/%(token)s"
-msgstr "Hallo, \n\nbitte klicke auf den folgenden Link um deinen Account zu aktivieren:\n\n https://infra.warpzone.ms/account/registration/activate/%(token)s \n\n\nMit freundlichen Grüßen \n\nDas WarpInfra-Team"
+msgstr ""
+"Hallo, \n"
+"\n"
+"bitte klicke auf den folgenden Link um deinen Account zu aktivieren:\n"
+"\n"
+" https://infra.warpzone.ms/account/registration/activate/%(token)s \n"
+"\n"
+"\n"
+"Mit freundlichen Grüßen \n"
+"\n"
+"Das WarpInfra-Team"
 
 #: warpauth/views/register.py:17
 msgid "Your registration for WarpInfra"
@@ -426,12 +451,20 @@ msgstr "Error sending mail"
 msgid "err_invalid_token"
 msgstr "Der Token ist kapott"
 
+#: warpfood/templates/warpfood/food_service.html:6
+#, fuzzy
+#| msgid "create_food_service"
+msgid "food_service"
+msgstr "Neuen Food Service erstellen"
+
 #: warpfood/templates/warpfood/main.html:16
 msgid "create_food_sheet"
 msgstr "Neues Sheet erstellen"
 
 #: warpfood/templates/warpfood/main.html:17
-msgid "create_food_service"
+#, fuzzy
+#| msgid "create_food_service"
+msgid "add_food_service"
 msgstr "Neuen Food Service erstellen"
 
 #: warpfood/templates/warpfood/main.html:26
@@ -473,7 +506,7 @@ msgstr "Öffnen"
 
 #: warpfood/templates/warpfood/view.html:32
 msgid "ordered"
-msgstr "bestellt"
+msgstr "Bestellt"
 
 #: warpfood/templates/warpfood/view.html:34
 msgid "confirm"
@@ -493,40 +526,44 @@ msgstr "Bestellen"
 
 #: warpfood/templates/warpfood/view.html:73
 #, python-format
-msgid ""
-" this_sheet_was_ordered %(sheet.order_time | naturaltime)s by "
-"%(sheet.order_user)s"
-msgstr ""
+msgid "this_sheet_was_ordered %(sheet.order_time | naturaltime)s by %(sheet.order_user)s"
+msgstr "Dieses Sheet wurde %(sheet.order_time | naturaltime)s von %(sheet.order_user)s bestellt."
 
-#: warpfood/templates/warpfood/view.html:81
+#: warpfood/templates/warpfood/view.html:84
 msgid "article"
 msgstr "Produkt"
 
-#: warpfood/templates/warpfood/view.html:82
+#: warpfood/templates/warpfood/view.html:85
 msgid "size"
 msgstr "Größe"
 
-#: warpfood/templates/warpfood/view.html:83
+#: warpfood/templates/warpfood/view.html:86
 msgid "price"
 msgstr "Preis"
 
-#: warpfood/templates/warpfood/view.html:84
+#: warpfood/templates/warpfood/view.html:87
 msgid "comment"
 msgstr "Kommentar"
 
-#: warpfood/templates/warpfood/view.html:85
+#: warpfood/templates/warpfood/view.html:88
 msgid "paid"
 msgstr "bezahlt"
 
-#: warpfood/templates/warpfood/view.html:126
+#: warpfood/templates/warpfood/view.html:132
 msgid "product_list"
 msgstr "Produkt Liste"
 
-#: warpfood/templates/warpfood/view.html:162
+#: warpfood/templates/warpfood/view.html:168
+#: warpfood/templates/warpfood/view.html:178
 msgid "are_you_sure"
 msgstr "Bist du sicher ?"
 
-#: warpmain/templates/warpmain/about.html:5 warpzone/util.py:7
+#: warpfood/views.py:27
+#, python-format
+msgid "pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s"
+msgstr "PizzaSheet bei %(pizza_service)s mit vorraussichtlicher Bestellzeit %(est_order_time)s geöffnet"
+
+#: warpmain/templates/warpmain/about.html:5 warpzone/util.py:9
 msgid "about"
 msgstr "Über"
 
@@ -539,8 +576,8 @@ msgid "about_text"
 msgstr "Den scheiß hier liest doch keiner"
 
 #: warpmain/templates/warpmain/about.html:14
-msgid "project_home"
-msgstr "GitLab Projekt"
+msgid "visit_us!"
+msgstr "Homepage"
 
 #: warpmain/templates/warpmain/about.html:17
 msgid "license"
@@ -566,7 +603,7 @@ msgstr "Mattermost Channel"
 msgid "issue_tracker"
 msgstr "Einen Bug melden"
 
-#: warpmain/templates/warpmain/about.html:41
+#: warpmain/templates/warpmain/about.html:52
 msgid "open_source_licenses"
 msgstr "Lizenzen"
 
@@ -582,7 +619,13 @@ msgstr "News"
 msgid "create"
 msgstr "Erstellen"
 
-#: warpmain/templates/warpmain/main.html:36
+#: warpmain/templates/warpmain/main.html:25
+#, fuzzy
+#| msgid "support"
+msgid "markdown_support"
+msgstr "Support"
+
+#: warpmain/templates/warpmain/main.html:53
 msgid "created_by"
 msgstr "Erstellt von"
 
@@ -593,5 +636,8 @@ msgstr "News"
 #: warppay/templates/warppay/main.html:17
 #, fuzzy
 #| msgid "created_by"
-msgid "Created by"
+msgid "created by"
 msgstr "Erstellt von"
+
+#~ msgid "project_home"
+#~ msgstr "GitLab Projekt"
diff --git a/www/web/locale/en/LC_MESSAGES/django.po b/www/web/locale/en/LC_MESSAGES/django.po
index ebf522d59e507dad0cc2c154d01979580b9ef933..b0dd98577db2b66ca18bf93148b0174125a98141 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-24 03:08+0200\n"
+"POT-Creation-Date: 2016-10-11 23:22+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"
@@ -17,49 +17,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/base.html:61
+#: templates/base.html:65
 msgid "logout"
 msgstr ""
 
-#: templates/base.html:62 warpauth/templates/warpauth/profile.html.py:7
+#: templates/base.html:66 warpauth/templates/warpauth/profile.html.py:7
 msgid "profile_settings"
 msgstr "Profile Settings"
 
-#: templates/base.html:65
+#: templates/base.html:69
 msgid "admin"
 msgstr "Admin"
 
-#: templates/base.html:70 warpfood/templates/warpfood/edit_sheet.html.py:6
+#: templates/base.html:74 warpfood/templates/warpfood/edit_sheet.html.py:6
 #: warpfood/templates/warpfood/main.html:6
-#: warpfood/templates/warpfood/view.html:6 warpzone/util.py:6
+#: warpfood/templates/warpfood/view.html:6 warpzone/util.py:8
 msgid "pizza_sheet"
 msgstr "PizzaSheet"
 
-#: templates/base.html:75
+#: templates/base.html:79
 #, fuzzy
 #| msgid "pizza_service"
 msgid "services"
 msgstr "Services"
 
 #: templates/base.html:88
+msgid "mailinglists"
+msgstr "Mailinglists"
+
+#: templates/base.html:92
 msgid "internal"
 msgstr "Internal"
 
-#: templates/base.html:92
+#: templates/base.html:96
 #, fuzzy
 #| msgid "registration"
 msgid "administration"
 msgstr "Registration"
 
-#: templates/base.html:93
+#: templates/base.html:97
 #, fuzzy
 #| msgid "admin"
 msgid "ldap_admin"
 msgstr "Admin"
 
-#: templates/base.html:94
+#: templates/base.html:98
 msgid "postfix_admin"
-msgstr ""
+msgstr "Postfix Admin"
 
 #: templates/two_factor/core/login.html:5
 msgid "login"
@@ -206,11 +210,11 @@ msgstr "Information"
 #: warpauth/templates/warpauth/profile.html:16
 #: warpauth/templates/warpauth/profile/change_password.html:34
 msgid "change_password"
-msgstr "Chnge Password"
+msgstr "Change Password"
 
 #: warpauth/templates/warpauth/profile.html:19
 msgid "two_factor_authentication"
-msgstr "two factor authentication"
+msgstr "Two Factor Authentication"
 
 #: warpauth/templates/warpauth/profile/change_password.html:9
 #: warpauth/templates/warpauth/reset_password/change_password.html:9
@@ -219,11 +223,11 @@ msgstr "password change successful"
 
 #: warpauth/templates/warpauth/profile/change_password.html:15
 msgid "current_password"
-msgstr "current password"
+msgstr "Current Password"
 
 #: warpauth/templates/warpauth/profile/change_password.html:21
 msgid "new_password"
-msgstr "new password"
+msgstr "New Password"
 
 #: warpauth/templates/warpauth/profile/change_password.html:27
 #: warpauth/templates/warpauth/register/register.html:31
@@ -231,18 +235,19 @@ msgstr "new password"
 #: warpauth/templates/warpauth/reset_password/change_password.html:21
 #: warpauth/templates/warpauth/reset_password/change_password.html:22
 msgid "confirm_password"
-msgstr "confirm password"
+msgstr "Confirm Password"
 
 #: warpauth/templates/warpauth/profile/information.html:5
 msgid "user_data"
-msgstr "user data"
+msgstr "User Data"
 
 #: warpauth/templates/warpauth/profile/information.html:13
 msgid "information_changed_successfully"
-msgstr "information changed successfully"
+msgstr "Information Changed Successfully"
 
 #: warpauth/templates/warpauth/profile/information.html:20
 #: warpfood/templates/warpfood/edit_sheet.html:15
+#: warpfood/templates/warpfood/food_service.html:15
 msgid "submit"
 msgstr "Submit"
 
@@ -252,15 +257,16 @@ msgstr "Groups"
 
 #: warpauth/templates/warpauth/register/activate.html:3
 msgid "activation"
-msgstr "activation"
+msgstr "Activation"
 
 #: warpauth/templates/warpauth/register/activate.html:11
+#: warpfood/templates/warpfood/food_service.html:21
 msgid "back"
 msgstr "Back"
 
 #: warpauth/templates/warpauth/register/activate.html:14
 msgid "msg_account_successfully_activated"
-msgstr "account successfully activated"
+msgstr "Account Successfully Activated"
 
 #: warpauth/templates/warpauth/register/activate.html:17
 msgid "ok"
@@ -273,7 +279,7 @@ msgstr "Registration"
 
 #: warpauth/templates/warpauth/register/register.html:7
 msgid "msg_account_successfully_created"
-msgstr "account successfully created"
+msgstr "Account Successfully Created"
 
 #: warpauth/templates/warpauth/register/register.html:10
 msgid "Back"
@@ -281,7 +287,7 @@ msgstr "Back"
 
 #: warpauth/templates/warpauth/register/register.html:15
 msgid "please_register"
-msgstr "please register"
+msgstr "Please Register"
 
 #: warpauth/templates/warpauth/register/register.html:25
 #: warpauth/templates/warpauth/register/register.html:26
@@ -289,7 +295,7 @@ msgstr "please register"
 #: warpauth/templates/warpauth/register/resend_token.html:19
 #: warpauth/templates/warpauth/reset_password/token_gen.html:15
 #: warpauth/templates/warpauth/reset_password/token_gen.html:16
-#: warpfood/templates/warpfood/view.html:80
+#: warpfood/templates/warpfood/view.html:83
 msgid "username"
 msgstr "Username"
 
@@ -315,29 +321,29 @@ msgstr "Register"
 
 #: warpauth/templates/warpauth/register/resend_token.html:7
 msgid "error_processing_request"
-msgstr "error processing request"
+msgstr "Error Processing your Request"
 
 #: warpauth/templates/warpauth/register/resend_token.html:11
 msgid "resend_token_successful"
-msgstr "Token Successfully sent"
+msgstr "Token sent Successfully "
 
 #: warpauth/templates/warpauth/register/resend_token.html:16
 msgid "resend_token"
-msgstr "resent Token"
+msgstr "Resent Token"
 
 #: warpauth/templates/warpauth/register/resend_token.html:22
 msgid "proceed"
-msgstr "proceed"
+msgstr "Poceed"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:3
 #: warpauth/templates/warpauth/reset_password/change_password.html:24
 #: warpauth/templates/warpauth/reset_password/token_gen.html:3
 msgid "reset_password"
-msgstr "reset password"
+msgstr "Reset Password"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:9
 msgid "redirect_within_5_sec_if_not_click"
-msgstr "redirect within 5 sec if not click"
+msgstr "You will be redirected within 5 seconds. If not, click "
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:10
 msgid "here"
@@ -349,16 +355,16 @@ msgstr "Enter new password for user"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:9
 msgid "msg_reset_email_sent"
-msgstr "E-mail sent"
+msgstr "E-mail Sent"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:14
 msgid "enter_email_address"
-msgstr "enter E-mail address"
+msgstr "Enter your E-mail Address"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:22
 #: warpauth/views/register.py:34
 msgid "err_invalid_email_format"
-msgstr "invalid email format"
+msgstr "invalid Email Format"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:27
 msgid "Reset Password"
@@ -366,16 +372,16 @@ msgstr "Reset Password"
 
 #: warpauth/util.py:5
 msgid "mail_subj_password_changed_recently"
-msgstr "password changed recently"
+msgstr "Password Changed Recently"
 
 #: warpauth/util.py:5
 msgid "mail_content_password_changed_recently"
-msgstr ""
+msgstr "Hello, \n\n Your password was changed recently. \n \n Yours, \n WarpInfra Team"
 
 #: warpauth/views/register.py:16
 #, python-format
 msgid "https://infra.warpzone.ms/account/registration/activate/%(token)s"
-msgstr ""
+msgstr "Hello, \n\n Thank you for your registration. To activate your account, please click on the following Link:\n \n https://infra.warpzone.ms/account/registration/activate/%(token)s \n\n Yours, \n WarpInfra Team"
 
 #: warpauth/views/register.py:17
 msgid "Your registration for WarpInfra"
@@ -383,31 +389,31 @@ msgstr "Your registration for WarpInfra"
 
 #: warpauth/views/register.py:39
 msgid "err_fill_all_fields"
-msgstr "requred fields are empty"
+msgstr "Required fields are empty"
 
 #: warpauth/views/register.py:41
 msgid "err_invalid_username"
-msgstr "invalid username"
+msgstr "Invalid username"
 
 #: warpauth/views/register.py:43 warpauth/views/reset_password.py:57
 msgid "err_passwords_not_matching"
-msgstr "Password do not match"
+msgstr "Passwords do not match"
 
 #: warpauth/views/register.py:66
 msgid "err_sending_mail"
-msgstr "error sending mail"
+msgstr "Error sending Mail"
 
 #: warpauth/views/register.py:70
 msgid "err_username_not_available"
-msgstr "username is not available"
+msgstr "The username is not available"
 
 #: warpauth/views/register.py:83
 msgid "err_token_invalid"
-msgstr "invalid token"
+msgstr "Invalid Token"
 
 #: warpauth/views/register.py:94 warpauth/views/register.py:97
 msgid "err_processing_request"
-msgstr "error processing request"
+msgstr "Error processing your request"
 
 #: warpauth/views/reset_password.py:34
 msgid "mail_subj_reset_password_token"
@@ -426,12 +432,20 @@ msgstr "Error sending mail"
 msgid "err_invalid_token"
 msgstr "invalid token"
 
+#: warpfood/templates/warpfood/food_service.html:6
+#, fuzzy
+#| msgid "create_food_service"
+msgid "food_service"
+msgstr "Create food service"
+
 #: warpfood/templates/warpfood/main.html:16
 msgid "create_food_sheet"
 msgstr "Create sheet"
 
 #: warpfood/templates/warpfood/main.html:17
-msgid "create_food_service"
+#, fuzzy
+#| msgid "create_food_service"
+msgid "add_food_service"
 msgstr "Create food service"
 
 #: warpfood/templates/warpfood/main.html:26
@@ -496,37 +510,43 @@ msgstr "order"
 msgid ""
 " this_sheet_was_ordered %(sheet.order_time | naturaltime)s by "
 "%(sheet.order_user)s"
-msgstr ""
+msgstr "This sheed was ordered %(sheet.order_time | naturaltime)s by %(sheet.order_user)s"
 
-#: warpfood/templates/warpfood/view.html:81
+#: warpfood/templates/warpfood/view.html:84
 msgid "article"
-msgstr "article"
+msgstr "Article"
 
-#: warpfood/templates/warpfood/view.html:82
+#: warpfood/templates/warpfood/view.html:85
 msgid "size"
-msgstr "size"
+msgstr "Size"
 
-#: warpfood/templates/warpfood/view.html:83
+#: warpfood/templates/warpfood/view.html:86
 msgid "price"
-msgstr "price"
+msgstr "Price"
 
-#: warpfood/templates/warpfood/view.html:84
+#: warpfood/templates/warpfood/view.html:87
 msgid "comment"
-msgstr "comment"
+msgstr "Comment"
 
-#: warpfood/templates/warpfood/view.html:85
+#: warpfood/templates/warpfood/view.html:88
 msgid "paid"
-msgstr "paid"
+msgstr "Paid"
 
-#: warpfood/templates/warpfood/view.html:126
+#: warpfood/templates/warpfood/view.html:132
 msgid "product_list"
-msgstr "product list"
+msgstr "Product List"
 
-#: warpfood/templates/warpfood/view.html:162
+#: warpfood/templates/warpfood/view.html:168
+#: warpfood/templates/warpfood/view.html:178
 msgid "are_you_sure"
-msgstr "are you sure ?"
+msgstr "Are you sure?"
 
-#: warpmain/templates/warpmain/about.html:5 warpzone/util.py:7
+#: warpfood/views.py:27
+#, python-format
+msgid "pizza_sheet_opened_for_%(est_order_time)s_at_%(pizza_service)s"
+msgstr "A pizza sheet was opened for %(est_order_time)s at %(pizza_service)s"
+
+#: warpmain/templates/warpmain/about.html:5 warpzone/util.py:9
 msgid "about"
 msgstr "About"
 
@@ -539,8 +559,8 @@ msgid "about_text"
 msgstr ""
 
 #: warpmain/templates/warpmain/about.html:14
-msgid "project_home"
-msgstr "GitLab Project"
+msgid "visit_us!"
+msgstr ""
 
 #: warpmain/templates/warpmain/about.html:17
 msgid "license"
@@ -566,7 +586,7 @@ msgstr "Mattermost Channel"
 msgid "issue_tracker"
 msgstr "Issue Tracker"
 
-#: warpmain/templates/warpmain/about.html:41
+#: warpmain/templates/warpmain/about.html:52
 msgid "open_source_licenses"
 msgstr "Licenses"
 
@@ -582,7 +602,13 @@ msgstr "Add"
 msgid "create"
 msgstr "Create"
 
-#: warpmain/templates/warpmain/main.html:36
+#: warpmain/templates/warpmain/main.html:25
+#, fuzzy
+#| msgid "support"
+msgid "markdown_support"
+msgstr "Support"
+
+#: warpmain/templates/warpmain/main.html:53
 msgid "created_by"
 msgstr "Created by"
 
@@ -593,5 +619,8 @@ msgstr "News"
 #: warppay/templates/warppay/main.html:17
 #, fuzzy
 #| msgid "created_by"
-msgid "Created by"
+msgid "created by"
 msgstr "Created by"
+
+#~ msgid "project_home"
+#~ msgstr "GitLab Project"
diff --git a/www/web/templates/base.html b/www/web/templates/base.html
index 67ab894ce53b802d4ce618f57cfa245975e13b2c..a3ef2a079cb88f677c3a766eac6ad5f395d6e2d5 100644
--- a/www/web/templates/base.html
+++ b/www/web/templates/base.html
@@ -85,7 +85,7 @@
                                     <li role="separator" class="divider"></li>
                                     <li><a href="https://gitlab.warpzone.ms" target="_blank">Gitlab</a></li>
                                     <li><a href="https://mattermost.warpzone.ms" target="_blank">Mattermost</a></li>
-                                    <li><a href="http://lists.warpzone.ms/cgi-bin/mailman/listinfo/" target="_blank">{% trans "mailingists" %}</a></li>
+                                    <li><a href="http://lists.warpzone.ms/cgi-bin/mailman/listinfo/" target="_blank">{% trans "mailinglists" %}</a></li>
                                 {% endif %}
 
                                 <li role="separator" class="divider"></li>