diff --git a/nsupdate/locale/de/LC_MESSAGES/django.po b/nsupdate/locale/de/LC_MESSAGES/django.po
index becc46f..655be8b 100644
--- a/nsupdate/locale/de/LC_MESSAGES/django.po
+++ b/nsupdate/locale/de/LC_MESSAGES/django.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nsupdate.info\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-30 21:38+0200\n"
-"PO-Revision-Date: 2014-09-30 19:36+0000\n"
+"POT-Creation-Date: 2014-11-01 21:35+0100\n"
+"PO-Revision-Date: 2014-10-28 15:25+0000\n"
 "Last-Translator: Thomas Waldmann <tw@waldmann-edv.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/nsupdateinfo/"
 "language/de/)\n"
@@ -22,6 +22,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: accounts/templates/accounts/delete_user.html:7
+msgid "Delete your User Account"
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:11
+msgid ""
+"\n"
+"                    Are you sure you want to delete your user account and\n"
+"                    all your data on this service? You can not undelete your "
+"data.\n"
+"                    "
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:16
+#: main/templates/main/delete_object.html:11
+msgid "Confirm"
+msgstr "Bestätigen"
+
 #: accounts/templates/accounts/user_profile.html:7
 msgid "User Profile of"
 msgstr "Benutzerprofil von"
@@ -30,15 +48,33 @@ msgstr "Benutzerprofil von"
 msgid "Submit"
 msgstr "Absenden"
 
-#: accounts/templates/accounts/user_profile.html:20
+#: accounts/templates/accounts/user_profile.html:18
 msgid "Associate with remote Account"
 msgstr "Mit entferntem Konto verbinden"
 
-#: accounts/templates/accounts/user_profile.html:27
+#: accounts/templates/accounts/user_profile.html:25
 msgid "Disassociate from remote Account"
 msgstr "Verbindung mit entferntem Konto aufheben"
 
+#: accounts/templates/accounts/user_profile.html:35
+#: accounts/templates/accounts/user_profile.html:44
+#, fuzzy
+msgid "Delete User Profile"
+msgstr "Benutzerprofil von"
+
+#: accounts/templates/accounts/user_profile.html:37
+msgid ""
+"\n"
+"            If you'ld like to stop using this service and delete this user "
+"profile and\n"
+"            all your data (especially all hosts and all domains created by "
+"this user),\n"
+"            you can do it here.\n"
+"            "
+msgstr ""
+
 #: accounts/templates/registration/activate.html:4
+#: accounts/templates/registration/activation_complete.html:3
 msgid "Activation complete"
 msgstr "Aktivierung abgeschlossen"
 
@@ -46,13 +82,17 @@ msgstr "Aktivierung abgeschlossen"
 msgid "Activation problem"
 msgstr "Problem bei der Aktivierung"
 
-#: accounts/templates/registration/activate.html:7
-#, python-format
+#: accounts/templates/registration/activate.html:8
+#: accounts/templates/registration/activation_complete.html:6
+#, fuzzy
+msgid "Thanks, activation complete!"
+msgstr "Aktivierung abgeschlossen"
+
+#: accounts/templates/registration/activate.html:9
+#: accounts/templates/registration/activation_complete.html:7
+#, fuzzy
 msgid ""
-"\n"
-"Thanks %(account)s, activation complete!\n"
-"You may now <a href='%(auth_login_url)s'>login</a> using the username and "
-"password you set at registration.\n"
+"You may now login using the username and password you set at registration."
 msgstr ""
 "\n"
 "Danke %(account)s, die Aktivierung ist abgeschlossen!\n"
@@ -60,16 +100,27 @@ msgstr ""
 "Benutzernamen und dem Passwort, die Du bei der Registrierung angegeben "
 "hast.\n"
 
+#: accounts/templates/registration/activate.html:10
+#: accounts/templates/registration/activation_complete.html:8
+#: login/templates/login.html:3 login/templates/login.html.py:24
+#: login/templates/password_reset_complete.html:8 templates/base.html:61
+msgid "Log in"
+msgstr "Anmelden"
+
 #: accounts/templates/registration/activate.html:12
+msgid "Oops"
+msgstr ""
+
+#: accounts/templates/registration/activate.html:13
+#, fuzzy
 msgid ""
-"Oops -- it seems that your activation key is invalid.  Please check the url "
-"again."
+"it seems that your activation key is invalid.  Please check the url again."
 msgstr ""
 "Oops -- es scheint so, als wäre dein Aktivierungsschlüssel nicht gültig. "
 "Bitte überprüfe die URL noch einmal."
 
 #: accounts/templates/registration/activation_email.html:8
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "<body>\n"
 "<h3>Account registration for %(sitename)s</h3>\n"
@@ -83,8 +134,8 @@ msgid ""
 "<p>\n"
 "To activate this account, please click the following link within the next \n"
 "<b>%(expiration_days)s</b> days:<br/>\n"
-"<a href=\"http://%(sitedomain)s%(activation_key_url)s\">http://%(sitedomain)s"
-"%(activation_key_url)s</a>\n"
+"<a href=\"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s\">"
+"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s</a>\n"
 "</p>\n"
 "<p>\n"
 "Sincerely,<br/>\n"
@@ -117,16 +168,20 @@ msgstr ""
 msgid "Activation email sent"
 msgstr "Aktivierungsmail wurde gesendet"
 
-#: accounts/templates/registration/registration_complete.html:5
-msgid ""
-"An activation email has been sent.\n"
-"Please check your email and click on the link to activate your account."
+#: accounts/templates/registration/registration_complete.html:6
+#, fuzzy
+msgid "An activation email has been sent."
+msgstr "Aktivierungsmail wurde gesendet"
+
+#: accounts/templates/registration/registration_complete.html:7
+#, fuzzy
+msgid "Please check your email and click on the link to activate your account."
 msgstr ""
 "Eine Aktivierungs-E-Mail wurde versandt.\n"
 "Bitte sieh in Deinen E-Mails nach und klicke auf den Link, um Dein Konto zu "
 "aktivieren."
 
-#: accounts/templates/registration/registration_form.html:4
+#: accounts/templates/registration/registration_form.html:3
 msgid "Register for an account"
 msgstr "Neues Benutzer-Konto erstellen"
 
@@ -214,15 +269,10 @@ msgstr ""
 "Aktivierungs-E-Mail dort hin.<br>\n"
 "        Passwort: bitte benutze ein Gutes, wir vertrauen Dir."
 
-#: accounts/templates/registration/registration_form.html:51
+#: accounts/templates/registration/registration_form.html:52
 msgid "Send activation email"
 msgstr "Aktivierungsmail senden"
 
-#: login/templates/login.html:3 login/templates/login.html.py:24
-#: login/templates/password_reset_complete.html:10 templates/base.html:61
-msgid "Log in"
-msgstr "Anmelden"
-
 #: login/templates/login.html:8
 msgid "Login with a local Account"
 msgstr "Mit lokalem Konto anmelden"
@@ -237,15 +287,15 @@ msgstr ""
 msgid "Remember me"
 msgstr "Angemeldet bleiben"
 
-#: login/templates/login.html:26
+#: login/templates/login.html:24
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: login/templates/login.html:27
+#: login/templates/login.html:26
 msgid "Sign up for a new account..."
 msgstr "Neues Konto erstellen..."
 
-#: login/templates/login.html:34
+#: login/templates/login.html:33
 msgid "Login with a remote Account"
 msgstr "Mit entferntem Konto anmelden"
 
@@ -253,13 +303,13 @@ msgstr "Mit entferntem Konto anmelden"
 msgid "Log out"
 msgstr "Abmelden"
 
-#: login/templates/logout.html:7
+#: login/templates/logout.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 "Danke, dass Du heute etwas Deiner kostbaren Zeit mit dieser Webseite "
 "verbracht hast."
 
-#: login/templates/logout.html:8
+#: login/templates/logout.html:9
 msgid "Log in again"
 msgstr "Wieder anmelden"
 
@@ -278,25 +328,25 @@ msgstr ""
 "hast."
 
 #: login/templates/password_change.html:15
-#: login/templates/password_reset_confirm.html:17
+#: login/templates/password_reset_confirm.html:14
 msgid "Change my password"
 msgstr "Mein Passwort ändern"
 
 #: login/templates/password_change_done.html:3
-#: login/templates/password_change_done.html:7
+#: login/templates/password_change_done.html:6
 msgid "Password change successful"
 msgstr "Passwort wurde erfolgreich geändert"
 
-#: login/templates/password_change_done.html:8
+#: login/templates/password_change_done.html:7
 msgid "Your password was changed."
 msgstr "Dein Passwort wurde geändert."
 
-#: login/templates/password_reset.html:3 login/templates/password_reset.html:8
+#: login/templates/password_reset.html:3 login/templates/password_reset.html:7
 #: login/templates/password_reset_confirm.html:3
 msgid "Password reset"
 msgstr "Passwort zurücksetzen"
 
-#: login/templates/password_reset.html:10
+#: login/templates/password_reset.html:9
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
@@ -304,7 +354,7 @@ msgstr ""
 "Passwort vergessen? Gib deine E-Mailadresse ein und folge den Instruktionen "
 "in der E-Mail um ein neues zu vergeben."
 
-#: login/templates/password_reset.html:18
+#: login/templates/password_reset.html:17
 msgid "Reset my password"
 msgstr "Mein Passwort zurücksetzen"
 
@@ -313,15 +363,15 @@ msgstr "Mein Passwort zurücksetzen"
 msgid "Password reset complete"
 msgstr "Passwort zurückgesetzt"
 
-#: login/templates/password_reset_complete.html:8
+#: login/templates/password_reset_complete.html:7
 msgid "Your password has been set. You may go ahead and log in now."
-msgstr "Ihr Passwort wurde versendet. Sie können sich jetzt einloggen."
+msgstr "Ihr Passwort wurde gesetzt. Sie können sich jetzt einloggen."
 
-#: login/templates/password_reset_confirm.html:8
+#: login/templates/password_reset_confirm.html:7
 msgid "Enter new password"
 msgstr "Gib ein neues Passwort ein"
 
-#: login/templates/password_reset_confirm.html:10
+#: login/templates/password_reset_confirm.html:8
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -329,11 +379,11 @@ msgstr ""
 "Bitte gib dein Passwort zwei Mal ein, damit wir sicherstellen können, dass "
 "das Passwort korrekt eingegeben wurde."
 
-#: login/templates/password_reset_confirm.html:26
+#: login/templates/password_reset_confirm.html:21
 msgid "Password reset unsuccessful"
 msgstr "Das zurücksetzen vom Passwort war nicht erfolgreich"
 
-#: login/templates/password_reset_confirm.html:28
+#: login/templates/password_reset_confirm.html:22
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used. Please request a new password reset."
@@ -346,7 +396,7 @@ msgstr ""
 msgid "Password reset successful"
 msgstr "Passwort wurde erfolgreich zurückgesetzt"
 
-#: login/templates/password_reset_done.html:8
+#: login/templates/password_reset_done.html:7
 msgid ""
 "We've emailed you instructions for setting your password. You should be "
 "receiving them shortly."
@@ -354,7 +404,7 @@ msgstr ""
 "Wir haben Dir eine Anleitung per E-Mail zugesandt, wie Du Dein Passwort "
 "setzen kannst. Du solltest sie in Kürze erhalten."
 
-#: login/templates/password_reset_done.html:10
+#: login/templates/password_reset_done.html:8
 msgid ""
 "If you don't receive an email, please make sure you've entered the address "
 "you registered with, and check your spam folder."
@@ -417,13 +467,13 @@ msgstr ""
 msgid "The name of your host."
 msgstr "Der Name Deines Hosts."
 
-#: main/models.py:142 main/models.py:307
+#: main/models.py:142 main/models.py:322
 msgid ""
 "Some arbitrary comment about your host, e.g  who / what / where this host is"
 msgstr ""
 "Beliebiger Kommentar zu Deinem Host, z.B. wer / was / wo dieser Host ist"
 
-#: main/models.py:149 main/models.py:318
+#: main/models.py:149 main/models.py:333
 msgid ""
 "Check if host is available/in use - if not checked, we won't accept updates "
 "for this host"
@@ -460,51 +510,51 @@ msgstr "Letzte Ergebnis-Nachricht, die sich auf den Client bezieht"
 msgid "Latest result message relating to the server"
 msgstr "Letzte Ergebnis-Nachricht, die sich auf den Server bezieht"
 
-#: main/models.py:303
+#: main/models.py:318
 msgid "The name of a host in same network as your main host."
 msgstr "Der Name eines Hosts im gleichen Netzwerk wie Dein Haupt-Host."
 
-#: main/models.py:311
+#: main/models.py:326
 msgid "The IPv4 interface ID of this host. Use IPv4 notation."
 msgstr "Die IPv4-Interface-ID dieses Hosts. Benutze IPv4-Notation."
 
-#: main/models.py:315
+#: main/models.py:330
 msgid "The IPv6 interface ID of this host. Use IPv6 notation."
 msgstr "Die IPv6-Interface-ID dieses Hosts. Benutze IPv6-Notation."
 
-#: main/models.py:358
+#: main/models.py:373
 msgid "Service name"
 msgstr "Service-Name"
 
-#: main/models.py:362
+#: main/models.py:377
 msgid "Some arbitrary comment about the service"
 msgstr "Kommentar über diesen Service"
 
-#: main/models.py:365
+#: main/models.py:380
 msgid "Update Server [name or IP] of this service"
 msgstr "Update-Server [Name oder IP] dieses Service"
 
-#: main/models.py:369
+#: main/models.py:384
 msgid "Update Server URL path of this service"
 msgstr "Update-Server URL-Pfad dieses Service"
 
-#: main/models.py:372
+#: main/models.py:387
 msgid "Use https / TLS to contact the Update Server?"
 msgstr "https / TLS benutzen, um diesen Update-Server zu kontaktieren?"
 
-#: main/models.py:392
+#: main/models.py:407
 msgid "The hostname for that service (used in query string)"
 msgstr "Der Hostname für diesen Service (wird im Query-String benutzt)"
 
-#: main/models.py:396
+#: main/models.py:411
 msgid "Some arbitrary comment about your host on that service"
 msgstr "Ein beliebiger Kommentar über Deinen Host auf diesem Service"
 
-#: main/models.py:401
+#: main/models.py:416
 msgid "The name/id for that service (used for http basic auth)"
 msgstr "Der Name/ID für diesen Service (wird für http basic auth benutzt)"
 
-#: main/models.py:404
+#: main/models.py:419
 msgid "The password/secret for that service (used for http basic auth)"
 msgstr ""
 "Das Password/Secret für diesen Service (wird für http basic auth benutzt)"
@@ -707,10 +757,6 @@ msgstr "%(object)s löschen"
 msgid "Are you sure you want to delete \"%(object)s\"?"
 msgstr "Bist Du sicher, dass Du \"%(object)s\" löschen willst?"
 
-#: main/templates/main/delete_object.html:11
-msgid "Confirm"
-msgstr "Bestätigen"
-
 #: main/templates/main/domain.html:8
 msgid "Edit Domain"
 msgstr "Domain bearbeiten"
@@ -1780,19 +1826,19 @@ msgstr ""
 "aber\n"
 "natürlich musst Du Deine wirkliche, öffentliche IP stattdessen benutzen."
 
-#: settings/base.py:381
+#: settings/base.py:383
 msgid "English"
 msgstr "Englisch"
 
-#: settings/base.py:382
+#: settings/base.py:384
 msgid "German"
 msgstr "Deutsch"
 
-#: settings/base.py:383
+#: settings/base.py:385
 msgid "French"
 msgstr "Französisch"
 
-#: settings/base.py:384
+#: settings/base.py:386
 msgid "Italian"
 msgstr "Italienisch"
 
@@ -1872,3 +1918,6 @@ msgstr "Valid HTML"
 #: templates/includes/base_footer.html:7
 msgid "Valid CSS"
 msgstr "Valid CSS"
+
+#~ msgid "Chinese (China)"
+#~ msgstr "Chinesisch (China)"
diff --git a/nsupdate/locale/en/LC_MESSAGES/django.po b/nsupdate/locale/en/LC_MESSAGES/django.po
index 296cd07..80c4729 100644
--- a/nsupdate/locale/en/LC_MESSAGES/django.po
+++ b/nsupdate/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: 2014-09-30 21:38+0200\n"
+"POT-Creation-Date: 2014-11-01 21:35+0100\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,6 +17,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: accounts/templates/accounts/delete_user.html:7
+msgid "Delete your User Account"
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:11
+msgid ""
+"\n"
+"                    Are you sure you want to delete your user account and\n"
+"                    all your data on this service? You can not undelete your "
+"data.\n"
+"                    "
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:16
+#: main/templates/main/delete_object.html:11
+msgid "Confirm"
+msgstr ""
+
 #: accounts/templates/accounts/user_profile.html:7
 msgid "User Profile of"
 msgstr ""
@@ -25,15 +43,32 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: accounts/templates/accounts/user_profile.html:20
+#: accounts/templates/accounts/user_profile.html:18
 msgid "Associate with remote Account"
 msgstr ""
 
-#: accounts/templates/accounts/user_profile.html:27
+#: accounts/templates/accounts/user_profile.html:25
 msgid "Disassociate from remote Account"
 msgstr ""
 
+#: accounts/templates/accounts/user_profile.html:35
+#: accounts/templates/accounts/user_profile.html:44
+msgid "Delete User Profile"
+msgstr ""
+
+#: accounts/templates/accounts/user_profile.html:37
+msgid ""
+"\n"
+"            If you'ld like to stop using this service and delete this user "
+"profile and\n"
+"            all your data (especially all hosts and all domains created by "
+"this user),\n"
+"            you can do it here.\n"
+"            "
+msgstr ""
+
 #: accounts/templates/registration/activate.html:4
+#: accounts/templates/registration/activation_complete.html:3
 msgid "Activation complete"
 msgstr ""
 
@@ -41,19 +76,31 @@ msgstr ""
 msgid "Activation problem"
 msgstr ""
 
-#: accounts/templates/registration/activate.html:7
-#, python-format
+#: accounts/templates/registration/activate.html:8
+#: accounts/templates/registration/activation_complete.html:6
+msgid "Thanks, activation complete!"
+msgstr ""
+
+#: accounts/templates/registration/activate.html:9
+#: accounts/templates/registration/activation_complete.html:7
 msgid ""
-"\n"
-"Thanks %(account)s, activation complete!\n"
-"You may now <a href='%(auth_login_url)s'>login</a> using the username and "
-"password you set at registration.\n"
+"You may now login using the username and password you set at registration."
+msgstr ""
+
+#: accounts/templates/registration/activate.html:10
+#: accounts/templates/registration/activation_complete.html:8
+#: login/templates/login.html:3 login/templates/login.html.py:24
+#: login/templates/password_reset_complete.html:8 templates/base.html:61
+msgid "Log in"
 msgstr ""
 
 #: accounts/templates/registration/activate.html:12
+msgid "Oops"
+msgstr ""
+
+#: accounts/templates/registration/activate.html:13
 msgid ""
-"Oops -- it seems that your activation key is invalid.  Please check the url "
-"again."
+"it seems that your activation key is invalid.  Please check the url again."
 msgstr ""
 
 #: accounts/templates/registration/activation_email.html:8
@@ -71,8 +118,8 @@ msgid ""
 "<p>\n"
 "To activate this account, please click the following link within the next \n"
 "<b>%(expiration_days)s</b> days:<br/>\n"
-"<a href=\"http://%(sitedomain)s%(activation_key_url)s\">http://%(sitedomain)s"
-"%(activation_key_url)s</a>\n"
+"<a href=\"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s\">"
+"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s</a>\n"
 "</p>\n"
 "<p>\n"
 "Sincerely,<br/>\n"
@@ -85,13 +132,15 @@ msgstr ""
 msgid "Activation email sent"
 msgstr ""
 
-#: accounts/templates/registration/registration_complete.html:5
-msgid ""
-"An activation email has been sent.\n"
-"Please check your email and click on the link to activate your account."
+#: accounts/templates/registration/registration_complete.html:6
+msgid "An activation email has been sent."
 msgstr ""
 
-#: accounts/templates/registration/registration_form.html:4
+#: accounts/templates/registration/registration_complete.html:7
+msgid "Please check your email and click on the link to activate your account."
+msgstr ""
+
+#: accounts/templates/registration/registration_form.html:3
 msgid "Register for an account"
 msgstr ""
 
@@ -161,15 +210,10 @@ msgid ""
 "        Password: please use a sane one, we trust you."
 msgstr ""
 
-#: accounts/templates/registration/registration_form.html:51
+#: accounts/templates/registration/registration_form.html:52
 msgid "Send activation email"
 msgstr ""
 
-#: login/templates/login.html:3 login/templates/login.html.py:24
-#: login/templates/password_reset_complete.html:10 templates/base.html:61
-msgid "Log in"
-msgstr ""
-
 #: login/templates/login.html:8
 msgid "Login with a local Account"
 msgstr ""
@@ -182,15 +226,15 @@ msgstr ""
 msgid "Remember me"
 msgstr ""
 
-#: login/templates/login.html:26
+#: login/templates/login.html:24
 msgid "Forgot your password?"
 msgstr ""
 
-#: login/templates/login.html:27
+#: login/templates/login.html:26
 msgid "Sign up for a new account..."
 msgstr ""
 
-#: login/templates/login.html:34
+#: login/templates/login.html:33
 msgid "Login with a remote Account"
 msgstr ""
 
@@ -198,11 +242,11 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: login/templates/logout.html:7
+#: login/templates/logout.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 
-#: login/templates/logout.html:8
+#: login/templates/logout.html:9
 msgid "Log in again"
 msgstr ""
 
@@ -218,31 +262,31 @@ msgid ""
 msgstr ""
 
 #: login/templates/password_change.html:15
-#: login/templates/password_reset_confirm.html:17
+#: login/templates/password_reset_confirm.html:14
 msgid "Change my password"
 msgstr ""
 
 #: login/templates/password_change_done.html:3
-#: login/templates/password_change_done.html:7
+#: login/templates/password_change_done.html:6
 msgid "Password change successful"
 msgstr ""
 
-#: login/templates/password_change_done.html:8
+#: login/templates/password_change_done.html:7
 msgid "Your password was changed."
 msgstr ""
 
-#: login/templates/password_reset.html:3 login/templates/password_reset.html:8
+#: login/templates/password_reset.html:3 login/templates/password_reset.html:7
 #: login/templates/password_reset_confirm.html:3
 msgid "Password reset"
 msgstr ""
 
-#: login/templates/password_reset.html:10
+#: login/templates/password_reset.html:9
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 
-#: login/templates/password_reset.html:18
+#: login/templates/password_reset.html:17
 msgid "Reset my password"
 msgstr ""
 
@@ -251,25 +295,25 @@ msgstr ""
 msgid "Password reset complete"
 msgstr ""
 
-#: login/templates/password_reset_complete.html:8
+#: login/templates/password_reset_complete.html:7
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr ""
 
-#: login/templates/password_reset_confirm.html:8
+#: login/templates/password_reset_confirm.html:7
 msgid "Enter new password"
 msgstr ""
 
-#: login/templates/password_reset_confirm.html:10
+#: login/templates/password_reset_confirm.html:8
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: login/templates/password_reset_confirm.html:26
+#: login/templates/password_reset_confirm.html:21
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: login/templates/password_reset_confirm.html:28
+#: login/templates/password_reset_confirm.html:22
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used. Please request a new password reset."
@@ -280,13 +324,13 @@ msgstr ""
 msgid "Password reset successful"
 msgstr ""
 
-#: login/templates/password_reset_done.html:8
+#: login/templates/password_reset_done.html:7
 msgid ""
 "We've emailed you instructions for setting your password. You should be "
 "receiving them shortly."
 msgstr ""
 
-#: login/templates/password_reset_done.html:10
+#: login/templates/password_reset_done.html:8
 msgid ""
 "If you don't receive an email, please make sure you've entered the address "
 "you registered with, and check your spam folder."
@@ -334,12 +378,12 @@ msgstr ""
 msgid "The name of your host."
 msgstr ""
 
-#: main/models.py:142 main/models.py:307
+#: main/models.py:142 main/models.py:322
 msgid ""
 "Some arbitrary comment about your host, e.g  who / what / where this host is"
 msgstr ""
 
-#: main/models.py:149 main/models.py:318
+#: main/models.py:149 main/models.py:333
 msgid ""
 "Check if host is available/in use - if not checked, we won't accept updates "
 "for this host"
@@ -371,51 +415,51 @@ msgstr ""
 msgid "Latest result message relating to the server"
 msgstr ""
 
-#: main/models.py:303
+#: main/models.py:318
 msgid "The name of a host in same network as your main host."
 msgstr ""
 
-#: main/models.py:311
+#: main/models.py:326
 msgid "The IPv4 interface ID of this host. Use IPv4 notation."
 msgstr ""
 
-#: main/models.py:315
+#: main/models.py:330
 msgid "The IPv6 interface ID of this host. Use IPv6 notation."
 msgstr ""
 
-#: main/models.py:358
+#: main/models.py:373
 msgid "Service name"
 msgstr ""
 
-#: main/models.py:362
+#: main/models.py:377
 msgid "Some arbitrary comment about the service"
 msgstr ""
 
-#: main/models.py:365
+#: main/models.py:380
 msgid "Update Server [name or IP] of this service"
 msgstr ""
 
-#: main/models.py:369
+#: main/models.py:384
 msgid "Update Server URL path of this service"
 msgstr ""
 
-#: main/models.py:372
+#: main/models.py:387
 msgid "Use https / TLS to contact the Update Server?"
 msgstr ""
 
-#: main/models.py:392
+#: main/models.py:407
 msgid "The hostname for that service (used in query string)"
 msgstr ""
 
-#: main/models.py:396
+#: main/models.py:411
 msgid "Some arbitrary comment about your host on that service"
 msgstr ""
 
-#: main/models.py:401
+#: main/models.py:416
 msgid "The name/id for that service (used for http basic auth)"
 msgstr ""
 
-#: main/models.py:404
+#: main/models.py:419
 msgid "The password/secret for that service (used for http basic auth)"
 msgstr ""
 
@@ -590,10 +634,6 @@ msgstr ""
 msgid "Are you sure you want to delete \"%(object)s\"?"
 msgstr ""
 
-#: main/templates/main/delete_object.html:11
-msgid "Confirm"
-msgstr ""
-
 #: main/templates/main/domain.html:8
 msgid "Edit Domain"
 msgstr ""
@@ -1512,19 +1552,19 @@ msgid ""
 "that."
 msgstr ""
 
-#: settings/base.py:381
+#: settings/base.py:383
 msgid "English"
 msgstr ""
 
-#: settings/base.py:382
+#: settings/base.py:384
 msgid "German"
 msgstr ""
 
-#: settings/base.py:383
+#: settings/base.py:385
 msgid "French"
 msgstr ""
 
-#: settings/base.py:384
+#: settings/base.py:386
 msgid "Italian"
 msgstr ""
 
diff --git a/nsupdate/locale/fr/LC_MESSAGES/django.po b/nsupdate/locale/fr/LC_MESSAGES/django.po
index 067d9bc..b997bcb 100644
--- a/nsupdate/locale/fr/LC_MESSAGES/django.po
+++ b/nsupdate/locale/fr/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nsupdate.info\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-30 21:38+0200\n"
-"PO-Revision-Date: 2014-09-30 19:06+0000\n"
-"Last-Translator: Thomas Waldmann <tw@waldmann-edv.de>\n"
+"POT-Creation-Date: 2014-11-01 21:35+0100\n"
+"PO-Revision-Date: 2014-10-27 16:38+0000\n"
+"Last-Translator: mandrag0ra <mandrag0ra@icloud.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/nsupdateinfo/"
 "language/fr/)\n"
 "Language: fr\n"
@@ -20,6 +20,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: accounts/templates/accounts/delete_user.html:7
+msgid "Delete your User Account"
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:11
+msgid ""
+"\n"
+"                    Are you sure you want to delete your user account and\n"
+"                    all your data on this service? You can not undelete your "
+"data.\n"
+"                    "
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:16
+#: main/templates/main/delete_object.html:11
+msgid "Confirm"
+msgstr "Confirmer"
+
 #: accounts/templates/accounts/user_profile.html:7
 msgid "User Profile of"
 msgstr "Profil utilisateur de"
@@ -28,15 +46,33 @@ msgstr "Profil utilisateur de"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: accounts/templates/accounts/user_profile.html:20
+#: accounts/templates/accounts/user_profile.html:18
 msgid "Associate with remote Account"
 msgstr "Associé au compte distant"
 
-#: accounts/templates/accounts/user_profile.html:27
+#: accounts/templates/accounts/user_profile.html:25
 msgid "Disassociate from remote Account"
 msgstr "Dissocié du compte distant"
 
+#: accounts/templates/accounts/user_profile.html:35
+#: accounts/templates/accounts/user_profile.html:44
+#, fuzzy
+msgid "Delete User Profile"
+msgstr "Profil utilisateur de"
+
+#: accounts/templates/accounts/user_profile.html:37
+msgid ""
+"\n"
+"            If you'ld like to stop using this service and delete this user "
+"profile and\n"
+"            all your data (especially all hosts and all domains created by "
+"this user),\n"
+"            you can do it here.\n"
+"            "
+msgstr ""
+
 #: accounts/templates/registration/activate.html:4
+#: accounts/templates/registration/activation_complete.html:3
 msgid "Activation complete"
 msgstr "Enregistrement terminé"
 
@@ -44,29 +80,44 @@ msgstr "Enregistrement terminé"
 msgid "Activation problem"
 msgstr "Problème lors de l'enregistrement"
 
-#: accounts/templates/registration/activate.html:7
-#, python-format
+#: accounts/templates/registration/activate.html:8
+#: accounts/templates/registration/activation_complete.html:6
+#, fuzzy
+msgid "Thanks, activation complete!"
+msgstr "Enregistrement terminé"
+
+#: accounts/templates/registration/activate.html:9
+#: accounts/templates/registration/activation_complete.html:7
+#, fuzzy
 msgid ""
-"\n"
-"Thanks %(account)s, activation complete!\n"
-"You may now <a href='%(auth_login_url)s'>login</a> using the username and "
-"password you set at registration.\n"
+"You may now login using the username and password you set at registration."
 msgstr ""
 "\n"
 "Merci %(account)s, votre compte a été enregistré.\n"
 "Vous pouvez maintenant vous <a href='%(auth_login_url)s'>connectez</a> en "
 "utilisant votre login et mot de passe.\n"
 
+#: accounts/templates/registration/activate.html:10
+#: accounts/templates/registration/activation_complete.html:8
+#: login/templates/login.html:3 login/templates/login.html.py:24
+#: login/templates/password_reset_complete.html:8 templates/base.html:61
+msgid "Log in"
+msgstr "Se connecter"
+
 #: accounts/templates/registration/activate.html:12
+msgid "Oops"
+msgstr ""
+
+#: accounts/templates/registration/activate.html:13
+#, fuzzy
 msgid ""
-"Oops -- it seems that your activation key is invalid.  Please check the url "
-"again."
+"it seems that your activation key is invalid.  Please check the url again."
 msgstr ""
 "Oops -- Il semblerait que votre clé d'action soit invalide. Merci de "
 "vérifier vos informations."
 
 #: accounts/templates/registration/activation_email.html:8
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "<body>\n"
 "<h3>Account registration for %(sitename)s</h3>\n"
@@ -80,8 +131,8 @@ msgid ""
 "<p>\n"
 "To activate this account, please click the following link within the next \n"
 "<b>%(expiration_days)s</b> days:<br/>\n"
-"<a href=\"http://%(sitedomain)s%(activation_key_url)s\">http://%(sitedomain)s"
-"%(activation_key_url)s</a>\n"
+"<a href=\"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s\">"
+"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s</a>\n"
 "</p>\n"
 "<p>\n"
 "Sincerely,<br/>\n"
@@ -114,16 +165,20 @@ msgstr ""
 msgid "Activation email sent"
 msgstr "Email d'activation envoyé"
 
-#: accounts/templates/registration/registration_complete.html:5
-msgid ""
-"An activation email has been sent.\n"
-"Please check your email and click on the link to activate your account."
+#: accounts/templates/registration/registration_complete.html:6
+#, fuzzy
+msgid "An activation email has been sent."
+msgstr "Email d'activation envoyé"
+
+#: accounts/templates/registration/registration_complete.html:7
+#, fuzzy
+msgid "Please check your email and click on the link to activate your account."
 msgstr ""
 "Un email d'activation a été envoyé.\n"
 "Veuillez s'il vous plait vérifier vos email et cliquer sur le lien pour "
 "activer votre compte."
 
-#: accounts/templates/registration/registration_form.html:4
+#: accounts/templates/registration/registration_form.html:3
 msgid "Register for an account"
 msgstr "S'enregistrer"
 
@@ -210,15 +265,10 @@ msgstr ""
 "Mot de passe: veuillez s.v.p utiliser un mot de passe fort, nous vous "
 "faisons confiance."
 
-#: accounts/templates/registration/registration_form.html:51
+#: accounts/templates/registration/registration_form.html:52
 msgid "Send activation email"
 msgstr "Envoyer un mail d'activation"
 
-#: login/templates/login.html:3 login/templates/login.html.py:24
-#: login/templates/password_reset_complete.html:10 templates/base.html:61
-msgid "Log in"
-msgstr "Se connecter"
-
 #: login/templates/login.html:8
 msgid "Login with a local Account"
 msgstr "Se connecter (avec un compte local)"
@@ -231,15 +281,15 @@ msgstr "Votre login et mot de passe ne correspondent pas. Veuillez réessayer."
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: login/templates/login.html:26
+#: login/templates/login.html:24
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: login/templates/login.html:27
+#: login/templates/login.html:26
 msgid "Sign up for a new account..."
 msgstr "S'enregistrer"
 
-#: login/templates/login.html:34
+#: login/templates/login.html:33
 msgid "Login with a remote Account"
 msgstr "Se connecter (avec un compte distant)"
 
@@ -247,11 +297,11 @@ msgstr "Se connecter (avec un compte distant)"
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: login/templates/logout.html:7
+#: login/templates/logout.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Merci d'être passer par chez nous aujourd'hui."
 
-#: login/templates/logout.html:8
+#: login/templates/logout.html:9
 msgid "Log in again"
 msgstr "Se reconnecter"
 
@@ -270,25 +320,25 @@ msgstr ""
 "de sureté...)"
 
 #: login/templates/password_change.html:15
-#: login/templates/password_reset_confirm.html:17
+#: login/templates/password_reset_confirm.html:14
 msgid "Change my password"
 msgstr "Modifier mon mot de passe"
 
 #: login/templates/password_change_done.html:3
-#: login/templates/password_change_done.html:7
+#: login/templates/password_change_done.html:6
 msgid "Password change successful"
 msgstr "Mot de passe modifié avec succès"
 
-#: login/templates/password_change_done.html:8
+#: login/templates/password_change_done.html:7
 msgid "Your password was changed."
 msgstr "Votre mot de passe a été modifié."
 
-#: login/templates/password_reset.html:3 login/templates/password_reset.html:8
+#: login/templates/password_reset.html:3 login/templates/password_reset.html:7
 #: login/templates/password_reset_confirm.html:3
 msgid "Password reset"
 msgstr "Mot de passe réinitialisé"
 
-#: login/templates/password_reset.html:10
+#: login/templates/password_reset.html:9
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
@@ -296,7 +346,7 @@ msgstr ""
 "Mot de passe oublié ? Saisissez votre adresse mail  et nous vous enverrons "
 "les instructions pour en enregistrer un nouveau."
 
-#: login/templates/password_reset.html:18
+#: login/templates/password_reset.html:17
 msgid "Reset my password"
 msgstr "Réinitialiser mon mot de passe"
 
@@ -305,26 +355,26 @@ msgstr "Réinitialiser mon mot de passe"
 msgid "Password reset complete"
 msgstr "Réinitialisation du mot de passe terminé"
 
-#: login/templates/password_reset_complete.html:8
+#: login/templates/password_reset_complete.html:7
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr ""
 "Votre mot de passe a été enregistré. Vous pouvez maintenant vous connecter."
 
-#: login/templates/password_reset_confirm.html:8
+#: login/templates/password_reset_confirm.html:7
 msgid "Enter new password"
 msgstr "Saisissez votre nouveau mot de passe"
 
-#: login/templates/password_reset_confirm.html:10
+#: login/templates/password_reset_confirm.html:8
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr "Veuillez saisir votre mot de passe deux fois"
 
-#: login/templates/password_reset_confirm.html:26
+#: login/templates/password_reset_confirm.html:21
 msgid "Password reset unsuccessful"
 msgstr "Réinitialisation du mot de passe : Houston nous avons un problème.."
 
-#: login/templates/password_reset_confirm.html:28
+#: login/templates/password_reset_confirm.html:22
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used. Please request a new password reset."
@@ -337,7 +387,7 @@ msgstr ""
 msgid "Password reset successful"
 msgstr "Mot de passe réinitialisé avec succès"
 
-#: login/templates/password_reset_done.html:8
+#: login/templates/password_reset_done.html:7
 msgid ""
 "We've emailed you instructions for setting your password. You should be "
 "receiving them shortly."
@@ -345,7 +395,7 @@ msgstr ""
 "Nous vous avons envoyez les instructions pour réinitialisation votre mot de "
 "passe. Vous devriez le recevoir rapidement."
 
-#: login/templates/password_reset_done.html:10
+#: login/templates/password_reset_done.html:8
 msgid ""
 "If you don't receive an email, please make sure you've entered the address "
 "you registered with, and check your spam folder."
@@ -408,12 +458,12 @@ msgstr ""
 msgid "The name of your host."
 msgstr "Le nom de votre hôte."
 
-#: main/models.py:142 main/models.py:307
+#: main/models.py:142 main/models.py:322
 msgid ""
 "Some arbitrary comment about your host, e.g  who / what / where this host is"
 msgstr "Commentaire à propos de votre hôte ; Ex: Qui / Quoi / Où"
 
-#: main/models.py:149 main/models.py:318
+#: main/models.py:149 main/models.py:333
 msgid ""
 "Check if host is available/in use - if not checked, we won't accept updates "
 "for this host"
@@ -423,11 +473,11 @@ msgstr ""
 
 #: main/models.py:153
 msgid "Netmask/Prefix length for IPv4."
-msgstr ""
+msgstr "Masque de sous-réseau IPv4"
 
 #: main/models.py:156
 msgid "Netmask/Prefix length for IPv6."
-msgstr ""
+msgstr "Masque de sous-réseau IPv6"
 
 #: main/models.py:166
 msgid ""
@@ -449,51 +499,52 @@ msgstr "Dernier message reçu du client"
 msgid "Latest result message relating to the server"
 msgstr "Dernier message reçu du serveur"
 
-#: main/models.py:303
+#: main/models.py:318
 msgid "The name of a host in same network as your main host."
 msgstr ""
+"Le nom d'un hôte figurant dans le même réseau que votre hôte principal."
 
-#: main/models.py:311
+#: main/models.py:326
 msgid "The IPv4 interface ID of this host. Use IPv4 notation."
-msgstr ""
+msgstr "L'interface réseau IPv4 de cet hôte. "
 
-#: main/models.py:315
+#: main/models.py:330
 msgid "The IPv6 interface ID of this host. Use IPv6 notation."
-msgstr ""
+msgstr "L'interface réseau IPv6 de cet hôte. "
 
-#: main/models.py:358
+#: main/models.py:373
 msgid "Service name"
 msgstr "Nom du service"
 
-#: main/models.py:362
+#: main/models.py:377
 msgid "Some arbitrary comment about the service"
 msgstr "Commentaire à propos du service"
 
-#: main/models.py:365
+#: main/models.py:380
 msgid "Update Server [name or IP] of this service"
 msgstr "[Nom ou IP] du serveur de mise à jour du service"
 
-#: main/models.py:369
+#: main/models.py:384
 msgid "Update Server URL path of this service"
 msgstr "URL de mise à jour du service"
 
-#: main/models.py:372
+#: main/models.py:387
 msgid "Use https / TLS to contact the Update Server?"
 msgstr "Utiliser https / TLS pour joindre le serveur de mise à jour ?"
 
-#: main/models.py:392
+#: main/models.py:407
 msgid "The hostname for that service (used in query string)"
 msgstr "Le nom d'hôte pour ce service (utilisé dans l'URL pour la mise à jour)"
 
-#: main/models.py:396
+#: main/models.py:411
 msgid "Some arbitrary comment about your host on that service"
 msgstr "Commentaire à propos de votre hôte pour ce service"
 
-#: main/models.py:401
+#: main/models.py:416
 msgid "The name/id for that service (used for http basic auth)"
 msgstr "Le nom/id de ce service (utilisé pour l'authentification http)"
 
-#: main/models.py:404
+#: main/models.py:419
 msgid "The password/secret for that service (used for http basic auth)"
 msgstr "Le mot de passe de ce service (utilisé pour l'authentification http)"
 
@@ -702,10 +753,6 @@ msgstr "Supprimer  %(object)s"
 msgid "Are you sure you want to delete \"%(object)s\"?"
 msgstr "Etes vous sur de vouloir supprimer \"%(object)s\"?"
 
-#: main/templates/main/delete_object.html:11
-msgid "Confirm"
-msgstr "Confirmer"
-
 #: main/templates/main/domain.html:8
 msgid "Edit Domain"
 msgstr "Editer le domaine"
@@ -945,17 +992,20 @@ msgstr ""
 
 #: main/templates/main/host.html:35
 msgid "Related Hosts"
-msgstr ""
+msgstr "Hôtes"
 
 #: main/templates/main/host.html:37
 msgid ""
 "We can update additional host records (for other hosts in same network)\n"
 "                when we receive an update for this host."
 msgstr ""
+"Nous pouvons mettre à jour des hôtes supplémentaires (figurant sur le même "
+"réseau)\n"
+"lorsque nous recevons une mise à jour pour cet hôte"
 
 #: main/templates/main/host.html:41
 msgid "Configure related Hosts"
-msgstr ""
+msgstr "Configurer hôtes"
 
 #: main/templates/main/host.html:43
 msgid "Update other Services"
@@ -1167,18 +1217,20 @@ msgstr "Aucun domaine publique venant d'autre utilisateurs pour le moment."
 
 #: main/templates/main/related_host.html:8
 msgid "Edit related host"
-msgstr ""
+msgstr "Editer l'hôte"
 
 #: main/templates/main/related_host.html:14
 #: main/templates/main/related_host.html:19
 msgid "Delete related host"
-msgstr ""
+msgstr "Supprimer l'hôte"
 
 #: main/templates/main/related_host.html:16
 msgid ""
 "Deleting a related host is not undoable. If you need it back, you'll have to "
 "add it again."
 msgstr ""
+"Aucun retour arrière après la suppression d'un hôte. Si vous en avez à "
+"nouveau besoin, vous devrez le recréer."
 
 #: main/templates/main/related_host.html:24
 #: main/templates/main/related_host_add.html:21
@@ -1190,36 +1242,44 @@ msgid ""
 "                   Then we update the DNS records for the related host with "
 "these addresses."
 msgstr ""
+"Lorsque nous recevons une mise à jour de votre hôte principal, nous "
+"calculons votre adresse réseau.\n"
+"Pour calculer les adresses IP de vos hôtes, nous ajoutons juste l'ID de "
+"l'interface à l'adresse réseau.\n"
+"Puis nous mettons à jour les enregistrements DNS des différents hôtes avec "
+"ces adresses."
 
 #: main/templates/main/related_host_add.html:8
 msgid "Create a new related host"
-msgstr ""
+msgstr "Créer un nouvel hôte"
 
 #: main/templates/main/related_host_add.html:19
 msgid "Here you can add related hosts (e.g. other machines on same LAN)."
 msgstr ""
+"Ici, vous pouvez ajouter de nouveaux hôtes (comme un routeur, des PC, des "
+"serveurs, d'autres machines sur le même réseau local)."
 
 #: main/templates/main/related_host_overview.html:7
 msgid "Related hosts"
-msgstr ""
+msgstr "Hôtes"
 
 #: main/templates/main/related_host_overview.html:8
 msgid "Add related host"
-msgstr ""
+msgstr "Ajouter un hôte"
 
 #: main/templates/main/related_host_overview.html:11
 msgid "Main host:"
-msgstr ""
+msgstr "Hôte principal"
 
 #: main/templates/main/related_host_overview.html:25
 #: main/templates/main/related_host_overview.html:30
 #, python-format
 msgid "%(type)s interface ID"
-msgstr ""
+msgstr "Interface réseau %(type)s"
 
 #: main/templates/main/related_host_overview.html:54
 msgid "No related hosts yet."
-msgstr ""
+msgstr "Aucun hôte pour le moment."
 
 #: main/templates/main/status.html:7
 msgid "Domains"
@@ -1399,7 +1459,7 @@ msgstr ""
 
 #: main/templates/main/includes/tabbed_router_configuration.html:3
 msgid "General"
-msgstr ""
+msgstr "Général"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:16
 msgid "General configuration hints"
@@ -1763,19 +1823,19 @@ msgstr ""
 "exemple, mais\n"
 "vous devez bien entendu utiliser votre vrai adresse IP publique à la place."
 
-#: settings/base.py:381
+#: settings/base.py:383
 msgid "English"
 msgstr "English"
 
-#: settings/base.py:382
+#: settings/base.py:384
 msgid "German"
 msgstr "Allemand"
 
-#: settings/base.py:383
+#: settings/base.py:385
 msgid "French"
 msgstr "French"
 
-#: settings/base.py:384
+#: settings/base.py:386
 msgid "Italian"
 msgstr "Italien"
 
@@ -1855,3 +1915,6 @@ msgstr "Valid HTML"
 #: templates/includes/base_footer.html:7
 msgid "Valid CSS"
 msgstr "Valid CSS"
+
+#~ msgid "Chinese (China)"
+#~ msgstr "Chinois (Chine)"
diff --git a/nsupdate/locale/it/LC_MESSAGES/django.po b/nsupdate/locale/it/LC_MESSAGES/django.po
index 9dd169f..bc6a708 100644
--- a/nsupdate/locale/it/LC_MESSAGES/django.po
+++ b/nsupdate/locale/it/LC_MESSAGES/django.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
+# Thomas Waldmann <tw@waldmann-edv.de>, 2014
 # ykmm <ykmm@mediacom.it>, 2014
 # ykmm <ykmm@mediacom.it>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: nsupdate.info\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-30 21:38+0200\n"
-"PO-Revision-Date: 2014-09-30 19:06+0000\n"
+"POT-Creation-Date: 2014-11-01 21:35+0100\n"
+"PO-Revision-Date: 2014-10-27 19:03+0000\n"
 "Last-Translator: Thomas Waldmann <tw@waldmann-edv.de>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/nsupdateinfo/"
 "language/it/)\n"
@@ -20,6 +21,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: accounts/templates/accounts/delete_user.html:7
+msgid "Delete your User Account"
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:11
+msgid ""
+"\n"
+"                    Are you sure you want to delete your user account and\n"
+"                    all your data on this service? You can not undelete your "
+"data.\n"
+"                    "
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:16
+#: main/templates/main/delete_object.html:11
+msgid "Confirm"
+msgstr "Conferma"
+
 #: accounts/templates/accounts/user_profile.html:7
 msgid "User Profile of"
 msgstr "Profilo utente di"
@@ -28,15 +47,33 @@ msgstr "Profilo utente di"
 msgid "Submit"
 msgstr "Salva"
 
-#: accounts/templates/accounts/user_profile.html:20
+#: accounts/templates/accounts/user_profile.html:18
 msgid "Associate with remote Account"
-msgstr "Associa com Account remoto"
+msgstr "Associa ad Account remoto"
 
-#: accounts/templates/accounts/user_profile.html:27
+#: accounts/templates/accounts/user_profile.html:25
 msgid "Disassociate from remote Account"
 msgstr "Dissocia da Account remoto"
 
+#: accounts/templates/accounts/user_profile.html:35
+#: accounts/templates/accounts/user_profile.html:44
+#, fuzzy
+msgid "Delete User Profile"
+msgstr "Profilo utente di"
+
+#: accounts/templates/accounts/user_profile.html:37
+msgid ""
+"\n"
+"            If you'ld like to stop using this service and delete this user "
+"profile and\n"
+"            all your data (especially all hosts and all domains created by "
+"this user),\n"
+"            you can do it here.\n"
+"            "
+msgstr ""
+
 #: accounts/templates/registration/activate.html:4
+#: accounts/templates/registration/activation_complete.html:3
 msgid "Activation complete"
 msgstr "Attivazione Completa"
 
@@ -44,13 +81,17 @@ msgstr "Attivazione Completa"
 msgid "Activation problem"
 msgstr "Problema di attivazione"
 
-#: accounts/templates/registration/activate.html:7
-#, python-format
+#: accounts/templates/registration/activate.html:8
+#: accounts/templates/registration/activation_complete.html:6
+#, fuzzy
+msgid "Thanks, activation complete!"
+msgstr "Attivazione Completa"
+
+#: accounts/templates/registration/activate.html:9
+#: accounts/templates/registration/activation_complete.html:7
+#, fuzzy
 msgid ""
-"\n"
-"Thanks %(account)s, activation complete!\n"
-"You may now <a href='%(auth_login_url)s'>login</a> using the username and "
-"password you set at registration.\n"
+"You may now login using the username and password you set at registration."
 msgstr ""
 "\n"
 "Grazie %(account)s, l'attivazione è completa!\n"
@@ -58,16 +99,27 @@ msgstr ""
 "utilizzando il nome utente e la password che hai impostato durate la "
 "registrazione.\n"
 
+#: accounts/templates/registration/activate.html:10
+#: accounts/templates/registration/activation_complete.html:8
+#: login/templates/login.html:3 login/templates/login.html.py:24
+#: login/templates/password_reset_complete.html:8 templates/base.html:61
+msgid "Log in"
+msgstr "Log in"
+
 #: accounts/templates/registration/activate.html:12
+msgid "Oops"
+msgstr ""
+
+#: accounts/templates/registration/activate.html:13
+#, fuzzy
 msgid ""
-"Oops -- it seems that your activation key is invalid.  Please check the url "
-"again."
+"it seems that your activation key is invalid.  Please check the url again."
 msgstr ""
 "Ops -- sembra che la chiave di attivazione non sia valida. Controlla "
 "nuovamente l'url."
 
 #: accounts/templates/registration/activation_email.html:8
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "<body>\n"
 "<h3>Account registration for %(sitename)s</h3>\n"
@@ -81,8 +133,8 @@ msgid ""
 "<p>\n"
 "To activate this account, please click the following link within the next \n"
 "<b>%(expiration_days)s</b> days:<br/>\n"
-"<a href=\"http://%(sitedomain)s%(activation_key_url)s\">http://%(sitedomain)s"
-"%(activation_key_url)s</a>\n"
+"<a href=\"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s\">"
+"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s</a>\n"
 "</p>\n"
 "<p>\n"
 "Sincerely,<br/>\n"
@@ -116,15 +168,19 @@ msgstr ""
 msgid "Activation email sent"
 msgstr "Email di attivazione spedita."
 
-#: accounts/templates/registration/registration_complete.html:5
-msgid ""
-"An activation email has been sent.\n"
-"Please check your email and click on the link to activate your account."
+#: accounts/templates/registration/registration_complete.html:6
+#, fuzzy
+msgid "An activation email has been sent."
+msgstr "Email di attivazione spedita."
+
+#: accounts/templates/registration/registration_complete.html:7
+#, fuzzy
+msgid "Please check your email and click on the link to activate your account."
 msgstr ""
 "Una email di attivazione è stata spedita.\n"
 "Verifica la tua casella email e clicca sul link per attivare il tuo account."
 
-#: accounts/templates/registration/registration_form.html:4
+#: accounts/templates/registration/registration_form.html:3
 msgid "Register for an account"
 msgstr "Registra un account."
 
@@ -216,15 +272,10 @@ msgstr ""
 "email di attivazione.<br>\n"
 "        Password: utilizzane una sicura, ci fidiamo di te."
 
-#: accounts/templates/registration/registration_form.html:51
+#: accounts/templates/registration/registration_form.html:52
 msgid "Send activation email"
 msgstr "Invio dell'email di attivazione."
 
-#: login/templates/login.html:3 login/templates/login.html.py:24
-#: login/templates/password_reset_complete.html:10 templates/base.html:61
-msgid "Log in"
-msgstr "Log in"
-
 #: login/templates/login.html:8
 msgid "Login with a local Account"
 msgstr "Login con un Account locale"
@@ -237,27 +288,27 @@ msgstr "La tua username e la password non corrispondono. Riprova."
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: login/templates/login.html:26
+#: login/templates/login.html:24
 msgid "Forgot your password?"
 msgstr "Password dimenticata?"
 
-#: login/templates/login.html:27
+#: login/templates/login.html:26
 msgid "Sign up for a new account..."
 msgstr "Sottoscrivi un nuovo account..."
 
-#: login/templates/login.html:34
+#: login/templates/login.html:33
 msgid "Login with a remote Account"
 msgstr "Esegui la login con un Account remoto"
 
 #: login/templates/logout.html:3 templates/base.html:71
 msgid "Log out"
-msgstr ""
+msgstr "Disconnessione"
 
-#: login/templates/logout.html:7
+#: login/templates/logout.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Grazie per aver passato del tempo con il sito Web oggi."
 
-#: login/templates/logout.html:8
+#: login/templates/logout.html:9
 msgid "Log in again"
 msgstr "Esegui nuovamente la login"
 
@@ -276,25 +327,25 @@ msgstr ""
 "digitata correttamente."
 
 #: login/templates/password_change.html:15
-#: login/templates/password_reset_confirm.html:17
+#: login/templates/password_reset_confirm.html:14
 msgid "Change my password"
 msgstr "Cambia la password"
 
 #: login/templates/password_change_done.html:3
-#: login/templates/password_change_done.html:7
+#: login/templates/password_change_done.html:6
 msgid "Password change successful"
 msgstr "Cambio password eseguito"
 
-#: login/templates/password_change_done.html:8
+#: login/templates/password_change_done.html:7
 msgid "Your password was changed."
 msgstr "La tua password è stata cambiata."
 
-#: login/templates/password_reset.html:3 login/templates/password_reset.html:8
+#: login/templates/password_reset.html:3 login/templates/password_reset.html:7
 #: login/templates/password_reset_confirm.html:3
 msgid "Password reset"
 msgstr "Reimposta la password"
 
-#: login/templates/password_reset.html:10
+#: login/templates/password_reset.html:9
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
@@ -302,7 +353,7 @@ msgstr ""
 "Dimenticata la tua password? Inserisci il tuo indirizzo email qui sotto e ti "
 "invieremo una mail con le istruzioni su come impostarne una nuova."
 
-#: login/templates/password_reset.html:18
+#: login/templates/password_reset.html:17
 msgid "Reset my password"
 msgstr "Reimposta la mia password"
 
@@ -311,17 +362,17 @@ msgstr "Reimposta la mia password"
 msgid "Password reset complete"
 msgstr "Reset password completo"
 
-#: login/templates/password_reset_complete.html:8
+#: login/templates/password_reset_complete.html:7
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr ""
 "La tua password è stata impostata. Puoi procedere ad effettuare la login "
 "adesso."
 
-#: login/templates/password_reset_confirm.html:8
+#: login/templates/password_reset_confirm.html:7
 msgid "Enter new password"
 msgstr "Inserisci una nuova password"
 
-#: login/templates/password_reset_confirm.html:10
+#: login/templates/password_reset_confirm.html:8
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -329,11 +380,11 @@ msgstr ""
 "Inserisci a password due volte così possiamo verificare che sia stata "
 "digitata correttamente."
 
-#: login/templates/password_reset_confirm.html:26
+#: login/templates/password_reset_confirm.html:21
 msgid "Password reset unsuccessful"
 msgstr "Password non reimpostata"
 
-#: login/templates/password_reset_confirm.html:28
+#: login/templates/password_reset_confirm.html:22
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used. Please request a new password reset."
@@ -346,7 +397,7 @@ msgstr ""
 msgid "Password reset successful"
 msgstr "Password reimpostata correttamente."
 
-#: login/templates/password_reset_done.html:8
+#: login/templates/password_reset_done.html:7
 msgid ""
 "We've emailed you instructions for setting your password. You should be "
 "receiving them shortly."
@@ -354,7 +405,7 @@ msgstr ""
 "Ti abbiamo inviato una mail con le istruzioni per impostare la tua passord. "
 "Dovresti riceverla a breve."
 
-#: login/templates/password_reset_done.html:10
+#: login/templates/password_reset_done.html:8
 msgid ""
 "If you don't receive an email, please make sure you've entered the address "
 "you registered with, and check your spam folder."
@@ -364,130 +415,147 @@ msgstr ""
 
 #: main/models.py:38
 msgid "Blacklisted domain. Evaluated as regex (search)."
-msgstr ""
+msgstr "Dominio in blacklist. Valutato come regex (ricerca)."
 
 #: main/models.py:75
 msgid "Name of the zone where dynamic hosts may get added"
-msgstr ""
+msgstr "Nome della zona dove gli host dinamici possono essere aggiunti."
 
 #: main/models.py:78
 msgid "IP where the dynamic DNS updates for this zone will be sent to"
 msgstr ""
+"Indirizzp IP dove verranno inviati gli aggiornamenti DNS dinamici per questa "
+"zona."
 
 #: main/models.py:82
 msgid "Shared secret that allows updating this zone (base64 encoded)"
 msgstr ""
+"Chiave segreta condivisa che permette l'aggiornamento di questa zona "
+"(codificata in base64)"
 
 #: main/models.py:86
 msgid "HMAC_SHA512 is fine for bind9 (you can change this later, if needed)"
 msgstr ""
+"HMAC_SHA512 va bene per bind9 (se necessario puoi modificarlo "
+"successivamente)"
 
 #: main/models.py:89
 msgid ""
 "Check to allow any user to add dynamic hosts to this zone - if not checked, "
 "we'll only allow the owner to add hosts"
 msgstr ""
+"Spunta per permettere qualsiasi utente di aggiungere host dinamici a questa "
+"zona - se non spuntato permetteremo solo al proprietario di aggiungere host"
 
 #: main/models.py:95
 msgid ""
 "Check if nameserver is available/reachable - if not checked, we'll pause "
 "querying/updating this nameserver for a while"
 msgstr ""
+"Spunta se il nameserver è disponibile/raggiungibile - se non spuntato "
+"metteremo in pausa quessto nameserver per un po'"
 
 #: main/models.py:100
 msgid ""
 "Some arbitrary comment about your domain. If your domain is public, the "
 "comment will be also publicly shown."
 msgstr ""
+"Un commmento relativo al tuo dominio. Se il tuo dominio è pubblico, anche il "
+"commento verrà mostrato pubblicamente."
 
 #: main/models.py:134
 msgid "The name of your host."
-msgstr ""
+msgstr "Il nome del tuo host."
 
-#: main/models.py:142 main/models.py:307
+#: main/models.py:142 main/models.py:322
 msgid ""
 "Some arbitrary comment about your host, e.g  who / what / where this host is"
-msgstr ""
+msgstr "Un commento relativo al tuo host, es: chi / cosa / dove è questo host"
 
-#: main/models.py:149 main/models.py:318
+#: main/models.py:149 main/models.py:333
 msgid ""
 "Check if host is available/in use - if not checked, we won't accept updates "
 "for this host"
 msgstr ""
+"Spunta se l'host è disponibile/in uso - se non spuntato, non accettermo "
+"aggiornamenti per questo host"
 
 #: main/models.py:153
 msgid "Netmask/Prefix length for IPv4."
-msgstr ""
+msgstr "Lunghezza Netmask/Prefisso per IPv4."
 
 #: main/models.py:156
 msgid "Netmask/Prefix length for IPv6."
-msgstr ""
+msgstr "Lunghezza Netmask/Prefisso per IPv6."
 
 #: main/models.py:166
 msgid ""
 "Checked if we think you abuse the service - you may uncheck this AFTER "
 "fixing all issues on your side"
 msgstr ""
+"Spuntato se riteniamo che stai abusando del servizio - puoi rimuovere questa "
+"spunta DOPO aver sistemato le problematiche lato tuo"
 
 #: main/models.py:172
 msgid "Checked to block a host for abuse."
-msgstr ""
+msgstr "Spuntato per bloccare un host causa abuso."
 
 #: main/models.py:180
 msgid "Latest result message relating to the client"
-msgstr ""
+msgstr "L'ultimo messaggio di risultato relativo al client"
 
 #: main/models.py:187
 msgid "Latest result message relating to the server"
-msgstr ""
+msgstr "L'ultimo messaggio di risultato relativo al server"
 
-#: main/models.py:303
+#: main/models.py:318
 msgid "The name of a host in same network as your main host."
-msgstr ""
+msgstr "Nome di un host nella stessa rete del tuo host principale."
 
-#: main/models.py:311
+#: main/models.py:326
 msgid "The IPv4 interface ID of this host. Use IPv4 notation."
-msgstr ""
+msgstr "L'ID dell'interfaccia IPv4 di questo host. Utilizza la notazione IPv4."
 
-#: main/models.py:315
+#: main/models.py:330
 msgid "The IPv6 interface ID of this host. Use IPv6 notation."
-msgstr ""
+msgstr "L'ID dell'interfaccia IPv6 di questo host. Utilizza la notazione IPv6."
 
-#: main/models.py:358
+#: main/models.py:373
 msgid "Service name"
-msgstr ""
+msgstr "Nome del servizio"
 
-#: main/models.py:362
+#: main/models.py:377
 msgid "Some arbitrary comment about the service"
-msgstr ""
+msgstr "Un commento a piacere relativo al servizio"
 
-#: main/models.py:365
+#: main/models.py:380
 msgid "Update Server [name or IP] of this service"
-msgstr ""
+msgstr "Aggiorna il Server [nome o indirizzo IP] di questo servizio"
 
-#: main/models.py:369
+#: main/models.py:384
 msgid "Update Server URL path of this service"
-msgstr ""
+msgstr "Aggiorna il percorso URL del Server di questo servizio"
 
-#: main/models.py:372
+#: main/models.py:387
 msgid "Use https / TLS to contact the Update Server?"
-msgstr ""
+msgstr "Usare https / TLS per contattare il Server di aggiornamento?"
 
-#: main/models.py:392
+#: main/models.py:407
 msgid "The hostname for that service (used in query string)"
-msgstr ""
+msgstr "L'hostname per il servizio (utilizzato nella stringa di query)"
 
-#: main/models.py:396
+#: main/models.py:411
 msgid "Some arbitrary comment about your host on that service"
-msgstr ""
+msgstr "Un commento a piacere relativo all'host sul servizio"
 
-#: main/models.py:401
+#: main/models.py:416
 msgid "The name/id for that service (used for http basic auth)"
-msgstr ""
+msgstr "Il nome/id per il servizio (utilizzato per http basic auth)"
 
-#: main/models.py:404
+#: main/models.py:419
 msgid "The password/secret for that service (used for http basic auth)"
 msgstr ""
+"La password/chiave segreta per il servizio (utilizzato per http basic auth)"
 
 #: main/templates/main/about.html:6
 #, python-format
@@ -692,10 +760,6 @@ msgstr "Cancella %(object)s"
 msgid "Are you sure you want to delete \"%(object)s\"?"
 msgstr "Sei sicuro di voler cancellare \"%(object)s\"?"
 
-#: main/templates/main/delete_object.html:11
-msgid "Confirm"
-msgstr "Conferma"
-
 #: main/templates/main/domain.html:8
 msgid "Edit Domain"
 msgstr "Modifica il Dominio"
@@ -938,17 +1002,20 @@ msgstr ""
 
 #: main/templates/main/host.html:35
 msgid "Related Hosts"
-msgstr ""
+msgstr "Host Associati"
 
 #: main/templates/main/host.html:37
 msgid ""
 "We can update additional host records (for other hosts in same network)\n"
 "                when we receive an update for this host."
 msgstr ""
+"Possiamo aggiornare record host addizionali (per altri host nella stessa "
+"rete)\n"
+"quando riceviamo un aggiornamento per questo host."
 
 #: main/templates/main/host.html:41
 msgid "Configure related Hosts"
-msgstr ""
+msgstr "Configura gli Host associati"
 
 #: main/templates/main/host.html:43
 msgid "Update other Services"
@@ -994,22 +1061,22 @@ msgstr ""
 #: main/templates/main/related_host_overview.html:25
 #: main/templates/main/updater_hostconfig_overview.html:13
 msgid "IPv4"
-msgstr ""
+msgstr "IPv4"
 
 #: main/templates/main/host.html:57 main/templates/main/host.html.py:70
 #, python-format
 msgid "Current %(type)s address from master nameserver"
-msgstr ""
+msgstr "Indirizzo %(type)s dal nameserver master"
 
 #: main/templates/main/host.html:59 main/templates/main/host.html.py:72
 #, python-format
 msgid "Set new %(type)s address"
-msgstr ""
+msgstr "Imposta nuovo indirizzo %(type)s"
 
 #: main/templates/main/host.html:61 main/templates/main/host.html.py:74
 #, python-format
 msgid "Give new %(type)s address"
-msgstr ""
+msgstr "Assegna nuovo indirizzo %(type)s"
 
 #: main/templates/main/host.html:66 main/templates/main/host.html.py:79
 #: main/templates/main/updater_hostconfig.html:19
@@ -1022,19 +1089,19 @@ msgstr "Cancella"
 #: main/templates/main/related_host_overview.html:30
 #: main/templates/main/updater_hostconfig_overview.html:14
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: main/templates/main/host.html:123
 msgid "Result Messages"
-msgstr ""
+msgstr "Messaggi Restituiti"
 
 #: main/templates/main/host.html:125
 msgid "Client Result Message"
-msgstr ""
+msgstr "Messaggio Restituito dal Client"
 
 #: main/templates/main/host.html:127
 msgid "Server Result Message"
-msgstr ""
+msgstr "Messaggio Restituito dal Server"
 
 #: main/templates/main/host_add.html:8
 msgid "Create a new Host"
@@ -1087,7 +1154,7 @@ msgstr "I tuoi host"
 
 #: main/templates/main/overview.html:9
 msgid "Add Host"
-msgstr ""
+msgstr "Aggiungi Host"
 
 #: main/templates/main/overview.html:15
 #: main/templates/main/related_host_overview.html:17
@@ -1108,22 +1175,22 @@ msgstr "Disponibile"
 
 #: main/templates/main/overview.html:23
 msgid "Faults"
-msgstr ""
+msgstr "Malfunzionamenti"
 
 #: main/templates/main/overview.html:25
 msgid "C / S"
-msgstr ""
+msgstr "Cli / Serv"
 
 #: main/templates/main/overview.html:28 main/templates/main/overview.html:33
 #: main/templates/main/related_host_overview.html:23
 #: main/templates/main/related_host_overview.html:28
 #, python-format
 msgid "%(type)s Address"
-msgstr ""
+msgstr "Indirizzo %(type)s"
 
 #: main/templates/main/overview.html:30 main/templates/main/overview.html:35
 msgid "(last update)"
-msgstr ""
+msgstr "(ultimo aggiornamento)"
 
 #: main/templates/main/overview.html:77
 msgid "No hosts yet."
@@ -1135,7 +1202,7 @@ msgstr "Domini (prima il tuo, poi quelli pubblici)"
 
 #: main/templates/main/overview.html:84
 msgid "Add Domain"
-msgstr ""
+msgstr "Aggiungi Dominio"
 
 #: main/templates/main/overview.html:89
 msgid "Domain"
@@ -1143,7 +1210,7 @@ msgstr "Dominio"
 
 #: main/templates/main/overview.html:90 main/templates/main/status.html:11
 msgid "Public"
-msgstr ""
+msgstr "Pubblico"
 
 #: main/templates/main/overview.html:92
 msgid "Owner"
@@ -1159,18 +1226,20 @@ msgstr "Non ci sono domini pubblici per altri ancora."
 
 #: main/templates/main/related_host.html:8
 msgid "Edit related host"
-msgstr ""
+msgstr "Modifica host associati"
 
 #: main/templates/main/related_host.html:14
 #: main/templates/main/related_host.html:19
 msgid "Delete related host"
-msgstr ""
+msgstr "Elimina host associati"
 
 #: main/templates/main/related_host.html:16
 msgid ""
 "Deleting a related host is not undoable. If you need it back, you'll have to "
 "add it again."
 msgstr ""
+"Cancellare un host associato non è una operazione annullabile. Se ne avrai "
+"nuovamente bisogno dovrai reinserirlo."
 
 #: main/templates/main/related_host.html:24
 #: main/templates/main/related_host_add.html:21
@@ -1182,36 +1251,43 @@ msgid ""
 "                   Then we update the DNS records for the related host with "
 "these addresses."
 msgstr ""
+"Quando riceviamo un aggiornamento per il tuo host principale, ne ricaviamo "
+"il tuo indirizzo di rete.\n"
+"Per calcolare l'indirizzo IP dell'host associato, aggiungiamo semplicemente "
+"l'ID dell'interfaccia all'indirizzo della rete.\n"
+"Successivamente aggiorniamo il record DNS per l'host corrispondente con "
+"questi nuovi indirizzi."
 
 #: main/templates/main/related_host_add.html:8
 msgid "Create a new related host"
-msgstr ""
+msgstr "Crea un nuovo host associato"
 
 #: main/templates/main/related_host_add.html:19
 msgid "Here you can add related hosts (e.g. other machines on same LAN)."
 msgstr ""
+"Qui puoi aggiungere host associati (es: altre macchine sulla stessa LAN)."
 
 #: main/templates/main/related_host_overview.html:7
 msgid "Related hosts"
-msgstr ""
+msgstr "Host associati"
 
 #: main/templates/main/related_host_overview.html:8
 msgid "Add related host"
-msgstr ""
+msgstr "Aggiungi un host associato"
 
 #: main/templates/main/related_host_overview.html:11
 msgid "Main host:"
-msgstr ""
+msgstr "Host principale:"
 
 #: main/templates/main/related_host_overview.html:25
 #: main/templates/main/related_host_overview.html:30
 #, python-format
 msgid "%(type)s interface ID"
-msgstr ""
+msgstr "ID interfaccia %(type)s"
 
 #: main/templates/main/related_host_overview.html:54
 msgid "No related hosts yet."
-msgstr ""
+msgstr "Nessun host associato è stato definito."
 
 #: main/templates/main/status.html:7
 msgid "Domains"
@@ -1220,15 +1296,15 @@ msgstr "Domini"
 #: main/templates/main/status.html:9 main/templates/main/status.html.py:20
 #: main/templates/main/status.html:37
 msgid "Total"
-msgstr ""
+msgstr "Totale"
 
 #: main/templates/main/status.html:13 main/templates/main/status.html.py:22
 msgid "Unavailable"
-msgstr ""
+msgstr "Indisponibile"
 
 #: main/templates/main/status.html:13
 msgid "Down"
-msgstr ""
+msgstr "Inattivo"
 
 #: main/templates/main/status.html:18
 msgid "Hosts"
@@ -1236,33 +1312,33 @@ msgstr "Host"
 
 #: main/templates/main/status.html:22
 msgid "Abuse"
-msgstr ""
+msgstr "Abuso"
 
 #: main/templates/main/status.html:22
 msgid "Abuse-Blocked"
-msgstr ""
+msgstr "Bloccato per abuso"
 
 #: main/templates/main/status.html:24 main/templates/main/status.html.py:41
 msgid "2d"
-msgstr ""
+msgstr "2 gg"
 
 #: main/templates/main/status.html:24 main/templates/main/status.html.py:26
 #: main/templates/main/status.html:28 main/templates/main/status.html.py:30
 #, python-format
 msgid "IPv4 (tls) / IPv6 (tls) updated last %(period)s"
-msgstr ""
+msgstr "Ultimo aggiornamento IPv4 (tls) / IPv6 (tls) %(period)s"
 
 #: main/templates/main/status.html:26 main/templates/main/status.html.py:43
 msgid "2w"
-msgstr ""
+msgstr "2 sett"
 
 #: main/templates/main/status.html:28 main/templates/main/status.html.py:45
 msgid "2m"
-msgstr ""
+msgstr "2 mesi"
 
 #: main/templates/main/status.html:30 main/templates/main/status.html.py:47
 msgid "2y"
-msgstr ""
+msgstr "2 anni"
 
 #: main/templates/main/status.html:35
 msgid "Users"
@@ -1270,13 +1346,13 @@ msgstr "Utenti"
 
 #: main/templates/main/status.html:39
 msgid "Active"
-msgstr ""
+msgstr "Attivo"
 
 #: main/templates/main/status.html:41 main/templates/main/status.html.py:43
 #: main/templates/main/status.html:45 main/templates/main/status.html.py:47
 #, python-format
 msgid "logged in / created in last %(period)s"
-msgstr ""
+msgstr "connesso / creato nell'ultimo %(period)s"
 
 #: main/templates/main/update.html:6
 msgid "Browser-based Updater"
@@ -1363,7 +1439,7 @@ msgstr "Servizio"
 #: main/templates/main/updater_hostconfig_overview.html:14
 #, python-format
 msgid "give %(type)s"
-msgstr ""
+msgstr "invia %(type)s"
 
 #: main/templates/main/updater_hostconfig_overview.html:27
 msgid "No other services to update yet."
@@ -1388,7 +1464,7 @@ msgstr ""
 
 #: main/templates/main/includes/tabbed_router_configuration.html:3
 msgid "General"
-msgstr ""
+msgstr "Generale"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:16
 msgid "General configuration hints"
@@ -1642,19 +1718,25 @@ msgid ""
 "updaters.\n"
 "            "
 msgstr ""
+"Nota: se l'interfaccia WAN di pfSense non ha il tuo indirizzo IP pubblico e "
+"non rileva cambiamenti per esso, l'aggiornamento verrà posticipato (default: "
+"ogni giorno alle 01:01). Puoi modificare questo valore nel file /etc/crontab "
+"nella riga in cui viene richiamato /etc/rc.dyndns.update - attenzione a non "
+"richiamare il comando con troppa frequenza e considera che questo si applica "
+"a tutti i tuoi aggiornamenti DDNS."
 
 #: main/templates/main/includes/tabbed_router_configuration.html:253
 msgid "(do not select this)"
-msgstr ""
+msgstr "(non selezionare)"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:255
 #: main/templates/main/includes/tabbed_router_configuration.html:256
 msgid "(most likely)"
-msgstr ""
+msgstr "(il più probabile)"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:257
 msgid "(select this as long as you need it)"
-msgstr ""
+msgstr "(selezionalo solo se ti serve)"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:266
 msgid "Browser-based update client"
@@ -1677,19 +1759,19 @@ msgstr ""
 #: main/templates/main/includes/tabbed_router_configuration.html:285
 #: main/templates/main/includes/tabbed_router_configuration.html:291
 msgid "update DNS to point to remote IPv4 or IPv6 address"
-msgstr ""
+msgstr "aggiorna il DNS per puntare all'indirizzo remoto IPv4 o IPv6"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:272
 #: main/templates/main/includes/tabbed_router_configuration.html:286
 #: main/templates/main/includes/tabbed_router_configuration.html:292
 msgid "similar, IPv4 only"
-msgstr ""
+msgstr "simile, ma solo IPv4"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:273
 #: main/templates/main/includes/tabbed_router_configuration.html:287
 #: main/templates/main/includes/tabbed_router_configuration.html:293
 msgid "similar, IPv6 only"
-msgstr ""
+msgstr "simile, ma solo IPv6"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:275
 msgid "URLs for browser / http user agent use"
@@ -1713,11 +1795,11 @@ msgstr "Come sopra, ma indicando gli indirizzi IP manualmente:"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:297
 msgid "update DNS to point to IPv4 127.0.0.1"
-msgstr ""
+msgstr "aggiorna il DNS per farlo puntare a IPv4 127.0.0.1"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:298
 msgid "update DNS to point to IPv6 ::1"
-msgstr ""
+msgstr "aggiorna il DNS per farlo puntare a IPv6 ::1"
 
 #: main/templates/main/includes/tabbed_router_configuration.html:300
 msgid "Explanation of parameters:"
@@ -1742,19 +1824,19 @@ msgstr ""
 "                chiaramente dovrai utilizzare i tuoi indirizzi IP pubblici "
 "reali."
 
-#: settings/base.py:381
+#: settings/base.py:383
 msgid "English"
 msgstr "Inglese"
 
-#: settings/base.py:382
+#: settings/base.py:384
 msgid "German"
 msgstr "Tedesco"
 
-#: settings/base.py:383
+#: settings/base.py:385
 msgid "French"
 msgstr "Francese"
 
-#: settings/base.py:384
+#: settings/base.py:386
 msgid "Italian"
 msgstr "Italiano"
 
@@ -1768,7 +1850,7 @@ msgstr "Home"
 
 #: templates/base.html:44
 msgid "Overview"
-msgstr ""
+msgstr "Vista d'insieme"
 
 #: templates/base.html:47
 msgid "Status"
@@ -1835,3 +1917,6 @@ msgstr "HTML Valido"
 #: templates/includes/base_footer.html:7
 msgid "Valid CSS"
 msgstr "CSS Valido"
+
+#~ msgid "Chinese (China)"
+#~ msgstr "Cinese (Cina)"
diff --git a/nsupdate/locale/pl/LC_MESSAGES/django.po b/nsupdate/locale/pl/LC_MESSAGES/django.po
index bc680ef..1098cc7 100644
--- a/nsupdate/locale/pl/LC_MESSAGES/django.po
+++ b/nsupdate/locale/pl/LC_MESSAGES/django.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nsupdate.info\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-30 21:38+0200\n"
-"PO-Revision-Date: 2014-09-30 19:06+0000\n"
+"POT-Creation-Date: 2014-11-01 21:35+0100\n"
+"PO-Revision-Date: 2014-10-24 19:28+0000\n"
 "Last-Translator: Thomas Waldmann <tw@waldmann-edv.de>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/nsupdateinfo/"
 "language/pl/)\n"
@@ -21,6 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
+#: accounts/templates/accounts/delete_user.html:7
+msgid "Delete your User Account"
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:11
+msgid ""
+"\n"
+"                    Are you sure you want to delete your user account and\n"
+"                    all your data on this service? You can not undelete your "
+"data.\n"
+"                    "
+msgstr ""
+
+#: accounts/templates/accounts/delete_user.html:16
+#: main/templates/main/delete_object.html:11
+msgid "Confirm"
+msgstr "Zatwierdź"
+
 #: accounts/templates/accounts/user_profile.html:7
 msgid "User Profile of"
 msgstr ""
@@ -29,15 +47,32 @@ msgstr ""
 msgid "Submit"
 msgstr "Wyślij"
 
-#: accounts/templates/accounts/user_profile.html:20
+#: accounts/templates/accounts/user_profile.html:18
 msgid "Associate with remote Account"
 msgstr ""
 
-#: accounts/templates/accounts/user_profile.html:27
+#: accounts/templates/accounts/user_profile.html:25
 msgid "Disassociate from remote Account"
 msgstr ""
 
+#: accounts/templates/accounts/user_profile.html:35
+#: accounts/templates/accounts/user_profile.html:44
+msgid "Delete User Profile"
+msgstr ""
+
+#: accounts/templates/accounts/user_profile.html:37
+msgid ""
+"\n"
+"            If you'ld like to stop using this service and delete this user "
+"profile and\n"
+"            all your data (especially all hosts and all domains created by "
+"this user),\n"
+"            you can do it here.\n"
+"            "
+msgstr ""
+
 #: accounts/templates/registration/activate.html:4
+#: accounts/templates/registration/activation_complete.html:3
 msgid "Activation complete"
 msgstr "Aktywacja zakończona"
 
@@ -45,19 +80,32 @@ msgstr "Aktywacja zakończona"
 msgid "Activation problem"
 msgstr "Problem z aktywacją"
 
-#: accounts/templates/registration/activate.html:7
-#, python-format
+#: accounts/templates/registration/activate.html:8
+#: accounts/templates/registration/activation_complete.html:6
+#, fuzzy
+msgid "Thanks, activation complete!"
+msgstr "Aktywacja zakończona"
+
+#: accounts/templates/registration/activate.html:9
+#: accounts/templates/registration/activation_complete.html:7
 msgid ""
-"\n"
-"Thanks %(account)s, activation complete!\n"
-"You may now <a href='%(auth_login_url)s'>login</a> using the username and "
-"password you set at registration.\n"
+"You may now login using the username and password you set at registration."
 msgstr ""
 
+#: accounts/templates/registration/activate.html:10
+#: accounts/templates/registration/activation_complete.html:8
+#: login/templates/login.html:3 login/templates/login.html.py:24
+#: login/templates/password_reset_complete.html:8 templates/base.html:61
+msgid "Log in"
+msgstr "Zaloguj się"
+
 #: accounts/templates/registration/activate.html:12
+msgid "Oops"
+msgstr ""
+
+#: accounts/templates/registration/activate.html:13
 msgid ""
-"Oops -- it seems that your activation key is invalid.  Please check the url "
-"again."
+"it seems that your activation key is invalid.  Please check the url again."
 msgstr ""
 
 #: accounts/templates/registration/activation_email.html:8
@@ -75,8 +123,8 @@ msgid ""
 "<p>\n"
 "To activate this account, please click the following link within the next \n"
 "<b>%(expiration_days)s</b> days:<br/>\n"
-"<a href=\"http://%(sitedomain)s%(activation_key_url)s\">http://%(sitedomain)s"
-"%(activation_key_url)s</a>\n"
+"<a href=\"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s\">"
+"%(requestscheme)s://%(sitedomain)s%(activation_key_url)s</a>\n"
 "</p>\n"
 "<p>\n"
 "Sincerely,<br/>\n"
@@ -89,13 +137,16 @@ msgstr ""
 msgid "Activation email sent"
 msgstr "E-mail aktywacyjny został wysłany"
 
-#: accounts/templates/registration/registration_complete.html:5
-msgid ""
-"An activation email has been sent.\n"
-"Please check your email and click on the link to activate your account."
+#: accounts/templates/registration/registration_complete.html:6
+#, fuzzy
+msgid "An activation email has been sent."
+msgstr "E-mail aktywacyjny został wysłany"
+
+#: accounts/templates/registration/registration_complete.html:7
+msgid "Please check your email and click on the link to activate your account."
 msgstr ""
 
-#: accounts/templates/registration/registration_form.html:4
+#: accounts/templates/registration/registration_form.html:3
 msgid "Register for an account"
 msgstr ""
 
@@ -165,15 +216,10 @@ msgid ""
 "        Password: please use a sane one, we trust you."
 msgstr ""
 
-#: accounts/templates/registration/registration_form.html:51
+#: accounts/templates/registration/registration_form.html:52
 msgid "Send activation email"
 msgstr ""
 
-#: login/templates/login.html:3 login/templates/login.html.py:24
-#: login/templates/password_reset_complete.html:10 templates/base.html:61
-msgid "Log in"
-msgstr "Zaloguj się"
-
 #: login/templates/login.html:8
 msgid "Login with a local Account"
 msgstr ""
@@ -186,15 +232,15 @@ msgstr ""
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: login/templates/login.html:26
+#: login/templates/login.html:24
 msgid "Forgot your password?"
 msgstr "Zapomniałeś hasła?"
 
-#: login/templates/login.html:27
+#: login/templates/login.html:26
 msgid "Sign up for a new account..."
 msgstr ""
 
-#: login/templates/login.html:34
+#: login/templates/login.html:33
 msgid "Login with a remote Account"
 msgstr ""
 
@@ -202,11 +248,11 @@ msgstr ""
 msgid "Log out"
 msgstr ""
 
-#: login/templates/logout.html:7
+#: login/templates/logout.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 
-#: login/templates/logout.html:8
+#: login/templates/logout.html:9
 msgid "Log in again"
 msgstr "Zaloguj się ponownie"
 
@@ -222,31 +268,31 @@ msgid ""
 msgstr ""
 
 #: login/templates/password_change.html:15
-#: login/templates/password_reset_confirm.html:17
+#: login/templates/password_reset_confirm.html:14
 msgid "Change my password"
 msgstr "Zmień hasło"
 
 #: login/templates/password_change_done.html:3
-#: login/templates/password_change_done.html:7
+#: login/templates/password_change_done.html:6
 msgid "Password change successful"
 msgstr ""
 
-#: login/templates/password_change_done.html:8
+#: login/templates/password_change_done.html:7
 msgid "Your password was changed."
 msgstr "Hasło zostało zmienione."
 
-#: login/templates/password_reset.html:3 login/templates/password_reset.html:8
+#: login/templates/password_reset.html:3 login/templates/password_reset.html:7
 #: login/templates/password_reset_confirm.html:3
 msgid "Password reset"
 msgstr "Resetowanie hasła"
 
-#: login/templates/password_reset.html:10
+#: login/templates/password_reset.html:9
 msgid ""
 "Forgotten your password? Enter your email address below, and we'll email "
 "instructions for setting a new one."
 msgstr ""
 
-#: login/templates/password_reset.html:18
+#: login/templates/password_reset.html:17
 msgid "Reset my password"
 msgstr ""
 
@@ -255,25 +301,25 @@ msgstr ""
 msgid "Password reset complete"
 msgstr ""
 
-#: login/templates/password_reset_complete.html:8
+#: login/templates/password_reset_complete.html:7
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr ""
 
-#: login/templates/password_reset_confirm.html:8
+#: login/templates/password_reset_confirm.html:7
 msgid "Enter new password"
 msgstr "Wprowadź nowe hasło"
 
-#: login/templates/password_reset_confirm.html:10
+#: login/templates/password_reset_confirm.html:8
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: login/templates/password_reset_confirm.html:26
+#: login/templates/password_reset_confirm.html:21
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: login/templates/password_reset_confirm.html:28
+#: login/templates/password_reset_confirm.html:22
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used. Please request a new password reset."
@@ -284,13 +330,13 @@ msgstr ""
 msgid "Password reset successful"
 msgstr ""
 
-#: login/templates/password_reset_done.html:8
+#: login/templates/password_reset_done.html:7
 msgid ""
 "We've emailed you instructions for setting your password. You should be "
 "receiving them shortly."
 msgstr ""
 
-#: login/templates/password_reset_done.html:10
+#: login/templates/password_reset_done.html:8
 msgid ""
 "If you don't receive an email, please make sure you've entered the address "
 "you registered with, and check your spam folder."
@@ -338,12 +384,12 @@ msgstr ""
 msgid "The name of your host."
 msgstr ""
 
-#: main/models.py:142 main/models.py:307
+#: main/models.py:142 main/models.py:322
 msgid ""
 "Some arbitrary comment about your host, e.g  who / what / where this host is"
 msgstr ""
 
-#: main/models.py:149 main/models.py:318
+#: main/models.py:149 main/models.py:333
 msgid ""
 "Check if host is available/in use - if not checked, we won't accept updates "
 "for this host"
@@ -375,51 +421,51 @@ msgstr ""
 msgid "Latest result message relating to the server"
 msgstr ""
 
-#: main/models.py:303
+#: main/models.py:318
 msgid "The name of a host in same network as your main host."
 msgstr ""
 
-#: main/models.py:311
+#: main/models.py:326
 msgid "The IPv4 interface ID of this host. Use IPv4 notation."
 msgstr ""
 
-#: main/models.py:315
+#: main/models.py:330
 msgid "The IPv6 interface ID of this host. Use IPv6 notation."
 msgstr ""
 
-#: main/models.py:358
+#: main/models.py:373
 msgid "Service name"
 msgstr ""
 
-#: main/models.py:362
+#: main/models.py:377
 msgid "Some arbitrary comment about the service"
 msgstr ""
 
-#: main/models.py:365
+#: main/models.py:380
 msgid "Update Server [name or IP] of this service"
 msgstr ""
 
-#: main/models.py:369
+#: main/models.py:384
 msgid "Update Server URL path of this service"
 msgstr ""
 
-#: main/models.py:372
+#: main/models.py:387
 msgid "Use https / TLS to contact the Update Server?"
 msgstr ""
 
-#: main/models.py:392
+#: main/models.py:407
 msgid "The hostname for that service (used in query string)"
 msgstr ""
 
-#: main/models.py:396
+#: main/models.py:411
 msgid "Some arbitrary comment about your host on that service"
 msgstr ""
 
-#: main/models.py:401
+#: main/models.py:416
 msgid "The name/id for that service (used for http basic auth)"
 msgstr ""
 
-#: main/models.py:404
+#: main/models.py:419
 msgid "The password/secret for that service (used for http basic auth)"
 msgstr ""
 
@@ -594,10 +640,6 @@ msgstr ""
 msgid "Are you sure you want to delete \"%(object)s\"?"
 msgstr ""
 
-#: main/templates/main/delete_object.html:11
-msgid "Confirm"
-msgstr "Zatwierdź"
-
 #: main/templates/main/domain.html:8
 msgid "Edit Domain"
 msgstr ""
@@ -1516,19 +1558,19 @@ msgid ""
 "that."
 msgstr ""
 
-#: settings/base.py:381
+#: settings/base.py:383
 msgid "English"
 msgstr "Angielski"
 
-#: settings/base.py:382
+#: settings/base.py:384
 msgid "German"
 msgstr "Niemiecki"
 
-#: settings/base.py:383
+#: settings/base.py:385
 msgid "French"
 msgstr "Francuski"
 
-#: settings/base.py:384
+#: settings/base.py:386
 msgid "Italian"
 msgstr ""