diff --git a/www/web/locale/de/LC_MESSAGES/django.po b/www/web/locale/de/LC_MESSAGES/django.po
index 5d7383985638c190b2426e5e677e272be1f6f01c..50cb2da7870d48a337799def9514f5f76a3cd6d5 100644
--- a/www/web/locale/de/LC_MESSAGES/django.po
+++ b/www/web/locale/de/LC_MESSAGES/django.po
@@ -23,11 +23,11 @@ msgstr ""
 
 #: templates/base.html:62 warpauth/templates/warpauth/profile.html.py:7
 msgid "profile_settings"
-msgstr ""
+msgstr "Profil Einstellungen"
 
 #: templates/base.html:65
 msgid "admin"
-msgstr ""
+msgstr "Administration"
 
 #: templates/base.html:70 warpfood/templates/warpfood/edit_sheet.html.py:6
 #: warpfood/templates/warpfood/main.html:6
@@ -37,11 +37,11 @@ msgstr "PizzaSheet"
 
 #: templates/two_factor/core/login.html:5
 msgid "login"
-msgstr ""
+msgstr "Login"
 
 #: templates/two_factor/core/login.html:8
 msgid "Enter your credentials."
-msgstr ""
+msgstr "Anmeldeinformationen eingeben"
 
 #: templates/two_factor/core/login.html:11
 msgid ""
@@ -175,29 +175,29 @@ msgstr ""
 
 #: warpauth/templates/warpauth/profile.html:13
 msgid "information"
-msgstr ""
+msgstr "Informationen"
 
 #: warpauth/templates/warpauth/profile.html:16
 #: warpauth/templates/warpauth/profile/change_password.html:34
 msgid "change_password"
-msgstr ""
+msgstr "Passwort ändern"
 
 #: warpauth/templates/warpauth/profile.html:19
 msgid "two_factor_authentication"
-msgstr ""
+msgstr "Zwei Wege Authentifizierungszeugs"
 
 #: warpauth/templates/warpauth/profile/change_password.html:9
 #: warpauth/templates/warpauth/reset_password/change_password.html:9
 msgid "password_change_successful"
-msgstr ""
+msgstr "Passwort wurde erfogreich geändert"
 
 #: warpauth/templates/warpauth/profile/change_password.html:15
 msgid "current_password"
-msgstr ""
+msgstr "aktuelles Passwort"
 
 #: warpauth/templates/warpauth/profile/change_password.html:21
 msgid "new_password"
-msgstr ""
+msgstr "neues Paswort"
 
 #: warpauth/templates/warpauth/profile/change_password.html:27
 #: warpauth/templates/warpauth/register/register.html:31
@@ -205,57 +205,57 @@ msgstr ""
 #: warpauth/templates/warpauth/reset_password/change_password.html:21
 #: warpauth/templates/warpauth/reset_password/change_password.html:22
 msgid "confirm_password"
-msgstr ""
+msgstr "Eingabe wiederholen"
 
 #: warpauth/templates/warpauth/profile/information.html:5
 msgid "user_data"
-msgstr ""
+msgstr "Benutzerinformationen"
 
 #: warpauth/templates/warpauth/profile/information.html:13
 msgid "information_changed_successfully"
-msgstr ""
+msgstr "Daten wurden gespeichert"
 
 #: warpauth/templates/warpauth/profile/information.html:20
 #: warpfood/templates/warpfood/edit_sheet.html:15
 msgid "submit"
-msgstr ""
+msgstr "Speichern"
 
 #: warpauth/templates/warpauth/profile/information.html:29
 msgid "groups"
-msgstr ""
+msgstr "Gruppen"
 
 #: warpauth/templates/warpauth/register/activate.html:3
 msgid "activation"
-msgstr ""
+msgstr "Aktivierung"
 
 #: warpauth/templates/warpauth/register/activate.html:11
 msgid "back"
-msgstr ""
+msgstr "Zurück"
 
 #: warpauth/templates/warpauth/register/activate.html:14
 msgid "msg_account_successfully_activated"
-msgstr ""
+msgstr "Account erfolgreich aktiviert"
 
 #: warpauth/templates/warpauth/register/activate.html:17
 msgid "ok"
-msgstr ""
+msgstr "Ok"
 
 #: warpauth/templates/warpauth/register/register.html:3
 #: warpauth/templates/warpauth/register/resend_token.html:3
 msgid "registration"
-msgstr ""
+msgstr "Registrierung"
 
 #: warpauth/templates/warpauth/register/register.html:7
 msgid "msg_account_successfully_created"
-msgstr ""
+msgstr "Account erfolgreich erstellt"
 
 #: warpauth/templates/warpauth/register/register.html:10
 msgid "Back"
-msgstr ""
+msgstr "Zurück"
 
 #: warpauth/templates/warpauth/register/register.html:15
 msgid "please_register"
-msgstr ""
+msgstr "Bitte registrieren"
 
 #: warpauth/templates/warpauth/register/register.html:25
 #: warpauth/templates/warpauth/register/register.html:26
@@ -265,7 +265,7 @@ msgstr ""
 #: warpauth/templates/warpauth/reset_password/token_gen.html:16
 #: warpfood/templates/warpfood/view.html:80
 msgid "username"
-msgstr ""
+msgstr "Benutzername"
 
 #: warpauth/templates/warpauth/register/register.html:27
 #: warpauth/templates/warpauth/register/register.html:28
@@ -274,73 +274,73 @@ msgstr ""
 #: warpauth/templates/warpauth/reset_password/token_gen.html:17
 #: warpauth/templates/warpauth/reset_password/token_gen.html:18
 msgid "email"
-msgstr ""
+msgstr "E-mail"
 
 #: warpauth/templates/warpauth/register/register.html:29
 #: warpauth/templates/warpauth/register/register.html:30
 #: warpauth/templates/warpauth/reset_password/change_password.html:18
 #: warpauth/templates/warpauth/reset_password/change_password.html:19
 msgid "password"
-msgstr ""
+msgstr "Passwort"
 
 #: warpauth/templates/warpauth/register/register.html:33
 msgid "register"
-msgstr ""
+msgstr "Registrieren"
 
 #: warpauth/templates/warpauth/register/resend_token.html:7
 msgid "error_processing_request"
-msgstr ""
+msgstr "Fehler bei der Verarbeitung"
 
 #: warpauth/templates/warpauth/register/resend_token.html:11
 msgid "resend_token_successful"
-msgstr ""
+msgstr "Der Token wurde erfolgreich gesendet oder auch nicht"
 
 #: warpauth/templates/warpauth/register/resend_token.html:16
 msgid "resend_token"
-msgstr ""
+msgstr "Token noch einmal senden"
 
 #: warpauth/templates/warpauth/register/resend_token.html:22
 msgid "proceed"
-msgstr ""
+msgstr "Weiter"
 
 #: 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 ""
+msgstr "Dem Password mal zurücksetzen"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:9
 msgid "redirect_within_5_sec_if_not_click"
-msgstr ""
+msgstr "Weiterleiten in 5 Sekunden oder auch nicht .. aber Klicken geht auch"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:10
 msgid "here"
-msgstr ""
+msgstr "hier"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:16
 msgid "enter_new_password_for_user"
-msgstr ""
+msgstr "Neues Passswort für"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:9
 msgid "msg_reset_email_sent"
-msgstr ""
+msgstr "E-mail gesendet"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:14
 msgid "enter_email_address"
-msgstr ""
+msgstr "E-mail Adresse eingeben"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:22
 #: warpauth/views/register.py:34
 msgid "err_invalid_email_format"
-msgstr ""
+msgstr "E-mail Adresse ungültig"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:27
 msgid "Reset Password"
-msgstr ""
+msgstr "Passwort zurücksetzen"
 
 #: warpauth/util.py:5
 msgid "mail_subj_password_changed_recently"
-msgstr ""
+msgstr "Passwort wurde kürzlichg geändert"
 
 #: warpauth/util.py:5
 msgid "mail_content_password_changed_recently"
@@ -353,116 +353,112 @@ msgstr ""
 
 #: warpauth/views/register.py:17
 msgid "Your registration for WarpInfra"
-msgstr ""
+msgstr "Your registration for WarpInfra"
 
 #: warpauth/views/register.py:37
 msgid "err_fill_all_fields"
-msgstr ""
+msgstr "bitte alle Felder ausfüllen"
 
 #: warpauth/views/register.py:39
 msgid "err_invalid_username"
-msgstr ""
+msgstr "Benutzername ist ungültig"
 
 #: warpauth/views/register.py:41 warpauth/views/reset_password.py:57
 msgid "err_passwords_not_matching"
-msgstr ""
+msgstr "Die eingegebenen Passwörter stimmen nicht überein"
 
 #: warpauth/views/register.py:64
 msgid "err_sending_mail"
-msgstr ""
+msgstr "E-mail konnt enicht gesendet werden"
 
 #: warpauth/views/register.py:68
 msgid "err_username_not_available"
-msgstr ""
+msgstr "Der Benutzername ist bereits registriert"
 
 #: warpauth/views/register.py:81
 msgid "err_token_invalid"
-msgstr ""
+msgstr "Der Token ist ungültig"
 
 #: warpauth/views/register.py:92 warpauth/views/register.py:95
 msgid "err_processing_request"
-msgstr ""
+msgstr "Fehler bei der Verarbeitung"
 
 #: warpauth/views/reset_password.py:34
 msgid "mail_subj_reset_password_token"
-msgstr ""
+msgstr "Reset Password"
 
 #: warpauth/views/reset_password.py:34
 #, python-format
 msgid "mail_content_reset_password_token %(link)s"
-msgstr ""
+msgstr "Reset Password Token: %(link)s"
 
 #: warpauth/views/reset_password.py:36
 msgid "err_sending_email"
-msgstr ""
+msgstr "Error sending mail"
 
 #: warpauth/views/reset_password.py:68
 msgid "err_invalid_token"
-msgstr ""
+msgstr "Der Token ist kapott"
 
 #: warpfood/templates/warpfood/main.html:16
 msgid "create_food_sheet"
-msgstr ""
+msgstr "Neues Sheet erstellen"
 
 #: warpfood/templates/warpfood/main.html:25
 msgid "estimated_order_time"
-msgstr ""
+msgstr "Eventuell beabsichtigte Bestellzeit"
 
 #: warpfood/templates/warpfood/main.html:25
 msgid "pizza_service"
-msgstr ""
+msgstr "Pizza Service"
 
 #: warpfood/templates/warpfood/main.html:25
 msgid "status"
-msgstr ""
+msgstr "Status"
 
 #: warpfood/templates/warpfood/view.html:15
 msgid "homepage"
-msgstr ""
+msgstr "Homepage / Karte"
 
 #: warpfood/templates/warpfood/view.html:16
 msgid "phone_number"
-msgstr ""
-
-#: warpfood/templates/warpfood/view.html:17
-msgid "estimaged_order_time"
-msgstr ""
+msgstr "Telefon"
 
 #: warpfood/templates/warpfood/view.html:19
 msgid "real_order_time"
-msgstr ""
+msgstr "Bestellzeit"
 
 #: warpfood/templates/warpfood/view.html:24
 msgid "edit"
-msgstr ""
+msgstr "Bearbeiten"
 
 #: warpfood/templates/warpfood/view.html:26
 msgid "close"
-msgstr ""
+msgstr "Schließen"
 
 #: warpfood/templates/warpfood/view.html:28
 msgid "open"
-msgstr ""
+msgstr "Öffnen"
 
 #: warpfood/templates/warpfood/view.html:32
 msgid "ordered"
-msgstr ""
+msgstr "bestellt"
 
 #: warpfood/templates/warpfood/view.html:34
 msgid "confirm"
-msgstr ""
+msgstr "Bestätigen"
 
 #: warpfood/templates/warpfood/view.html:41
 msgid "order_sum"
-msgstr ""
+msgstr "Summe"
 
 #: warpfood/templates/warpfood/view.html:57
 msgid "choose_from_products"
-msgstr ""
+msgstr "Aus Produkten auswählen"
 
 #: warpfood/templates/warpfood/view.html:65
 msgid "order"
-msgstr ""
+msgstr "Bestellen"
 
 #: warpfood/templates/warpfood/view.html:73
 #, python-format
@@ -473,79 +469,79 @@ msgstr ""
 
 #: warpfood/templates/warpfood/view.html:81
 msgid "article"
-msgstr ""
+msgstr "Produkt"
 
 #: warpfood/templates/warpfood/view.html:82
 msgid "size"
-msgstr ""
+msgstr "Größe"
 
 #: warpfood/templates/warpfood/view.html:83
 msgid "price"
-msgstr ""
+msgstr "Preis"
 
 #: warpfood/templates/warpfood/view.html:84
 msgid "comment"
-msgstr ""
+msgstr "Kommentar"
 
 #: warpfood/templates/warpfood/view.html:85
 msgid "paid"
-msgstr ""
+msgstr "bezahlt"
 
 #: warpfood/templates/warpfood/view.html:126
 msgid "product_list"
-msgstr ""
+msgstr "Produkt Liste"
 
 #: warpfood/templates/warpfood/view.html:162
 msgid "are_you_sure"
-msgstr ""
+msgstr "Bist du sicher ?"
 
 #: warpmain/templates/warpmain/about.html:5 warpzone/util.py:7
 msgid "about"
-msgstr ""
+msgstr "Ãœber"
 
 #: warpmain/templates/warpmain/about.html:7
 msgid "welcome_to_wz_internal"
-msgstr ""
+msgstr "Willkommen bei WarpAuth"
 
 #: warpmain/templates/warpmain/about.html:10
 msgid "about_text"
-msgstr ""
+msgstr "Den scheiß hier liest doch keiner"
 
 #: warpmain/templates/warpmain/about.html:14
 msgid "visit_us!"
-msgstr ""
+msgstr "Besuchen"
 
 #: warpmain/templates/warpmain/about.html:17
 msgid "license"
-msgstr ""
+msgstr "Lizenz"
 
 #: warpmain/templates/warpmain/about.html:19
 msgid "licenses"
-msgstr ""
+msgstr "GNU GPL v3"
 
 #: warpmain/templates/warpmain/about.html:22
 msgid "support"
-msgstr ""
+msgstr "Support"
 
 #: warpmain/templates/warpmain/about.html:23
 msgid "support_text"
-msgstr ""
+msgstr "WTF? Support ?"
 
 #: warpmain/templates/warpmain/about.html:41
 msgid "open_source_licenses"
-msgstr ""
+msgstr "Lizenzen"
 
 #: warpmain/templates/warpmain/main.html:7
 msgid "news"
-msgstr ""
+msgstr "Neuigkeiten"
 
 #: warpmain/templates/warpmain/main.html:11
 msgid "add_news"
-msgstr ""
+msgstr "News"
 
 #: warpmain/templates/warpmain/main.html:20
 msgid "create"
-msgstr ""
+msgstr "Erstellen"
 
 #: warpmain/templates/warpmain/main.html:36
 msgid "created_by"
@@ -553,8 +549,5 @@ msgstr "Erstellt von"
 
 #: warppay/templates/warppay/main.html:6
 msgid "News"
-msgstr ""
+msgstr "News"
 
-#: warppay/templates/warppay/main.html:17
-msgid "Created by"
-msgstr ""
diff --git a/www/web/locale/en/LC_MESSAGES/django.po b/www/web/locale/en/LC_MESSAGES/django.po
index bcb946391ebdb49b72da3c1f52b9757d04d8d07f..2164936e92368bfbf42007293264d540e6abbe06 100644
--- a/www/web/locale/en/LC_MESSAGES/django.po
+++ b/www/web/locale/en/LC_MESSAGES/django.po
@@ -23,25 +23,25 @@ msgstr ""
 
 #: templates/base.html:62 warpauth/templates/warpauth/profile.html.py:7
 msgid "profile_settings"
-msgstr ""
+msgstr "Profile Settings"
 
 #: templates/base.html:65
 msgid "admin"
-msgstr ""
+msgstr "Admin"
 
 #: templates/base.html:70 warpfood/templates/warpfood/edit_sheet.html.py:6
 #: warpfood/templates/warpfood/main.html:6
 #: warpfood/templates/warpfood/view.html:6 warpzone/util.py:6
 msgid "pizza_sheet"
-msgstr ""
+msgstr "PizzaSheet"
 
 #: templates/two_factor/core/login.html:5
 msgid "login"
-msgstr ""
+msgstr "Login"
 
 #: templates/two_factor/core/login.html:8
 msgid "Enter your credentials."
-msgstr ""
+msgstr "Enter your credentials."
 
 #: templates/two_factor/core/login.html:11
 msgid ""
@@ -175,29 +175,29 @@ msgstr ""
 
 #: warpauth/templates/warpauth/profile.html:13
 msgid "information"
-msgstr ""
+msgstr "Information"
 
 #: warpauth/templates/warpauth/profile.html:16
 #: warpauth/templates/warpauth/profile/change_password.html:34
 msgid "change_password"
-msgstr ""
+msgstr "Chnge Password"
 
 #: warpauth/templates/warpauth/profile.html:19
 msgid "two_factor_authentication"
-msgstr ""
+msgstr "two factor authentication"
 
 #: warpauth/templates/warpauth/profile/change_password.html:9
 #: warpauth/templates/warpauth/reset_password/change_password.html:9
 msgid "password_change_successful"
-msgstr ""
+msgstr "password change successful"
 
 #: warpauth/templates/warpauth/profile/change_password.html:15
 msgid "current_password"
-msgstr ""
+msgstr "current password"
 
 #: warpauth/templates/warpauth/profile/change_password.html:21
 msgid "new_password"
-msgstr ""
+msgstr "new password"
 
 #: warpauth/templates/warpauth/profile/change_password.html:27
 #: warpauth/templates/warpauth/register/register.html:31
@@ -205,57 +205,57 @@ msgstr ""
 #: warpauth/templates/warpauth/reset_password/change_password.html:21
 #: warpauth/templates/warpauth/reset_password/change_password.html:22
 msgid "confirm_password"
-msgstr ""
+msgstr "confirm password"
 
 #: warpauth/templates/warpauth/profile/information.html:5
 msgid "user_data"
-msgstr ""
+msgstr "user data"
 
 #: warpauth/templates/warpauth/profile/information.html:13
 msgid "information_changed_successfully"
-msgstr ""
+msgstr "information changed successfully"
 
 #: warpauth/templates/warpauth/profile/information.html:20
 #: warpfood/templates/warpfood/edit_sheet.html:15
 msgid "submit"
-msgstr ""
+msgstr "Submit"
 
 #: warpauth/templates/warpauth/profile/information.html:29
 msgid "groups"
-msgstr ""
+msgstr "Groups"
 
 #: warpauth/templates/warpauth/register/activate.html:3
 msgid "activation"
-msgstr ""
+msgstr "activation"
 
 #: warpauth/templates/warpauth/register/activate.html:11
 msgid "back"
-msgstr ""
+msgstr "Back"
 
 #: warpauth/templates/warpauth/register/activate.html:14
 msgid "msg_account_successfully_activated"
-msgstr ""
+msgstr "account successfully activated"
 
 #: warpauth/templates/warpauth/register/activate.html:17
 msgid "ok"
-msgstr ""
+msgstr "Ok"
 
 #: warpauth/templates/warpauth/register/register.html:3
 #: warpauth/templates/warpauth/register/resend_token.html:3
 msgid "registration"
-msgstr ""
+msgstr "Registration"
 
 #: warpauth/templates/warpauth/register/register.html:7
 msgid "msg_account_successfully_created"
-msgstr ""
+msgstr "account successfully created"
 
 #: warpauth/templates/warpauth/register/register.html:10
 msgid "Back"
-msgstr ""
+msgstr "Back"
 
 #: warpauth/templates/warpauth/register/register.html:15
 msgid "please_register"
-msgstr ""
+msgstr "please register"
 
 #: warpauth/templates/warpauth/register/register.html:25
 #: warpauth/templates/warpauth/register/register.html:26
@@ -265,7 +265,7 @@ msgstr ""
 #: warpauth/templates/warpauth/reset_password/token_gen.html:16
 #: warpfood/templates/warpfood/view.html:80
 msgid "username"
-msgstr ""
+msgstr "Username"
 
 #: warpauth/templates/warpauth/register/register.html:27
 #: warpauth/templates/warpauth/register/register.html:28
@@ -274,73 +274,73 @@ msgstr ""
 #: warpauth/templates/warpauth/reset_password/token_gen.html:17
 #: warpauth/templates/warpauth/reset_password/token_gen.html:18
 msgid "email"
-msgstr ""
+msgstr "E-mail"
 
 #: warpauth/templates/warpauth/register/register.html:29
 #: warpauth/templates/warpauth/register/register.html:30
 #: warpauth/templates/warpauth/reset_password/change_password.html:18
 #: warpauth/templates/warpauth/reset_password/change_password.html:19
 msgid "password"
-msgstr ""
+msgstr "Password"
 
 #: warpauth/templates/warpauth/register/register.html:33
 msgid "register"
-msgstr ""
+msgstr "Register"
 
 #: warpauth/templates/warpauth/register/resend_token.html:7
 msgid "error_processing_request"
-msgstr ""
+msgstr "error processing request"
 
 #: warpauth/templates/warpauth/register/resend_token.html:11
 msgid "resend_token_successful"
-msgstr ""
+msgstr "Token Successfully sent"
 
 #: warpauth/templates/warpauth/register/resend_token.html:16
 msgid "resend_token"
-msgstr ""
+msgstr "resent Token"
 
 #: warpauth/templates/warpauth/register/resend_token.html:22
 msgid "proceed"
-msgstr ""
+msgstr "proceed"
 
 #: 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 ""
+msgstr "reset password"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:9
 msgid "redirect_within_5_sec_if_not_click"
-msgstr ""
+msgstr "redirect within 5 sec if not click"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:10
 msgid "here"
-msgstr ""
+msgstr "here"
 
 #: warpauth/templates/warpauth/reset_password/change_password.html:16
 msgid "enter_new_password_for_user"
-msgstr ""
+msgstr "Enter new password for user"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:9
 msgid "msg_reset_email_sent"
-msgstr ""
+msgstr "E-mail sent"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:14
 msgid "enter_email_address"
-msgstr ""
+msgstr "enter E-mail address"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:22
 #: warpauth/views/register.py:34
 msgid "err_invalid_email_format"
-msgstr ""
+msgstr "invalid email format"
 
 #: warpauth/templates/warpauth/reset_password/token_gen.html:27
 msgid "Reset Password"
-msgstr ""
+msgstr "Reset Password"
 
 #: warpauth/util.py:5
 msgid "mail_subj_password_changed_recently"
-msgstr ""
+msgstr "password changed recently"
 
 #: warpauth/util.py:5
 msgid "mail_content_password_changed_recently"
@@ -353,116 +353,112 @@ msgstr ""
 
 #: warpauth/views/register.py:17
 msgid "Your registration for WarpInfra"
-msgstr ""
+msgstr "Your registration for WarpInfra"
 
 #: warpauth/views/register.py:37
 msgid "err_fill_all_fields"
-msgstr ""
+msgstr "requred fields are empty"
 
 #: warpauth/views/register.py:39
 msgid "err_invalid_username"
-msgstr ""
+msgstr "invalid username"
 
 #: warpauth/views/register.py:41 warpauth/views/reset_password.py:57
 msgid "err_passwords_not_matching"
-msgstr ""
+msgstr "Password do not match"
 
 #: warpauth/views/register.py:64
 msgid "err_sending_mail"
-msgstr ""
+msgstr "error sending mail"
 
 #: warpauth/views/register.py:68
 msgid "err_username_not_available"
-msgstr ""
+msgstr "username is not available"
 
 #: warpauth/views/register.py:81
 msgid "err_token_invalid"
-msgstr ""
+msgstr "invalid token"
 
 #: warpauth/views/register.py:92 warpauth/views/register.py:95
 msgid "err_processing_request"
-msgstr ""
+msgstr "error processing request"
 
 #: warpauth/views/reset_password.py:34
 msgid "mail_subj_reset_password_token"
-msgstr ""
+msgstr "Reset Password"
 
 #: warpauth/views/reset_password.py:34
 #, python-format
 msgid "mail_content_reset_password_token %(link)s"
-msgstr ""
+msgstr "Reset Password Token: %(link)s"
 
 #: warpauth/views/reset_password.py:36
 msgid "err_sending_email"
-msgstr ""
+msgstr "Error sending mail"
 
 #: warpauth/views/reset_password.py:68
 msgid "err_invalid_token"
-msgstr ""
+msgstr "invalid token"
 
 #: warpfood/templates/warpfood/main.html:16
 msgid "create_food_sheet"
-msgstr ""
+msgstr "Create Sheet"
 
 #: warpfood/templates/warpfood/main.html:25
 msgid "estimated_order_time"
-msgstr ""
+msgstr "estimated order time"
 
 #: warpfood/templates/warpfood/main.html:25
 msgid "pizza_service"
-msgstr ""
+msgstr "pizza service"
 
 #: warpfood/templates/warpfood/main.html:25
 msgid "status"
-msgstr ""
+msgstr "Status"
 
 #: warpfood/templates/warpfood/view.html:15
 msgid "homepage"
-msgstr ""
+msgstr "Homepage"
 
 #: warpfood/templates/warpfood/view.html:16
 msgid "phone_number"
-msgstr ""
-
-#: warpfood/templates/warpfood/view.html:17
-msgid "estimaged_order_time"
-msgstr ""
+msgstr "Phone"
 
 #: warpfood/templates/warpfood/view.html:19
 msgid "real_order_time"
-msgstr ""
+msgstr "order time"
 
 #: warpfood/templates/warpfood/view.html:24
 msgid "edit"
-msgstr ""
+msgstr "Edit"
 
 #: warpfood/templates/warpfood/view.html:26
 msgid "close"
-msgstr ""
+msgstr "Close"
 
 #: warpfood/templates/warpfood/view.html:28
 msgid "open"
-msgstr ""
+msgstr "Open"
 
 #: warpfood/templates/warpfood/view.html:32
 msgid "ordered"
-msgstr ""
+msgstr "ordered"
 
 #: warpfood/templates/warpfood/view.html:34
 msgid "confirm"
-msgstr ""
+msgstr "Confirm"
 
 #: warpfood/templates/warpfood/view.html:41
 msgid "order_sum"
-msgstr ""
+msgstr "Sum"
 
 #: warpfood/templates/warpfood/view.html:57
 msgid "choose_from_products"
-msgstr ""
+msgstr "choose from product list"
 
 #: warpfood/templates/warpfood/view.html:65
 msgid "order"
-msgstr ""
+msgstr "order"
 
 #: warpfood/templates/warpfood/view.html:73
 #, python-format
@@ -473,39 +469,39 @@ msgstr ""
 
 #: warpfood/templates/warpfood/view.html:81
 msgid "article"
-msgstr ""
+msgstr "article"
 
 #: warpfood/templates/warpfood/view.html:82
 msgid "size"
-msgstr ""
+msgstr "size"
 
 #: warpfood/templates/warpfood/view.html:83
 msgid "price"
-msgstr ""
+msgstr "price"
 
 #: warpfood/templates/warpfood/view.html:84
 msgid "comment"
-msgstr ""
+msgstr "comment"
 
 #: warpfood/templates/warpfood/view.html:85
 msgid "paid"
-msgstr ""
+msgstr "paid"
 
 #: warpfood/templates/warpfood/view.html:126
 msgid "product_list"
-msgstr ""
+msgstr "product list"
 
 #: warpfood/templates/warpfood/view.html:162
 msgid "are_you_sure"
-msgstr ""
+msgstr "are you sure ?"
 
 #: warpmain/templates/warpmain/about.html:5 warpzone/util.py:7
 msgid "about"
-msgstr ""
+msgstr "About"
 
 #: warpmain/templates/warpmain/about.html:7
 msgid "welcome_to_wz_internal"
-msgstr ""
+msgstr "Welcome to WarpAutch"
 
 #: warpmain/templates/warpmain/about.html:10
 msgid "about_text"
@@ -513,19 +509,19 @@ msgstr ""
 
 #: warpmain/templates/warpmain/about.html:14
 msgid "visit_us!"
-msgstr ""
+msgstr "visit us"
 
 #: warpmain/templates/warpmain/about.html:17
 msgid "license"
-msgstr ""
+msgstr "License"
 
 #: warpmain/templates/warpmain/about.html:19
 msgid "licenses"
-msgstr ""
+msgstr "GNU GPL v3"
 
 #: warpmain/templates/warpmain/about.html:22
 msgid "support"
-msgstr ""
+msgstr "Support"
 
 #: warpmain/templates/warpmain/about.html:23
 msgid "support_text"
@@ -533,28 +529,25 @@ msgstr ""
 
 #: warpmain/templates/warpmain/about.html:41
 msgid "open_source_licenses"
-msgstr ""
+msgstr "Licenses"
 
 #: warpmain/templates/warpmain/main.html:7
 msgid "news"
-msgstr ""
+msgstr "News"
 
 #: warpmain/templates/warpmain/main.html:11
 msgid "add_news"
-msgstr ""
+msgstr "Add"
 
 #: warpmain/templates/warpmain/main.html:20
 msgid "create"
-msgstr ""
+msgstr "Create"
 
 #: warpmain/templates/warpmain/main.html:36
 msgid "created_by"
-msgstr ""
+msgstr "Created by"
 
 #: warppay/templates/warppay/main.html:6
 msgid "News"
-msgstr ""
+msgstr "News"
 
-#: warppay/templates/warppay/main.html:17
-msgid "Created by"
-msgstr ""
diff --git a/www/web/warpfood/templates/warpfood/view.html b/www/web/warpfood/templates/warpfood/view.html
index 8164452461cf08feb0ff7c9b20423cfb3f86d2c5..dea9cc2d05e1a6a51a32b9b3dc2ec3f7845621a0 100644
--- a/www/web/warpfood/templates/warpfood/view.html
+++ b/www/web/warpfood/templates/warpfood/view.html
@@ -14,7 +14,7 @@
 
                     <small>{% trans "homepage" %}: <a href="{{ sheet.food_service.homepage }}" target="_blank">{{ sheet.food_service.homepage }}</a></small><br/><br/>
                     <small>{% trans "phone_number" %}: {{ sheet.food_service.phone }}</small><br/><br/>
-                    <small>{% trans "estimaged_order_time" %}: {{ sheet.estimated_order_time | naturaltime }}</small><br/><br/>
+                    <small>{% trans "estimated_order_time" %}: {{ sheet.estimated_order_time | naturaltime }}</small><br/><br/>
                     {% if sheet.order_time %}
                         <small>{% trans "real_order_time" %}: {{ sheet.order_time | naturaltime }}</small><br/>
                     {% endif %}
diff --git a/www/web/warppay/templates/warppay/main.html b/www/web/warppay/templates/warppay/main.html
index 5a036cd9c010886bb6a080a585e2a5721f8978c3..2f02b1c3233c26841f092e930a4c2def9102ff46 100644
--- a/www/web/warppay/templates/warppay/main.html
+++ b/www/web/warppay/templates/warppay/main.html
@@ -14,7 +14,7 @@
                 {{ news.message }}
             </div>
             <div class="panel-footer">
-                {% trans "Created by" %} {{ news.user }} {{ news.created | naturaltime }}
+                {% trans "created by" %} {{ news.user }} {{ news.created | naturaltime }}
             </div>
         </div>
     {% endfor %}