diff --git a/cps/helper.py b/cps/helper.py
index 41278156..9328cda5 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -26,6 +26,7 @@ except ImportError:
     pass
 import web
 import server
+import random
 
 try:
     import unidecode
@@ -76,10 +77,27 @@ def make_mobi(book_id, calibrepath, user_id, kindle_mail):
 
 
 def send_test_mail(kindle_mail, user_name):
-    global_WorkerThread.add_email(_(u'Calibre-web test email'),None, None, ub.get_mail_settings(),
+    global_WorkerThread.add_email(_(u'Calibre-Web test email'),None, None, ub.get_mail_settings(),
                                   kindle_mail, user_name, _(u"Test E-Mail"))
     return
 
+
+# Send registration email or password reset email, depending on parameter resend (False means welcome email)
+def send_registration_mail(e_mail, user_name, default_password, resend=False):
+    text = "Hello %s!\r\n" % user_name
+    if not resend:
+        text += "Your new account at Calibre-Web has been created. Thanks for joining us!\r\n"
+    text += "Please log in to your account using the following informations:\r\n"
+    text += "User name: %s\n" % user_name
+    text += "Password: %s\r\n" % default_password
+    text += "Don't forget to change your password after first login.\r\n"
+    text += "Sincerely\r\n\r\n"
+    text += "Your Calibre-Web team"
+    global_WorkerThread.add_email(_(u'Get Started with Calibre-Web'),None, None, ub.get_mail_settings(),
+                                  e_mail, user_name, _(u"Registration E-Mail for user: %s" % user_name),text)
+    return
+
+
 # Files are processed in the following order/priority:
 # 1: If Mobi file is exisiting, it's directly send to kindle email,
 # 2: If Epub file is exisiting, it's converted and send to kindle email
@@ -271,6 +289,11 @@ def delete_book_gdrive(book, book_format):
         error =_(u'Book path %s not found on Google Drive' % book.path)  # file not found
     return error
 
+def generate_random_password():
+    s = "abcdefghijklmnopqrstuvwxyz01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%&*()?"
+    passlen = 8
+    return "".join(random.sample(s,passlen ))
+
 ################################## External interface
 
 def update_dir_stucture(book_id, calibrepath):
diff --git a/cps/server.py b/cps/server.py
index e68710bd..37245b42 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -69,7 +69,7 @@ class server:
             self.wsgiserver.close(True)
 
         if self.restart == True:
-            web.app.logger.info("Performing restart of Calibre-web")
+            web.app.logger.info("Performing restart of Calibre-Web")
             web.helper.global_WorkerThread.stop()
             if os.name == 'nt':
                 arguments = ["\"" + sys.executable + "\""]
@@ -79,7 +79,7 @@ class server:
             else:
                 os.execl(sys.executable, sys.executable, *sys.argv)
         else:
-            web.app.logger.info("Performing shutdown of Calibre-web")
+            web.app.logger.info("Performing shutdown of Calibre-Web")
             web.helper.global_WorkerThread.stop()
         sys.exit(0)
 
diff --git a/cps/static/css/libs/bootstrap-editable.css b/cps/static/css/libs/bootstrap-editable.css
new file mode 100644
index 00000000..ff7ea50f
--- /dev/null
+++ b/cps/static/css/libs/bootstrap-editable.css
@@ -0,0 +1,663 @@
+/*! X-editable - v1.5.3 
+* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
+* http://github.com/vitalets/x-editable
+* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
+.editableform {
+    margin-bottom: 0; /* overwrites bootstrap margin */
+}
+
+.editableform .control-group {
+    margin-bottom: 0; /* overwrites bootstrap margin */
+    white-space: nowrap; /* prevent wrapping buttons on new line */
+    line-height: 20px; /* overwriting bootstrap line-height. See #133 */
+}
+
+/* 
+  BS3 width:1005 for inputs breaks editable form in popup 
+  See: https://github.com/vitalets/x-editable/issues/393
+*/
+.editableform .form-control {
+    width: auto;
+}
+
+.editable-buttons {
+   display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
+   vertical-align: top;
+   margin-left: 7px;
+   /* inline-block emulation for IE7*/
+   zoom: 1; 
+   *display: inline;
+}
+
+.editable-buttons.editable-buttons-bottom {
+   display: block; 
+   margin-top: 7px;
+   margin-left: 0;
+}
+
+.editable-input {
+    vertical-align: top; 
+    display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
+    width: auto; /* bootstrap-responsive has width: 100% that breakes layout */
+    white-space: normal; /* reset white-space decalred in parent*/
+   /* display-inline emulation for IE7*/
+   zoom: 1; 
+   *display: inline;   
+}
+
+.editable-buttons .editable-cancel {
+   margin-left: 7px; 
+}
+
+/*for jquery-ui buttons need set height to look more pretty*/
+.editable-buttons button.ui-button-icon-only {
+   height: 24px; 
+   width: 30px;
+}
+
+.editableform-loading {
+    background: url('../img/loading.gif') center center no-repeat;  
+    height: 25px;
+    width: auto; 
+    min-width: 25px; 
+}
+
+.editable-inline .editableform-loading {
+    background-position: left 5px;      
+}
+
+ .editable-error-block {
+    max-width: 300px;
+    margin: 5px 0 0 0;
+    width: auto;
+    white-space: normal;
+}
+
+/*add padding for jquery ui*/
+.editable-error-block.ui-state-error {
+    padding: 3px;  
+}  
+
+.editable-error {
+   color: red;  
+}
+
+/* ---- For specific types ---- */
+
+.editableform .editable-date {
+    padding: 0; 
+    margin: 0;
+    float: left;
+}
+
+/* move datepicker icon to center of add-on button. See https://github.com/vitalets/x-editable/issues/183 */
+.editable-inline .add-on .icon-th {
+   margin-top: 3px;
+   margin-left: 1px; 
+}
+
+
+/* checklist vertical alignment */
+.editable-checklist label input[type="checkbox"], 
+.editable-checklist label span {
+    vertical-align: middle;
+    margin: 0;
+}
+
+.editable-checklist label {
+    white-space: nowrap; 
+}
+
+/* set exact width of textarea to fit buttons toolbar */
+.editable-wysihtml5 {
+    width: 566px; 
+    height: 250px; 
+}
+
+/* clear button shown as link in date inputs */
+.editable-clear {
+   clear: both;
+   font-size: 0.9em;
+   text-decoration: none;
+   text-align: right;
+}
+
+/* IOS-style clear button for text inputs */
+.editable-clear-x {
+   background: url('../img/clear.png') center center no-repeat;
+   display: block;
+   width: 13px;    
+   height: 13px;
+   position: absolute;
+   opacity: 0.6;
+   z-index: 100;
+   
+   top: 50%;
+   right: 6px;
+   margin-top: -6px;
+   
+}
+
+.editable-clear-x:hover {
+   opacity: 1;
+}
+
+.editable-pre-wrapped {
+   white-space: pre-wrap;
+}
+.editable-container.editable-popup {
+    max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
+}  
+
+.editable-container.popover {
+    width: auto; /* without this rule popover does not stretch */
+}
+
+.editable-container.editable-inline {
+    display: inline-block; 
+    vertical-align: middle;
+    width: auto;
+    /* inline-block emulation for IE7*/
+    zoom: 1; 
+    *display: inline;    
+}
+
+.editable-container.ui-widget {
+   font-size: inherit;  /* jqueryui widget font 1.1em too big, overwrite it */
+   z-index: 9990; /* should be less than select2 dropdown z-index to close dropdown first when click */
+}
+.editable-click, 
+a.editable-click, 
+a.editable-click:hover {
+    text-decoration: none;
+    border-bottom: dashed 1px #0088cc;
+}
+
+.editable-click.editable-disabled, 
+a.editable-click.editable-disabled, 
+a.editable-click.editable-disabled:hover {
+   color: #585858;  
+   cursor: default;
+   border-bottom: none;
+}
+
+.editable-empty, .editable-empty:hover, .editable-empty:focus{
+  font-style: italic; 
+  color: #DD1144;  
+  /* border-bottom: none; */
+  text-decoration: none;
+}
+
+.editable-unsaved {
+  font-weight: bold; 
+}
+
+.editable-unsaved:after {
+/*    content: '*'*/
+}
+
+.editable-bg-transition {
+  -webkit-transition: background-color 1400ms ease-out;
+  -moz-transition: background-color 1400ms ease-out;
+  -o-transition: background-color 1400ms ease-out;
+  -ms-transition: background-color 1400ms ease-out;
+  transition: background-color 1400ms ease-out;  
+}
+
+/*see https://github.com/vitalets/x-editable/issues/139 */
+.form-horizontal .editable
+{ 
+    padding-top: 5px;
+    display:inline-block;
+}
+
+
+/*!
+ * Datepicker for Bootstrap
+ *
+ * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+.datepicker {
+  padding: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  direction: ltr;
+  /*.dow {
+		border-top: 1px solid #ddd !important;
+	}*/
+
+}
+.datepicker-inline {
+  width: 220px;
+}
+.datepicker.datepicker-rtl {
+  direction: rtl;
+}
+.datepicker.datepicker-rtl table tr td span {
+  float: right;
+}
+.datepicker-dropdown {
+  top: 0;
+  left: 0;
+}
+.datepicker-dropdown:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 6px;
+}
+.datepicker-dropdown:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 7px;
+}
+.datepicker > div {
+  display: none;
+}
+.datepicker.days div.datepicker-days {
+  display: block;
+}
+.datepicker.months div.datepicker-months {
+  display: block;
+}
+.datepicker.years div.datepicker-years {
+  display: block;
+}
+.datepicker table {
+  margin: 0;
+}
+.datepicker td,
+.datepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  border: none;
+}
+.table-striped .datepicker table tr td,
+.table-striped .datepicker table tr th {
+  background-color: transparent;
+}
+.datepicker table tr td.day:hover {
+  background: #eeeeee;
+  cursor: pointer;
+}
+.datepicker table tr td.old,
+.datepicker table tr td.new {
+  color: #999999;
+}
+.datepicker table tr td.disabled,
+.datepicker table tr td.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td.today,
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today.disabled:hover {
+  background-color: #fde19a;
+  background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
+  background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: linear-gradient(top, #fdd49a, #fdf59a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
+  border-color: #fdf59a #fdf59a #fbed50;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #000;
+}
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today:hover:hover,
+.datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today:hover.disabled,
+.datepicker table tr td.today.disabled.disabled,
+.datepicker table tr td.today.disabled:hover.disabled,
+.datepicker table tr td.today[disabled],
+.datepicker table tr td.today:hover[disabled],
+.datepicker table tr td.today.disabled[disabled],
+.datepicker table tr td.today.disabled:hover[disabled] {
+  background-color: #fdf59a;
+}
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active {
+  background-color: #fbf069 \9;
+}
+.datepicker table tr td.today:hover:hover {
+  color: #000;
+}
+.datepicker table tr td.today.active:hover {
+  color: #fff;
+}
+.datepicker table tr td.range,
+.datepicker table tr td.range:hover,
+.datepicker table tr td.range.disabled,
+.datepicker table tr td.range.disabled:hover {
+  background: #eeeeee;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today,
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today.disabled:hover {
+  background-color: #f3d17a;
+  background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
+  background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -o-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: linear-gradient(top, #f3c17a, #f3e97a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
+  border-color: #f3e97a #f3e97a #edde34;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today:hover:hover,
+.datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today:hover.disabled,
+.datepicker table tr td.range.today.disabled.disabled,
+.datepicker table tr td.range.today.disabled:hover.disabled,
+.datepicker table tr td.range.today[disabled],
+.datepicker table tr td.range.today:hover[disabled],
+.datepicker table tr td.range.today.disabled[disabled],
+.datepicker table tr td.range.today.disabled:hover[disabled] {
+  background-color: #f3e97a;
+}
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active {
+  background-color: #efe24b \9;
+}
+.datepicker table tr td.selected,
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected.disabled:hover {
+  background-color: #9e9e9e;
+  background-image: -moz-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -ms-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
+  background-image: -webkit-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -o-linear-gradient(top, #b3b3b3, #808080);
+  background-image: linear-gradient(top, #b3b3b3, #808080);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
+  border-color: #808080 #808080 #595959;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected:hover:hover,
+.datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected:hover.disabled,
+.datepicker table tr td.selected.disabled.disabled,
+.datepicker table tr td.selected.disabled:hover.disabled,
+.datepicker table tr td.selected[disabled],
+.datepicker table tr td.selected:hover[disabled],
+.datepicker table tr td.selected.disabled[disabled],
+.datepicker table tr td.selected.disabled:hover[disabled] {
+  background-color: #808080;
+}
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active {
+  background-color: #666666 \9;
+}
+.datepicker table tr td.active,
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active:hover:hover,
+.datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active:hover.disabled,
+.datepicker table tr td.active.disabled.disabled,
+.datepicker table tr td.active.disabled:hover.disabled,
+.datepicker table tr td.active[disabled],
+.datepicker table tr td.active:hover[disabled],
+.datepicker table tr td.active.disabled[disabled],
+.datepicker table tr td.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span {
+  display: block;
+  width: 23%;
+  height: 54px;
+  line-height: 54px;
+  float: left;
+  margin: 1%;
+  cursor: pointer;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.datepicker table tr td span:hover {
+  background: #eeeeee;
+}
+.datepicker table tr td span.disabled,
+.datepicker table tr td span.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td span.active,
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active:hover:hover,
+.datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active:hover.disabled,
+.datepicker table tr td span.active.disabled.disabled,
+.datepicker table tr td span.active.disabled:hover.disabled,
+.datepicker table tr td span.active[disabled],
+.datepicker table tr td span.active:hover[disabled],
+.datepicker table tr td span.active.disabled[disabled],
+.datepicker table tr td span.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span.old,
+.datepicker table tr td span.new {
+  color: #999999;
+}
+.datepicker th.datepicker-switch {
+  width: 145px;
+}
+.datepicker thead tr:first-child th,
+.datepicker tfoot tr th {
+  cursor: pointer;
+}
+.datepicker thead tr:first-child th:hover,
+.datepicker tfoot tr th:hover {
+  background: #eeeeee;
+}
+.datepicker .cw {
+  font-size: 10px;
+  width: 12px;
+  padding: 0 2px 0 5px;
+  vertical-align: middle;
+}
+.datepicker thead tr:first-child th.cw {
+  cursor: default;
+  background-color: transparent;
+}
+.input-append.date .add-on i,
+.input-prepend.date .add-on i {
+  display: block;
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+}
+.input-daterange input {
+  text-align: center;
+}
+.input-daterange input:first-child {
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-daterange input:last-child {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-daterange .add-on {
+  display: inline-block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  padding: 4px 5px;
+  font-weight: normal;
+  line-height: 18px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  vertical-align: middle;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+  margin-left: -5px;
+  margin-right: -5px;
+}
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 94334c25..7ccbd5c6 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -98,3 +98,9 @@ input.pill:not(:checked) + label .glyphicon {
 #btn-upload-format {display: none;}
 
 .panel-title > a { text-decoration: none;}
+
+.editable-buttons { display:inline-block; margin-left: 7px ;}
+.editable-input { display:inline-block;}
+.editable-cancel { margin-bottom: 0px !important; margin-left: 7px !important;}
+.editable-submit { margin-bottom: 0px !important;}
+
diff --git a/cps/static/js/libs/bootstrap-table/bootstrap-editable.min.js b/cps/static/js/libs/bootstrap-table/bootstrap-editable.min.js
new file mode 100644
index 00000000..0511799c
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/bootstrap-editable.min.js
@@ -0,0 +1,7 @@
+/*! X-editable - v1.5.3 
+* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
+* http://github.com/vitalets/x-editable
+* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
+!function(a){"use strict";var b=function(b,c){this.options=a.extend({},a.fn.editableform.defaults,c),this.$div=a(b),this.options.scope||(this.options.scope=this)};b.prototype={constructor:b,initInput:function(){this.input=this.options.input,this.value=this.input.str2value(this.options.value),this.input.prerender()},initTemplate:function(){this.$form=a(a.fn.editableform.template)},initButtons:function(){var b=this.$form.find(".editable-buttons");b.append(a.fn.editableform.buttons),"bottom"===this.options.showbuttons&&b.addClass("editable-buttons-bottom")},render:function(){this.$loading=a(a.fn.editableform.loading),this.$div.empty().append(this.$loading),this.initTemplate(),this.options.showbuttons?this.initButtons():this.$form.find(".editable-buttons").remove(),this.showLoading(),this.isSaving=!1,this.$div.triggerHandler("rendering"),this.initInput(),this.$form.find("div.editable-input").append(this.input.$tpl),this.$div.append(this.$form),a.when(this.input.render()).then(a.proxy(function(){if(this.options.showbuttons||this.input.autosubmit(),this.$form.find(".editable-cancel").click(a.proxy(this.cancel,this)),this.input.error)this.error(this.input.error),this.$form.find(".editable-submit").attr("disabled",!0),this.input.$input.attr("disabled",!0),this.$form.submit(function(a){a.preventDefault()});else{this.error(!1),this.input.$input.removeAttr("disabled"),this.$form.find(".editable-submit").removeAttr("disabled");var b=null===this.value||void 0===this.value||""===this.value?this.options.defaultValue:this.value;this.input.value2input(b),this.$form.submit(a.proxy(this.submit,this))}this.$div.triggerHandler("rendered"),this.showForm(),this.input.postrender&&this.input.postrender()},this))},cancel:function(){this.$div.triggerHandler("cancel")},showLoading:function(){var a,b;this.$form?(a=this.$form.outerWidth(),b=this.$form.outerHeight(),a&&this.$loading.width(a),b&&this.$loading.height(b),this.$form.hide()):(a=this.$loading.parent().width(),a&&this.$loading.width(a)),this.$loading.show()},showForm:function(a){this.$loading.hide(),this.$form.show(),a!==!1&&this.input.activate(),this.$div.triggerHandler("show")},error:function(b){var c,d=this.$form.find(".control-group"),e=this.$form.find(".editable-error-block");if(b===!1)d.removeClass(a.fn.editableform.errorGroupClass),e.removeClass(a.fn.editableform.errorBlockClass).empty().hide();else{if(b){c=(""+b).split("\n");for(var f=0;f<c.length;f++)c[f]=a("<div>").text(c[f]).html();b=c.join("<br>")}d.addClass(a.fn.editableform.errorGroupClass),e.addClass(a.fn.editableform.errorBlockClass).html(b).show()}},submit:function(b){b.stopPropagation(),b.preventDefault();var c=this.input.input2value(),d=this.validate(c);if("object"===a.type(d)&&void 0!==d.newValue){if(c=d.newValue,this.input.value2input(c),"string"==typeof d.msg)return this.error(d.msg),void this.showForm()}else if(d)return this.error(d),void this.showForm();if(!this.options.savenochange&&this.input.value2str(c)===this.input.value2str(this.value))return void this.$div.triggerHandler("nochange");var e=this.input.value2submit(c);this.isSaving=!0,a.when(this.save(e)).done(a.proxy(function(a){this.isSaving=!1;var b="function"==typeof this.options.success?this.options.success.call(this.options.scope,a,c):null;return b===!1?(this.error(!1),void this.showForm(!1)):"string"==typeof b?(this.error(b),void this.showForm()):(b&&"object"==typeof b&&b.hasOwnProperty("newValue")&&(c=b.newValue),this.error(!1),this.value=c,void this.$div.triggerHandler("save",{newValue:c,submitValue:e,response:a}))},this)).fail(a.proxy(function(a){this.isSaving=!1;var b;b="function"==typeof this.options.error?this.options.error.call(this.options.scope,a,c):"string"==typeof a?a:a.responseText||a.statusText||"Unknown error!",this.error(b),this.showForm()},this))},save:function(b){this.options.pk=a.fn.editableutils.tryParseJson(this.options.pk,!0);var c,d="function"==typeof this.options.pk?this.options.pk.call(this.options.scope):this.options.pk,e=!!("function"==typeof this.options.url||this.options.url&&("always"===this.options.send||"auto"===this.options.send&&null!==d&&void 0!==d));return e?(this.showLoading(),c={name:this.options.name||"",value:b,pk:d},"function"==typeof this.options.params?c=this.options.params.call(this.options.scope,c):(this.options.params=a.fn.editableutils.tryParseJson(this.options.params,!0),a.extend(c,this.options.params)),"function"==typeof this.options.url?this.options.url.call(this.options.scope,c):a.ajax(a.extend({url:this.options.url,data:c,type:"POST"},this.options.ajaxOptions))):void 0},validate:function(a){return void 0===a&&(a=this.value),"function"==typeof this.options.validate?this.options.validate.call(this.options.scope,a):void 0},option:function(a,b){a in this.options&&(this.options[a]=b),"value"===a&&this.setValue(b)},setValue:function(a,b){b?this.value=this.input.str2value(a):this.value=a,this.$form&&this.$form.is(":visible")&&this.input.value2input(this.value)}},a.fn.editableform=function(c){var d=arguments;return this.each(function(){var e=a(this),f=e.data("editableform"),g="object"==typeof c&&c;f||e.data("editableform",f=new b(this,g)),"string"==typeof c&&f[c].apply(f,Array.prototype.slice.call(d,1))})},a.fn.editableform.Constructor=b,a.fn.editableform.defaults={type:"text",url:null,params:null,name:null,pk:null,value:null,defaultValue:null,send:"auto",validate:null,success:null,error:null,ajaxOptions:null,showbuttons:!0,scope:null,savenochange:!1},a.fn.editableform.template='<form class="form-inline editableform"><div class="control-group"><div><div class="editable-input"></div><div class="editable-buttons"></div></div><div class="editable-error-block"></div></div></form>',a.fn.editableform.loading='<div class="editableform-loading"></div>',a.fn.editableform.buttons='<button type="submit" class="editable-submit">ok</button><button type="button" class="editable-cancel">cancel</button>',a.fn.editableform.errorGroupClass=null,a.fn.editableform.errorBlockClass="editable-error",a.fn.editableform.engine="jquery"}(window.jQuery),function(a){"use strict";a.fn.editableutils={inherit:function(a,b){var c=function(){};c.prototype=b.prototype,a.prototype=new c,a.prototype.constructor=a,a.superclass=b.prototype},setCursorPosition:function(a,b){if(a.setSelectionRange)a.setSelectionRange(b,b);else if(a.createTextRange){var c=a.createTextRange();c.collapse(!0),c.moveEnd("character",b),c.moveStart("character",b),c.select()}},tryParseJson:function(a,b){if("string"==typeof a&&a.length&&a.match(/^[\{\[].*[\}\]]$/))if(b)try{a=new Function("return "+a)()}catch(c){}finally{return a}else a=new Function("return "+a)();return a},sliceObj:function(b,c,d){var e,f,g={};if(!a.isArray(c)||!c.length)return g;for(var h=0;h<c.length;h++)e=c[h],b.hasOwnProperty(e)&&(g[e]=b[e]),d!==!0&&(f=e.toLowerCase(),b.hasOwnProperty(f)&&(g[e]=b[f]));return g},getConfigData:function(b){var c={};return a.each(b.data(),function(a,b){("object"!=typeof b||b&&"object"==typeof b&&(b.constructor===Object||b.constructor===Array))&&(c[a]=b)}),c},objectKeys:function(a){if(Object.keys)return Object.keys(a);if(a!==Object(a))throw new TypeError("Object.keys called on a non-object");var b,c=[];for(b in a)Object.prototype.hasOwnProperty.call(a,b)&&c.push(b);return c},escape:function(b){return a("<div>").text(b).html()},itemsByValue:function(b,c,d){if(!c||null===b)return[];if("function"!=typeof d){var e=d||"value";d=function(a){return a[e]}}var f=a.isArray(b),g=[],h=this;return a.each(c,function(c,e){if(e.children)g=g.concat(h.itemsByValue(b,e.children,d));else if(f)a.grep(b,function(a){return a==(e&&"object"==typeof e?d(e):e)}).length&&g.push(e);else{var i=e&&"object"==typeof e?d(e):e;b==i&&g.push(e)}}),g},createInput:function(b){var c,d,e,f=b.type;return"date"===f&&("inline"===b.mode?a.fn.editabletypes.datefield?f="datefield":a.fn.editabletypes.dateuifield&&(f="dateuifield"):a.fn.editabletypes.date?f="date":a.fn.editabletypes.dateui&&(f="dateui"),"date"!==f||a.fn.editabletypes.date||(f="combodate")),"datetime"===f&&"inline"===b.mode&&(f="datetimefield"),"wysihtml5"!==f||a.fn.editabletypes[f]||(f="textarea"),"function"==typeof a.fn.editabletypes[f]?(c=a.fn.editabletypes[f],d=this.sliceObj(b,this.objectKeys(c.defaults)),e=new c(d)):(a.error("Unknown type: "+f),!1)},supportsTransitions:function(){var a=document.body||document.documentElement,b=a.style,c="transition",d=["Moz","Webkit","Khtml","O","ms"];if("string"==typeof b[c])return!0;c=c.charAt(0).toUpperCase()+c.substr(1);for(var e=0;e<d.length;e++)if("string"==typeof b[d[e]+c])return!0;return!1}}}(window.jQuery),function(a){"use strict";var b=function(a,b){this.init(a,b)},c=function(a,b){this.init(a,b)};b.prototype={containerName:null,containerDataName:null,innerCss:null,containerClass:"editable-container editable-popup",defaults:{},init:function(c,d){this.$element=a(c),this.options=a.extend({},a.fn.editableContainer.defaults,d),this.splitOptions(),this.formOptions.scope=this.$element[0],this.initContainer(),this.delayedHide=!1,this.$element.on("destroyed",a.proxy(function(){this.destroy()},this)),a(document).data("editable-handlers-attached")||(a(document).on("keyup.editable",function(b){27===b.which&&a(".editable-open").editableContainer("hide")}),a(document).on("click.editable",function(c){var d,e=a(c.target),f=[".editable-container",".ui-datepicker-header",".datepicker",".modal-backdrop",".bootstrap-wysihtml5-insert-image-modal",".bootstrap-wysihtml5-insert-link-modal"];if(!a(".select2-drop-mask").is(":visible")&&a.contains(document.documentElement,c.target)&&!e.is(document)){for(d=0;d<f.length;d++)if(e.is(f[d])||e.parents(f[d]).length)return;b.prototype.closeOthers(c.target)}}),a(document).data("editable-handlers-attached",!0))},splitOptions:function(){if(this.containerOptions={},this.formOptions={},!a.fn[this.containerName])throw new Error(this.containerName+" not found. Have you included corresponding js file?");for(var b in this.options)b in this.defaults?this.containerOptions[b]=this.options[b]:this.formOptions[b]=this.options[b]},tip:function(){return this.container()?this.container().$tip:null},container:function(){var a;return this.containerDataName&&(a=this.$element.data(this.containerDataName))?a:a=this.$element.data(this.containerName)},call:function(){this.$element[this.containerName].apply(this.$element,arguments)},initContainer:function(){this.call(this.containerOptions)},renderForm:function(){this.$form.editableform(this.formOptions).on({save:a.proxy(this.save,this),nochange:a.proxy(function(){this.hide("nochange")},this),cancel:a.proxy(function(){this.hide("cancel")},this),show:a.proxy(function(){this.delayedHide?(this.hide(this.delayedHide.reason),this.delayedHide=!1):this.setPosition()},this),rendering:a.proxy(this.setPosition,this),resize:a.proxy(this.setPosition,this),rendered:a.proxy(function(){this.$element.triggerHandler("shown",a(this.options.scope).data("editable"))},this)}).editableform("render")},show:function(b){this.$element.addClass("editable-open"),b!==!1&&this.closeOthers(this.$element[0]),this.innerShow(),this.tip().addClass(this.containerClass),this.$form,this.$form=a("<div>"),this.tip().is(this.innerCss)?this.tip().append(this.$form):this.tip().find(this.innerCss).append(this.$form),this.renderForm()},hide:function(a){if(this.tip()&&this.tip().is(":visible")&&this.$element.hasClass("editable-open")){if(this.$form.data("editableform").isSaving)return void(this.delayedHide={reason:a});this.delayedHide=!1,this.$element.removeClass("editable-open"),this.innerHide(),this.$element.triggerHandler("hidden",a||"manual")}},innerShow:function(){},innerHide:function(){},toggle:function(a){this.container()&&this.tip()&&this.tip().is(":visible")?this.hide():this.show(a)},setPosition:function(){},save:function(a,b){this.$element.triggerHandler("save",b),this.hide("save")},option:function(a,b){this.options[a]=b,a in this.containerOptions?(this.containerOptions[a]=b,this.setContainerOption(a,b)):(this.formOptions[a]=b,this.$form&&this.$form.editableform("option",a,b))},setContainerOption:function(a,b){this.call("option",a,b)},destroy:function(){this.hide(),this.innerDestroy(),this.$element.off("destroyed"),this.$element.removeData("editableContainer")},innerDestroy:function(){},closeOthers:function(b){a(".editable-open").each(function(c,d){if(d!==b&&!a(d).find(b).length){var e=a(d),f=e.data("editableContainer");f&&("cancel"===f.options.onblur?e.data("editableContainer").hide("onblur"):"submit"===f.options.onblur&&e.data("editableContainer").tip().find("form").submit())}})},activate:function(){this.tip&&this.tip().is(":visible")&&this.$form&&this.$form.data("editableform").input.activate()}},a.fn.editableContainer=function(d){var e=arguments;return this.each(function(){var f=a(this),g="editableContainer",h=f.data(g),i="object"==typeof d&&d,j="inline"===i.mode?c:b;h||f.data(g,h=new j(this,i)),"string"==typeof d&&h[d].apply(h,Array.prototype.slice.call(e,1))})},a.fn.editableContainer.Popup=b,a.fn.editableContainer.Inline=c,a.fn.editableContainer.defaults={value:null,placement:"top",autohide:!0,onblur:"cancel",anim:!1,mode:"popup"},jQuery.event.special.destroyed={remove:function(a){a.handler&&a.handler()}}}(window.jQuery),function(a){"use strict";a.extend(a.fn.editableContainer.Inline.prototype,a.fn.editableContainer.Popup.prototype,{containerName:"editableform",innerCss:".editable-inline",containerClass:"editable-container editable-inline",initContainer:function(){this.$tip=a("<span></span>"),this.options.anim||(this.options.anim=0)},splitOptions:function(){this.containerOptions={},this.formOptions=this.options},tip:function(){return this.$tip},innerShow:function(){this.$element.hide(),this.tip().insertAfter(this.$element).show()},innerHide:function(){this.$tip.hide(this.options.anim,a.proxy(function(){this.$element.show(),this.innerDestroy()},this))},innerDestroy:function(){this.tip()&&this.tip().empty().remove()}})}(window.jQuery),function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.editable.defaults,c,a.fn.editableutils.getConfigData(this.$element)),this.options.selector?this.initLive():this.init(),this.options.highlight&&!a.fn.editableutils.supportsTransitions()&&(this.options.highlight=!1)};b.prototype={constructor:b,init:function(){var b,c=!1;if(this.options.name=this.options.name||this.$element.attr("id"),this.options.scope=this.$element[0],this.input=a.fn.editableutils.createInput(this.options),this.input){switch(void 0===this.options.value||null===this.options.value?(this.value=this.input.html2value(a.trim(this.$element.html())),c=!0):(this.options.value=a.fn.editableutils.tryParseJson(this.options.value,!0),"string"==typeof this.options.value?this.value=this.input.str2value(this.options.value):this.value=this.options.value),this.$element.addClass("editable"),"textarea"===this.input.type&&this.$element.addClass("editable-pre-wrapped"),"manual"!==this.options.toggle?(this.$element.addClass("editable-click"),this.$element.on(this.options.toggle+".editable",a.proxy(function(a){if(this.options.disabled||a.preventDefault(),"mouseenter"===this.options.toggle)this.show();else{var b="click"!==this.options.toggle;this.toggle(b)}},this))):this.$element.attr("tabindex",-1),"function"==typeof this.options.display&&(this.options.autotext="always"),this.options.autotext){case"always":b=!0;break;case"auto":b=!a.trim(this.$element.text()).length&&null!==this.value&&void 0!==this.value&&!c;break;default:b=!1}a.when(b?this.render():!0).then(a.proxy(function(){this.options.disabled?this.disable():this.enable(),this.$element.triggerHandler("init",this)},this))}},initLive:function(){var b=this.options.selector;this.options.selector=!1,this.options.autotext="never",this.$element.on(this.options.toggle+".editable",b,a.proxy(function(b){var c=a(b.target);c.data("editable")||(c.hasClass(this.options.emptyclass)&&c.empty(),c.editable(this.options).trigger(b))},this))},render:function(a){return this.options.display!==!1?this.input.value2htmlFinal?this.input.value2html(this.value,this.$element[0],this.options.display,a):"function"==typeof this.options.display?this.options.display.call(this.$element[0],this.value,a):this.input.value2html(this.value,this.$element[0]):void 0},enable:function(){this.options.disabled=!1,this.$element.removeClass("editable-disabled"),this.handleEmpty(this.isEmpty),"manual"!==this.options.toggle&&"-1"===this.$element.attr("tabindex")&&this.$element.removeAttr("tabindex")},disable:function(){this.options.disabled=!0,this.hide(),this.$element.addClass("editable-disabled"),this.handleEmpty(this.isEmpty),this.$element.attr("tabindex",-1)},toggleDisabled:function(){this.options.disabled?this.enable():this.disable()},option:function(b,c){return b&&"object"==typeof b?void a.each(b,a.proxy(function(b,c){this.option(a.trim(b),c)},this)):(this.options[b]=c,"disabled"===b?c?this.disable():this.enable():("value"===b&&this.setValue(c),this.container&&this.container.option(b,c),void(this.input.option&&this.input.option(b,c))))},handleEmpty:function(b){this.options.display!==!1&&(void 0!==b?this.isEmpty=b:"function"==typeof this.input.isEmpty?this.isEmpty=this.input.isEmpty(this.$element):this.isEmpty=""===a.trim(this.$element.html()),this.options.disabled?this.isEmpty&&(this.$element.empty(),this.options.emptyclass&&this.$element.removeClass(this.options.emptyclass)):this.isEmpty?(this.$element.html(this.options.emptytext),this.options.emptyclass&&this.$element.addClass(this.options.emptyclass)):this.options.emptyclass&&this.$element.removeClass(this.options.emptyclass))},show:function(b){if(!this.options.disabled){if(this.container){if(this.container.tip().is(":visible"))return}else{var c=a.extend({},this.options,{value:this.value,input:this.input});this.$element.editableContainer(c),this.$element.on("save.internal",a.proxy(this.save,this)),this.container=this.$element.data("editableContainer")}this.container.show(b)}},hide:function(){this.container&&this.container.hide()},toggle:function(a){this.container&&this.container.tip().is(":visible")?this.hide():this.show(a)},save:function(a,b){if(this.options.unsavedclass){var c=!1;c=c||"function"==typeof this.options.url,c=c||this.options.display===!1,c=c||void 0!==b.response,c=c||this.options.savenochange&&this.input.value2str(this.value)!==this.input.value2str(b.newValue),c?this.$element.removeClass(this.options.unsavedclass):this.$element.addClass(this.options.unsavedclass)}if(this.options.highlight){var d=this.$element,e=d.css("background-color");d.css("background-color",this.options.highlight),setTimeout(function(){"transparent"===e&&(e=""),d.css("background-color",e),d.addClass("editable-bg-transition"),setTimeout(function(){d.removeClass("editable-bg-transition")},1700)},10)}this.setValue(b.newValue,!1,b.response)},validate:function(){return"function"==typeof this.options.validate?this.options.validate.call(this,this.value):void 0},setValue:function(b,c,d){c?this.value=this.input.str2value(b):this.value=b,this.container&&this.container.option("value",this.value),a.when(this.render(d)).then(a.proxy(function(){this.handleEmpty()},this))},activate:function(){this.container&&this.container.activate()},destroy:function(){this.disable(),this.container&&this.container.destroy(),this.input.destroy(),"manual"!==this.options.toggle&&(this.$element.removeClass("editable-click"),this.$element.off(this.options.toggle+".editable")),this.$element.off("save.internal"),this.$element.removeClass("editable editable-open editable-disabled"),this.$element.removeData("editable")}},a.fn.editable=function(c){var d={},e=arguments,f="editable";switch(c){case"validate":return this.each(function(){var b,c=a(this),e=c.data(f);e&&(b=e.validate())&&(d[e.options.name]=b)}),d;case"getValue":return 2===arguments.length&&arguments[1]===!0?d=this.eq(0).data(f).value:this.each(function(){var b=a(this),c=b.data(f);c&&void 0!==c.value&&null!==c.value&&(d[c.options.name]=c.input.value2submit(c.value))}),d;case"submit":var g=arguments[1]||{},h=this,i=this.editable("validate");if(a.isEmptyObject(i)){var j={};if(1===h.length){var k=h.data("editable"),l={name:k.options.name||"",value:k.input.value2submit(k.value),pk:"function"==typeof k.options.pk?k.options.pk.call(k.options.scope):k.options.pk};"function"==typeof k.options.params?l=k.options.params.call(k.options.scope,l):(k.options.params=a.fn.editableutils.tryParseJson(k.options.params,!0),a.extend(l,k.options.params)),j={url:k.options.url,data:l,type:"POST"},g.success=g.success||k.options.success,g.error=g.error||k.options.error}else{var m=this.editable("getValue");j={url:g.url,data:m,type:"POST"}}j.success="function"==typeof g.success?function(a){g.success.call(h,a,g)}:a.noop,j.error="function"==typeof g.error?function(){g.error.apply(h,arguments)}:a.noop,g.ajaxOptions&&a.extend(j,g.ajaxOptions),g.data&&a.extend(j.data,g.data),a.ajax(j)}else"function"==typeof g.error&&g.error.call(h,i);return this}return this.each(function(){var d=a(this),g=d.data(f),h="object"==typeof c&&c;return h&&h.selector?void(g=new b(this,h)):(g||d.data(f,g=new b(this,h)),void("string"==typeof c&&g[c].apply(g,Array.prototype.slice.call(e,1))))})},a.fn.editable.defaults={type:"text",disabled:!1,toggle:"click",emptytext:"Empty",autotext:"auto",value:null,display:null,emptyclass:"editable-empty",unsavedclass:"editable-unsaved",selector:null,highlight:"#FFFF80"}}(window.jQuery),function(a){"use strict";a.fn.editabletypes={};var b=function(){};b.prototype={init:function(b,c,d){this.type=b,this.options=a.extend({},d,c)},prerender:function(){this.$tpl=a(this.options.tpl),this.$input=this.$tpl,this.$clear=null,this.error=null},render:function(){},value2html:function(b,c){a(c)[this.options.escape?"text":"html"](a.trim(b))},html2value:function(b){return a("<div>").html(b).text()},value2str:function(a){return a},str2value:function(a){return a},value2submit:function(a){return a},value2input:function(a){this.$input.val(a)},input2value:function(){return this.$input.val()},activate:function(){this.$input.is(":visible")&&this.$input.focus()},clear:function(){this.$input.val(null)},escape:function(b){return a("<div>").text(b).html()},autosubmit:function(){},destroy:function(){},setClass:function(){this.options.inputclass&&this.$input.addClass(this.options.inputclass)},setAttr:function(a){void 0!==this.options[a]&&null!==this.options[a]&&this.$input.attr(a,this.options[a])},option:function(a,b){this.options[a]=b}},b.defaults={tpl:"",inputclass:null,escape:!0,scope:null,showbuttons:!0},a.extend(a.fn.editabletypes,{abstractinput:b})}(window.jQuery),function(a){"use strict";var b=function(a){};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){var b=a.Deferred();return this.error=null,this.onSourceReady(function(){this.renderList(),b.resolve()},function(){this.error=this.options.sourceError,b.resolve()}),b.promise()},html2value:function(a){return null},value2html:function(b,c,d,e){var f=a.Deferred(),g=function(){"function"==typeof d?d.call(c,b,this.sourceData,e):this.value2htmlFinal(b,c),f.resolve()};return null===b?g.call(this):this.onSourceReady(g,function(){f.resolve()}),f.promise()},onSourceReady:function(b,c){var d;if(a.isFunction(this.options.source)?(d=this.options.source.call(this.options.scope),this.sourceData=null):d=this.options.source,this.options.sourceCache&&a.isArray(this.sourceData))return void b.call(this);try{d=a.fn.editableutils.tryParseJson(d,!1)}catch(e){return void c.call(this)}if("string"==typeof d){if(this.options.sourceCache){var f,g=d;if(a(document).data(g)||a(document).data(g,{}),f=a(document).data(g),f.loading===!1&&f.sourceData)return this.sourceData=f.sourceData,this.doPrepend(),void b.call(this);if(f.loading===!0)return f.callbacks.push(a.proxy(function(){this.sourceData=f.sourceData,this.doPrepend(),b.call(this)},this)),void f.err_callbacks.push(a.proxy(c,this));f.loading=!0,f.callbacks=[],f.err_callbacks=[]}var h=a.extend({url:d,type:"get",cache:!1,dataType:"json",success:a.proxy(function(d){f&&(f.loading=!1),this.sourceData=this.makeArray(d),a.isArray(this.sourceData)?(f&&(f.sourceData=this.sourceData,a.each(f.callbacks,function(){this.call()})),this.doPrepend(),b.call(this)):(c.call(this),f&&a.each(f.err_callbacks,function(){this.call()}))},this),error:a.proxy(function(){c.call(this),f&&(f.loading=!1,a.each(f.err_callbacks,function(){this.call()}))},this)},this.options.sourceOptions);a.ajax(h)}else this.sourceData=this.makeArray(d),a.isArray(this.sourceData)?(this.doPrepend(),b.call(this)):c.call(this)},doPrepend:function(){null!==this.options.prepend&&void 0!==this.options.prepend&&(a.isArray(this.prependData)||(a.isFunction(this.options.prepend)&&(this.options.prepend=this.options.prepend.call(this.options.scope)),this.options.prepend=a.fn.editableutils.tryParseJson(this.options.prepend,!0),"string"==typeof this.options.prepend&&(this.options.prepend={"":this.options.prepend}),this.prependData=this.makeArray(this.options.prepend)),a.isArray(this.prependData)&&a.isArray(this.sourceData)&&(this.sourceData=this.prependData.concat(this.sourceData)))},renderList:function(){},value2htmlFinal:function(a,b){},makeArray:function(b){var c,d,e,f,g=[];if(!b||"string"==typeof b)return null;if(a.isArray(b)){f=function(a,b){return d={value:a,text:b},c++>=2?!1:void 0};for(var h=0;h<b.length;h++)e=b[h],"object"==typeof e?(c=0,a.each(e,f),1===c?g.push(d):c>1&&(e.children&&(e.children=this.makeArray(e.children)),g.push(e))):g.push({value:e,text:e})}else a.each(b,function(a,b){g.push({value:a,text:b})});return g},option:function(a,b){this.options[a]=b,"source"===a&&(this.sourceData=null),"prepend"===a&&(this.prependData=null)}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{source:null,prepend:!1,sourceError:"Error when loading list",sourceCache:!0,sourceOptions:null}),a.fn.editabletypes.list=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("text",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){this.renderClear(),this.setClass(),this.setAttr("placeholder")},activate:function(){this.$input.is(":visible")&&(this.$input.focus(),this.$input.is("input,textarea")&&!this.$input.is('[type="checkbox"],[type="range"]')&&a.fn.editableutils.setCursorPosition(this.$input.get(0),this.$input.val().length),this.toggleClear&&this.toggleClear())},renderClear:function(){this.options.clear&&(this.$clear=a('<span class="editable-clear-x"></span>'),this.$input.after(this.$clear).css("padding-right",24).keyup(a.proxy(function(b){if(!~a.inArray(b.keyCode,[40,38,9,13,27])){clearTimeout(this.t);var c=this;this.t=setTimeout(function(){c.toggleClear(b)},100)}},this)).parent().css("position","relative"),this.$clear.click(a.proxy(this.clear,this)))},postrender:function(){},toggleClear:function(a){if(this.$clear){var b=this.$input.val().length,c=this.$clear.is(":visible");b&&!c&&this.$clear.show(),!b&&c&&this.$clear.hide()}},clear:function(){this.$clear.hide(),this.$input.val("").focus()}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<input type="text">',placeholder:null,clear:!0}),a.fn.editabletypes.text=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("textarea",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){this.setClass(),this.setAttr("placeholder"),this.setAttr("rows"),this.$input.keydown(function(b){b.ctrlKey&&13===b.which&&a(this).closest("form").submit()})},activate:function(){a.fn.editabletypes.text.prototype.activate.call(this)}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:"<textarea></textarea>",inputclass:"input-large",placeholder:null,rows:7}),a.fn.editabletypes.textarea=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("select",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.list),a.extend(b.prototype,{renderList:function(){this.$input.empty();var b=this.options.escape,c=function(d,e){var f;if(a.isArray(e))for(var g=0;g<e.length;g++)if(f={},e[g].children)f.label=e[g].text,d.append(c(a("<optgroup>",f),e[g].children));else{f.value=e[g].value,e[g].disabled&&(f.disabled=!0);var h=a("<option>",f);h[b?"text":"html"](e[g].text),d.append(h)}return d};c(this.$input,this.sourceData),this.setClass(),this.$input.on("keydown.editable",function(b){13===b.which&&a(this).closest("form").submit()})},value2htmlFinal:function(b,c){var d="",e=a.fn.editableutils.itemsByValue(b,this.sourceData);e.length&&(d=e[0].text),a.fn.editabletypes.abstractinput.prototype.value2html.call(this,d,c)},autosubmit:function(){this.$input.off("keydown.editable").on("change.editable",function(){a(this).closest("form").submit()})}}),b.defaults=a.extend({},a.fn.editabletypes.list.defaults,{tpl:"<select></select>"}),a.fn.editabletypes.select=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("checklist",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.list),a.extend(b.prototype,{renderList:function(){var b;if(this.$tpl.empty(),a.isArray(this.sourceData)){for(var c=0;c<this.sourceData.length;c++){b=a("<label>").append(a("<input>",{type:"checkbox",value:this.sourceData[c].value}));var d=a("<span>");d[this.options.escape?"text":"html"](" "+this.sourceData[c].text),b.append(d),a("<div>").append(b).appendTo(this.$tpl)}this.$input=this.$tpl.find('input[type="checkbox"]'),this.setClass()}},value2str:function(b){return a.isArray(b)?b.sort().join(a.trim(this.options.separator)):""},str2value:function(b){var c,d=null;return"string"==typeof b&&b.length?(c=new RegExp("\\s*"+a.trim(this.options.separator)+"\\s*"),d=b.split(c)):d=a.isArray(b)?b:[b],d},value2input:function(b){this.$input.prop("checked",!1),a.isArray(b)&&b.length&&this.$input.each(function(c,d){var e=a(d);a.each(b,function(a,b){e.val()==b&&e.prop("checked",!0)})})},input2value:function(){var b=[];return this.$input.filter(":checked").each(function(c,d){b.push(a(d).val())}),b},value2htmlFinal:function(b,c){var d=[],e=a.fn.editableutils.itemsByValue(b,this.sourceData),f=this.options.escape;e.length?(a.each(e,function(b,c){var e=f?a.fn.editableutils.escape(c.text):c.text;d.push(e)}),a(c).html(d.join("<br>"))):a(c).empty()},activate:function(){this.$input.first().focus()},autosubmit:function(){this.$input.on("keydown",function(b){13===b.which&&a(this).closest("form").submit()})}}),b.defaults=a.extend({},a.fn.editabletypes.list.defaults,{tpl:'<div class="editable-checklist"></div>',inputclass:null,separator:","}),a.fn.editabletypes.checklist=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("password",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.text),a.extend(b.prototype,{value2html:function(b,c){b?a(c).text("[hidden]"):a(c).empty()},html2value:function(a){return null}}),b.defaults=a.extend({},a.fn.editabletypes.text.defaults,{tpl:'<input type="password">'}),a.fn.editabletypes.password=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("email",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.text),b.defaults=a.extend({},a.fn.editabletypes.text.defaults,{tpl:'<input type="email">'}),a.fn.editabletypes.email=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("url",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.text),b.defaults=a.extend({},a.fn.editabletypes.text.defaults,{tpl:'<input type="url">'}),a.fn.editabletypes.url=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("tel",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.text),b.defaults=a.extend({},a.fn.editabletypes.text.defaults,{tpl:'<input type="tel">'}),a.fn.editabletypes.tel=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("number",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.text),a.extend(b.prototype,{render:function(){b.superclass.render.call(this),this.setAttr("min"),this.setAttr("max"),this.setAttr("step");
+},postrender:function(){this.$clear&&this.$clear.css({right:24})}}),b.defaults=a.extend({},a.fn.editabletypes.text.defaults,{tpl:'<input type="number">',inputclass:"input-mini",min:null,max:null,step:null}),a.fn.editabletypes.number=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("range",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.number),a.extend(b.prototype,{render:function(){this.$input=this.$tpl.filter("input"),this.setClass(),this.setAttr("min"),this.setAttr("max"),this.setAttr("step"),this.$input.on("input",function(){a(this).siblings("output").text(a(this).val())})},activate:function(){this.$input.focus()}}),b.defaults=a.extend({},a.fn.editabletypes.number.defaults,{tpl:'<input type="range"><output style="width: 30px; display: inline-block"></output>',inputclass:"input-medium"}),a.fn.editabletypes.range=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("time",a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){this.setClass()}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<input type="time">'}),a.fn.editabletypes.time=b}(window.jQuery),function(a){"use strict";var b=function(c){if(this.init("select2",c,b.defaults),c.select2=c.select2||{},this.sourceData=null,c.placeholder&&(c.select2.placeholder=c.placeholder),!c.select2.tags&&c.source){var d=c.source;a.isFunction(c.source)&&(d=c.source.call(c.scope)),"string"==typeof d?(c.select2.ajax=c.select2.ajax||{},c.select2.ajax.data||(c.select2.ajax.data=function(a){return{query:a}}),c.select2.ajax.results||(c.select2.ajax.results=function(a){return{results:a}}),c.select2.ajax.url=d):(this.sourceData=this.convertSource(d),c.select2.data=this.sourceData)}if(this.options.select2=a.extend({},b.defaults.select2,c.select2),this.isMultiple=this.options.select2.tags||this.options.select2.multiple,this.isRemote="ajax"in this.options.select2,this.idFunc=this.options.select2.id,"function"!=typeof this.idFunc){var e=this.idFunc||"id";this.idFunc=function(a){return a[e]}}this.formatSelection=this.options.select2.formatSelection,"function"!=typeof this.formatSelection&&(this.formatSelection=function(a){return a.text})};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){this.setClass(),this.isRemote&&this.$input.on("select2-loaded",a.proxy(function(a){this.sourceData=a.items.results},this)),this.isMultiple&&this.$input.on("change",function(){a(this).closest("form").parent().triggerHandler("resize")})},value2html:function(c,d){var e,f="",g=this;this.options.select2.tags?e=c:this.sourceData&&(e=a.fn.editableutils.itemsByValue(c,this.sourceData,this.idFunc)),a.isArray(e)?(f=[],a.each(e,function(a,b){f.push(b&&"object"==typeof b?g.formatSelection(b):b)})):e&&(f=g.formatSelection(e)),f=a.isArray(f)?f.join(this.options.viewseparator):f,b.superclass.value2html.call(this,f,d)},html2value:function(a){return this.options.select2.tags?this.str2value(a,this.options.viewseparator):null},value2input:function(b){if(a.isArray(b)&&(b=b.join(this.getSeparator())),this.$input.data("select2")?this.$input.val(b).trigger("change",!0):(this.$input.val(b),this.$input.select2(this.options.select2)),this.isRemote&&!this.isMultiple&&!this.options.select2.initSelection){var c=this.options.select2.id,d=this.options.select2.formatSelection;if(!c&&!d){var e=a(this.options.scope);if(!e.data("editable").isEmpty){var f={id:b,text:e.text()};this.$input.select2("data",f)}}}},input2value:function(){return this.$input.select2("val")},str2value:function(b,c){if("string"!=typeof b||!this.isMultiple)return b;c=c||this.getSeparator();var d,e,f;if(null===b||b.length<1)return null;for(d=b.split(c),e=0,f=d.length;f>e;e+=1)d[e]=a.trim(d[e]);return d},autosubmit:function(){this.$input.on("change",function(b,c){c||a(this).closest("form").submit()})},getSeparator:function(){return this.options.select2.separator||a.fn.select2.defaults.separator},convertSource:function(b){if(a.isArray(b)&&b.length&&void 0!==b[0].value)for(var c=0;c<b.length;c++)void 0!==b[c].value&&(b[c].id=b[c].value,delete b[c].value);return b},destroy:function(){this.$input.data("select2")&&this.$input.select2("destroy")}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<input type="hidden">',select2:null,placeholder:null,source:null,viewseparator:", "}),a.fn.editabletypes.select2=b}(window.jQuery),function(a){var b=function(b,c){return this.$element=a(b),this.$element.is("input")?(this.options=a.extend({},a.fn.combodate.defaults,c,this.$element.data()),void this.init()):void a.error("Combodate should be applied to INPUT element")};b.prototype={constructor:b,init:function(){this.map={day:["D","date"],month:["M","month"],year:["Y","year"],hour:["[Hh]","hours"],minute:["m","minutes"],second:["s","seconds"],ampm:["[Aa]",""]},this.$widget=a('<span class="combodate"></span>').html(this.getTemplate()),this.initCombos(),this.$widget.on("change","select",a.proxy(function(b){this.$element.val(this.getValue()).change(),this.options.smartDays&&(a(b.target).is(".month")||a(b.target).is(".year"))&&this.fillCombo("day")},this)),this.$widget.find("select").css("width","auto"),this.$element.hide().after(this.$widget),this.setValue(this.$element.val()||this.options.value)},getTemplate:function(){var b=this.options.template;return a.each(this.map,function(a,c){c=c[0];var d=new RegExp(c+"+"),e=c.length>1?c.substring(1,2):c;b=b.replace(d,"{"+e+"}")}),b=b.replace(/ /g,"&nbsp;"),a.each(this.map,function(a,c){c=c[0];var d=c.length>1?c.substring(1,2):c;b=b.replace("{"+d+"}",'<select class="'+a+'"></select>')}),b},initCombos:function(){for(var a in this.map){var b=this.$widget.find("."+a);this["$"+a]=b.length?b:null,this.fillCombo(a)}},fillCombo:function(a){var b=this["$"+a];if(b){var c="fill"+a.charAt(0).toUpperCase()+a.slice(1),d=this[c](),e=b.val();b.empty();for(var f=0;f<d.length;f++)b.append('<option value="'+d[f][0]+'">'+d[f][1]+"</option>");b.val(e)}},fillCommon:function(a){var b,c=[];if("name"===this.options.firstItem){b=moment.relativeTime||moment.langData()._relativeTime;var d="function"==typeof b[a]?b[a](1,!0,a,!1):b[a];d=d.split(" ").reverse()[0],c.push(["",d])}else"empty"===this.options.firstItem&&c.push(["",""]);return c},fillDay:function(){var a,b,c=this.fillCommon("d"),d=-1!==this.options.template.indexOf("DD"),e=31;if(this.options.smartDays&&this.$month&&this.$year){var f=parseInt(this.$month.val(),10),g=parseInt(this.$year.val(),10);isNaN(f)||isNaN(g)||(e=moment([g,f]).daysInMonth())}for(b=1;e>=b;b++)a=d?this.leadZero(b):b,c.push([b,a]);return c},fillMonth:function(){var a,b,c=this.fillCommon("M"),d=-1!==this.options.template.indexOf("MMMM"),e=-1!==this.options.template.indexOf("MMM"),f=-1!==this.options.template.indexOf("MM");for(b=0;11>=b;b++)a=d?moment().date(1).month(b).format("MMMM"):e?moment().date(1).month(b).format("MMM"):f?this.leadZero(b+1):b+1,c.push([b,a]);return c},fillYear:function(){var a,b,c=[],d=-1!==this.options.template.indexOf("YYYY");for(b=this.options.maxYear;b>=this.options.minYear;b--)a=d?b:(b+"").substring(2),c[this.options.yearDescending?"push":"unshift"]([b,a]);return c=this.fillCommon("y").concat(c)},fillHour:function(){var a,b,c=this.fillCommon("h"),d=-1!==this.options.template.indexOf("h"),e=(-1!==this.options.template.indexOf("H"),-1!==this.options.template.toLowerCase().indexOf("hh")),f=d?1:0,g=d?12:23;for(b=f;g>=b;b++)a=e?this.leadZero(b):b,c.push([b,a]);return c},fillMinute:function(){var a,b,c=this.fillCommon("m"),d=-1!==this.options.template.indexOf("mm");for(b=0;59>=b;b+=this.options.minuteStep)a=d?this.leadZero(b):b,c.push([b,a]);return c},fillSecond:function(){var a,b,c=this.fillCommon("s"),d=-1!==this.options.template.indexOf("ss");for(b=0;59>=b;b+=this.options.secondStep)a=d?this.leadZero(b):b,c.push([b,a]);return c},fillAmpm:function(){var a=-1!==this.options.template.indexOf("a"),b=(-1!==this.options.template.indexOf("A"),[["am",a?"am":"AM"],["pm",a?"pm":"PM"]]);return b},getValue:function(b){var c,d={},e=this,f=!1;return a.each(this.map,function(a,b){if("ampm"!==a){var c="day"===a?1:0;return d[a]=e["$"+a]?parseInt(e["$"+a].val(),10):c,isNaN(d[a])?(f=!0,!1):void 0}}),f?"":(this.$ampm&&(12===d.hour?d.hour="am"===this.$ampm.val()?0:12:d.hour="am"===this.$ampm.val()?d.hour:d.hour+12),c=moment([d.year,d.month,d.day,d.hour,d.minute,d.second]),this.highlight(c),b=void 0===b?this.options.format:b,null===b?c.isValid()?c:null:c.isValid()?c.format(b):"")},setValue:function(b){function c(b,c){var d={};return b.children("option").each(function(b,e){var f,g=a(e).attr("value");""!==g&&(f=Math.abs(g-c),("undefined"==typeof d.distance||f<d.distance)&&(d={value:g,distance:f}))}),d.value}if(b){var d="string"==typeof b?moment(b,this.options.format):moment(b),e=this,f={};d.isValid()&&(a.each(this.map,function(a,b){"ampm"!==a&&(f[a]=d[b[1]]())}),this.$ampm&&(f.hour>=12?(f.ampm="pm",f.hour>12&&(f.hour-=12)):(f.ampm="am",0===f.hour&&(f.hour=12))),a.each(f,function(a,b){e["$"+a]&&("minute"===a&&e.options.minuteStep>1&&e.options.roundTime&&(b=c(e["$"+a],b)),"second"===a&&e.options.secondStep>1&&e.options.roundTime&&(b=c(e["$"+a],b)),e["$"+a].val(b))}),this.options.smartDays&&this.fillCombo("day"),this.$element.val(d.format(this.options.format)).change())}},highlight:function(a){a.isValid()?this.options.errorClass?this.$widget.removeClass(this.options.errorClass):this.$widget.find("select").css("border-color",this.borderColor):this.options.errorClass?this.$widget.addClass(this.options.errorClass):(this.borderColor||(this.borderColor=this.$widget.find("select").css("border-color")),this.$widget.find("select").css("border-color","red"))},leadZero:function(a){return 9>=a?"0"+a:a},destroy:function(){this.$widget.remove(),this.$element.removeData("combodate").show()}},a.fn.combodate=function(c){var d,e=Array.apply(null,arguments);return e.shift(),"getValue"===c&&this.length&&(d=this.eq(0).data("combodate"))?d.getValue.apply(d,e):this.each(function(){var d=a(this),f=d.data("combodate"),g="object"==typeof c&&c;f||d.data("combodate",f=new b(this,g)),"string"==typeof c&&"function"==typeof f[c]&&f[c].apply(f,e)})},a.fn.combodate.defaults={format:"DD-MM-YYYY HH:mm",template:"D / MMM / YYYY   H : mm",value:null,minYear:1970,maxYear:2015,yearDescending:!0,minuteStep:5,secondStep:1,firstItem:"empty",errorClass:null,roundTime:!0,smartDays:!1}}(window.jQuery),function(a){"use strict";var b=function(c){this.init("combodate",c,b.defaults),this.options.viewformat||(this.options.viewformat=this.options.format),c.combodate=a.fn.editableutils.tryParseJson(c.combodate,!0),this.options.combodate=a.extend({},b.defaults.combodate,c.combodate,{format:this.options.format,template:this.options.template})};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{render:function(){this.$input.combodate(this.options.combodate),"bs3"===a.fn.editableform.engine&&this.$input.siblings().find("select").addClass("form-control"),this.options.inputclass&&this.$input.siblings().find("select").addClass(this.options.inputclass)},value2html:function(a,c){var d=a?a.format(this.options.viewformat):"";b.superclass.value2html.call(this,d,c)},html2value:function(a){return a?moment(a,this.options.viewformat):null},value2str:function(a){return a?a.format(this.options.format):""},str2value:function(a){return a?moment(a,this.options.format):null},value2submit:function(a){return this.value2str(a)},value2input:function(a){this.$input.combodate("setValue",a)},input2value:function(){return this.$input.combodate("getValue",null)},activate:function(){this.$input.siblings(".combodate").find("select").eq(0).focus()},autosubmit:function(){}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<input type="text">',inputclass:null,format:"YYYY-MM-DD",viewformat:null,template:"D / MMM / YYYY",combodate:null}),a.fn.editabletypes.combodate=b}(window.jQuery),function(a){"use strict";var b=a.fn.editableform.Constructor.prototype.initInput;a.extend(a.fn.editableform.Constructor.prototype,{initTemplate:function(){this.$form=a(a.fn.editableform.template),this.$form.find(".control-group").addClass("form-group"),this.$form.find(".editable-error-block").addClass("help-block")},initInput:function(){b.apply(this);var c=null===this.input.options.inputclass||this.input.options.inputclass===!1,d="input-sm",e="text,select,textarea,password,email,url,tel,number,range,time,typeaheadjs".split(",");~a.inArray(this.input.type,e)&&(this.input.$input.addClass("form-control"),c&&(this.input.options.inputclass=d,this.input.$input.addClass(d)));for(var f=this.$form.find(".editable-buttons"),g=c?[d]:this.input.options.inputclass.split(" "),h=0;h<g.length;h++)"input-lg"===g[h].toLowerCase()&&f.find("button").removeClass("btn-sm").addClass("btn-lg")}}),a.fn.editableform.buttons='<button type="submit" class="btn btn-primary btn-sm editable-submit"><i class="glyphicon glyphicon-ok"></i></button><button type="button" class="btn btn-default btn-sm editable-cancel"><i class="glyphicon glyphicon-remove"></i></button>',a.fn.editableform.errorGroupClass="has-error",a.fn.editableform.errorBlockClass=null,a.fn.editableform.engine="bs3"}(window.jQuery),function(a){"use strict";a.extend(a.fn.editableContainer.Popup.prototype,{containerName:"popover",containerDataName:"bs.popover",innerCss:".popover-content",defaults:a.fn.popover.Constructor.DEFAULTS,initContainer:function(){a.extend(this.containerOptions,{trigger:"manual",selector:!1,content:" ",template:this.defaults.template});var b;this.$element.data("template")&&(b=this.$element.data("template"),this.$element.removeData("template")),this.call(this.containerOptions),b&&this.$element.data("template",b)},innerShow:function(){this.call("show")},innerHide:function(){this.call("hide")},innerDestroy:function(){this.call("destroy")},setContainerOption:function(a,b){this.container().options[a]=b},setPosition:function(){(function(){var a=this.tip(),b="function"==typeof this.options.placement?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,c=/\s?auto?\s?/i,d=c.test(b);d&&(b=b.replace(c,"")||"top");var e=this.getPosition(),f=a[0].offsetWidth,g=a[0].offsetHeight;if(d){var h=this.$element.parent(),i=b,j=document.documentElement.scrollTop||document.body.scrollTop,k="body"==this.options.container?window.innerWidth:h.outerWidth(),l="body"==this.options.container?window.innerHeight:h.outerHeight(),m="body"==this.options.container?0:h.offset().left;b="bottom"==b&&e.top+e.height+g-j>l?"top":"top"==b&&e.top-j-g<0?"bottom":"right"==b&&e.right+f>k?"left":"left"==b&&e.left-f<m?"right":b,a.removeClass(i).addClass(b)}var n=this.getCalculatedOffset(b,e,f,g);this.applyPlacement(n,b)}).call(this.container())}})}(window.jQuery),function(a){function b(){return new Date(Date.UTC.apply(Date,arguments))}function c(b,c){var d,e=a(b).data(),f={},g=new RegExp("^"+c.toLowerCase()+"([A-Z])"),c=new RegExp("^"+c.toLowerCase());for(var h in e)c.test(h)&&(d=h.replace(g,function(a,b){return b.toLowerCase()}),f[d]=e[h]);return f}function d(b){var c={};if(k[b]||(b=b.split("-")[0],k[b])){var d=k[b];return a.each(j,function(a,b){b in d&&(c[b]=d[b])}),c}}var e=function(b,c){this._process_options(c),this.element=a(b),this.isInline=!1,this.isInput=this.element.is("input"),this.component=this.element.is(".date")?this.element.find(".add-on, .btn"):!1,this.hasInput=this.component&&this.element.find("input").length,this.component&&0===this.component.length&&(this.component=!1),this.picker=a(l.template),this._buildEvents(),this._attachEvents(),this.isInline?this.picker.addClass("datepicker-inline").appendTo(this.element):this.picker.addClass("datepicker-dropdown dropdown-menu"),this.o.rtl&&(this.picker.addClass("datepicker-rtl"),this.picker.find(".prev i, .next i").toggleClass("icon-arrow-left icon-arrow-right")),this.viewMode=this.o.startView,this.o.calendarWeeks&&this.picker.find("tfoot th.today").attr("colspan",function(a,b){return parseInt(b)+1}),this._allow_update=!1,this.setStartDate(this.o.startDate),this.setEndDate(this.o.endDate),this.setDaysOfWeekDisabled(this.o.daysOfWeekDisabled),this.fillDow(),this.fillMonths(),this._allow_update=!0,this.update(),this.showMode(),this.isInline&&this.show()};e.prototype={constructor:e,_process_options:function(b){this._o=a.extend({},this._o,b);var c=this.o=a.extend({},this._o),d=c.language;switch(k[d]||(d=d.split("-")[0],k[d]||(d=i.language)),c.language=d,c.startView){case 2:case"decade":c.startView=2;break;case 1:case"year":c.startView=1;break;default:c.startView=0}switch(c.minViewMode){case 1:case"months":c.minViewMode=1;break;case 2:case"years":c.minViewMode=2;break;default:c.minViewMode=0}c.startView=Math.max(c.startView,c.minViewMode),c.weekStart%=7,c.weekEnd=(c.weekStart+6)%7;var e=l.parseFormat(c.format);c.startDate!==-(1/0)&&(c.startDate=l.parseDate(c.startDate,e,c.language)),c.endDate!==1/0&&(c.endDate=l.parseDate(c.endDate,e,c.language)),c.daysOfWeekDisabled=c.daysOfWeekDisabled||[],a.isArray(c.daysOfWeekDisabled)||(c.daysOfWeekDisabled=c.daysOfWeekDisabled.split(/[,\s]*/)),c.daysOfWeekDisabled=a.map(c.daysOfWeekDisabled,function(a){return parseInt(a,10)})},_events:[],_secondaryEvents:[],_applyEvents:function(a){for(var b,c,d=0;d<a.length;d++)b=a[d][0],c=a[d][1],b.on(c)},_unapplyEvents:function(a){for(var b,c,d=0;d<a.length;d++)b=a[d][0],c=a[d][1],b.off(c)},_buildEvents:function(){this.isInput?this._events=[[this.element,{focus:a.proxy(this.show,this),keyup:a.proxy(this.update,this),keydown:a.proxy(this.keydown,this)}]]:this.component&&this.hasInput?this._events=[[this.element.find("input"),{focus:a.proxy(this.show,this),keyup:a.proxy(this.update,this),keydown:a.proxy(this.keydown,this)}],[this.component,{click:a.proxy(this.show,this)}]]:this.element.is("div")?this.isInline=!0:this._events=[[this.element,{click:a.proxy(this.show,this)}]],this._secondaryEvents=[[this.picker,{click:a.proxy(this.click,this)}],[a(window),{resize:a.proxy(this.place,this)}],[a(document),{mousedown:a.proxy(function(a){this.element.is(a.target)||this.element.find(a.target).size()||this.picker.is(a.target)||this.picker.find(a.target).size()||this.hide()},this)}]]},_attachEvents:function(){this._detachEvents(),this._applyEvents(this._events)},_detachEvents:function(){this._unapplyEvents(this._events)},_attachSecondaryEvents:function(){this._detachSecondaryEvents(),this._applyEvents(this._secondaryEvents)},_detachSecondaryEvents:function(){this._unapplyEvents(this._secondaryEvents)},_trigger:function(b,c){var d=c||this.date,e=new Date(d.getTime()+6e4*d.getTimezoneOffset());this.element.trigger({type:b,date:e,format:a.proxy(function(a){var b=a||this.o.format;return l.formatDate(d,b,this.o.language)},this)})},show:function(a){this.isInline||this.picker.appendTo("body"),this.picker.show(),this.height=this.component?this.component.outerHeight():this.element.outerHeight(),this.place(),this._attachSecondaryEvents(),a&&a.preventDefault(),this._trigger("show")},hide:function(a){this.isInline||this.picker.is(":visible")&&(this.picker.hide().detach(),this._detachSecondaryEvents(),this.viewMode=this.o.startView,this.showMode(),this.o.forceParse&&(this.isInput&&this.element.val()||this.hasInput&&this.element.find("input").val())&&this.setValue(),this._trigger("hide"))},remove:function(){this.hide(),this._detachEvents(),this._detachSecondaryEvents(),this.picker.remove(),delete this.element.data().datepicker,this.isInput||delete this.element.data().date},getDate:function(){var a=this.getUTCDate();return new Date(a.getTime()+6e4*a.getTimezoneOffset())},getUTCDate:function(){return this.date},setDate:function(a){this.setUTCDate(new Date(a.getTime()-6e4*a.getTimezoneOffset()))},setUTCDate:function(a){this.date=a,this.setValue()},setValue:function(){var a=this.getFormattedDate();this.isInput?this.element.val(a):this.component&&this.element.find("input").val(a)},getFormattedDate:function(a){return void 0===a&&(a=this.o.format),l.formatDate(this.date,a,this.o.language)},setStartDate:function(a){this._process_options({startDate:a}),this.update(),this.updateNavArrows()},setEndDate:function(a){this._process_options({endDate:a}),this.update(),this.updateNavArrows()},setDaysOfWeekDisabled:function(a){this._process_options({daysOfWeekDisabled:a}),this.update(),this.updateNavArrows()},place:function(){if(!this.isInline){var b=parseInt(this.element.parents().filter(function(){return"auto"!=a(this).css("z-index")}).first().css("z-index"))+10,c=this.component?this.component.parent().offset():this.element.offset(),d=this.component?this.component.outerHeight(!0):this.element.outerHeight(!0);this.picker.css({top:c.top+d,left:c.left,zIndex:b})}},_allow_update:!0,update:function(){if(this._allow_update){var a,b=!1;arguments&&arguments.length&&("string"==typeof arguments[0]||arguments[0]instanceof Date)?(a=arguments[0],b=!0):(a=this.isInput?this.element.val():this.element.data("date")||this.element.find("input").val(),delete this.element.data().date),this.date=l.parseDate(a,this.o.format,this.o.language),b&&this.setValue(),this.date<this.o.startDate?this.viewDate=new Date(this.o.startDate):this.date>this.o.endDate?this.viewDate=new Date(this.o.endDate):this.viewDate=new Date(this.date),this.fill()}},fillDow:function(){var a=this.o.weekStart,b="<tr>";if(this.o.calendarWeeks){var c='<th class="cw">&nbsp;</th>';b+=c,this.picker.find(".datepicker-days thead tr:first-child").prepend(c)}for(;a<this.o.weekStart+7;)b+='<th class="dow">'+k[this.o.language].daysMin[a++%7]+"</th>";b+="</tr>",this.picker.find(".datepicker-days thead").append(b)},fillMonths:function(){for(var a="",b=0;12>b;)a+='<span class="month">'+k[this.o.language].monthsShort[b++]+"</span>";this.picker.find(".datepicker-months td").html(a)},setRange:function(b){b&&b.length?this.range=a.map(b,function(a){return a.valueOf()}):delete this.range,this.fill()},getClassNames:function(b){var c=[],d=this.viewDate.getUTCFullYear(),e=this.viewDate.getUTCMonth(),f=this.date.valueOf(),g=new Date;return b.getUTCFullYear()<d||b.getUTCFullYear()==d&&b.getUTCMonth()<e?c.push("old"):(b.getUTCFullYear()>d||b.getUTCFullYear()==d&&b.getUTCMonth()>e)&&c.push("new"),this.o.todayHighlight&&b.getUTCFullYear()==g.getFullYear()&&b.getUTCMonth()==g.getMonth()&&b.getUTCDate()==g.getDate()&&c.push("today"),f&&b.valueOf()==f&&c.push("active"),(b.valueOf()<this.o.startDate||b.valueOf()>this.o.endDate||-1!==a.inArray(b.getUTCDay(),this.o.daysOfWeekDisabled))&&c.push("disabled"),this.range&&(b>this.range[0]&&b<this.range[this.range.length-1]&&c.push("range"),-1!=a.inArray(b.valueOf(),this.range)&&c.push("selected")),c},fill:function(){var c,d=new Date(this.viewDate),e=d.getUTCFullYear(),f=d.getUTCMonth(),g=this.o.startDate!==-(1/0)?this.o.startDate.getUTCFullYear():-(1/0),h=this.o.startDate!==-(1/0)?this.o.startDate.getUTCMonth():-(1/0),i=this.o.endDate!==1/0?this.o.endDate.getUTCFullYear():1/0,j=this.o.endDate!==1/0?this.o.endDate.getUTCMonth():1/0;this.date&&this.date.valueOf();this.picker.find(".datepicker-days thead th.datepicker-switch").text(k[this.o.language].months[f]+" "+e),this.picker.find("tfoot th.today").text(k[this.o.language].today).toggle(this.o.todayBtn!==!1),this.picker.find("tfoot th.clear").text(k[this.o.language].clear).toggle(this.o.clearBtn!==!1),this.updateNavArrows(),this.fillMonths();var m=b(e,f-1,28,0,0,0,0),n=l.getDaysInMonth(m.getUTCFullYear(),m.getUTCMonth());m.setUTCDate(n),m.setUTCDate(n-(m.getUTCDay()-this.o.weekStart+7)%7);var o=new Date(m);o.setUTCDate(o.getUTCDate()+42),o=o.valueOf();for(var p,q=[];m.valueOf()<o;){if(m.getUTCDay()==this.o.weekStart&&(q.push("<tr>"),this.o.calendarWeeks)){var r=new Date(+m+(this.o.weekStart-m.getUTCDay()-7)%7*864e5),s=new Date(+r+(11-r.getUTCDay())%7*864e5),t=new Date(+(t=b(s.getUTCFullYear(),0,1))+(11-t.getUTCDay())%7*864e5),u=(s-t)/864e5/7+1;q.push('<td class="cw">'+u+"</td>")}p=this.getClassNames(m),p.push("day");var v=this.o.beforeShowDay(m);void 0===v?v={}:"boolean"==typeof v?v={enabled:v}:"string"==typeof v&&(v={classes:v}),v.enabled===!1&&p.push("disabled"),v.classes&&(p=p.concat(v.classes.split(/\s+/))),v.tooltip&&(c=v.tooltip),p=a.unique(p),q.push('<td class="'+p.join(" ")+'"'+(c?' title="'+c+'"':"")+">"+m.getUTCDate()+"</td>"),m.getUTCDay()==this.o.weekEnd&&q.push("</tr>"),m.setUTCDate(m.getUTCDate()+1)}this.picker.find(".datepicker-days tbody").empty().append(q.join(""));var w=this.date&&this.date.getUTCFullYear(),x=this.picker.find(".datepicker-months").find("th:eq(1)").text(e).end().find("span").removeClass("active");w&&w==e&&x.eq(this.date.getUTCMonth()).addClass("active"),(g>e||e>i)&&x.addClass("disabled"),e==g&&x.slice(0,h).addClass("disabled"),e==i&&x.slice(j+1).addClass("disabled"),q="",e=10*parseInt(e/10,10);var y=this.picker.find(".datepicker-years").find("th:eq(1)").text(e+"-"+(e+9)).end().find("td");e-=1;for(var z=-1;11>z;z++)q+='<span class="year'+(-1==z?" old":10==z?" new":"")+(w==e?" active":"")+(g>e||e>i?" disabled":"")+'">'+e+"</span>",e+=1;y.html(q)},updateNavArrows:function(){if(this._allow_update){var a=new Date(this.viewDate),b=a.getUTCFullYear(),c=a.getUTCMonth();switch(this.viewMode){case 0:this.o.startDate!==-(1/0)&&b<=this.o.startDate.getUTCFullYear()&&c<=this.o.startDate.getUTCMonth()?this.picker.find(".prev").css({visibility:"hidden"}):this.picker.find(".prev").css({visibility:"visible"}),this.o.endDate!==1/0&&b>=this.o.endDate.getUTCFullYear()&&c>=this.o.endDate.getUTCMonth()?this.picker.find(".next").css({visibility:"hidden"}):this.picker.find(".next").css({visibility:"visible"});break;case 1:case 2:this.o.startDate!==-(1/0)&&b<=this.o.startDate.getUTCFullYear()?this.picker.find(".prev").css({visibility:"hidden"}):this.picker.find(".prev").css({visibility:"visible"}),this.o.endDate!==1/0&&b>=this.o.endDate.getUTCFullYear()?this.picker.find(".next").css({visibility:"hidden"}):this.picker.find(".next").css({visibility:"visible"})}}},click:function(c){c.preventDefault();var d=a(c.target).closest("span, td, th");if(1==d.length)switch(d[0].nodeName.toLowerCase()){case"th":switch(d[0].className){case"datepicker-switch":this.showMode(1);break;case"prev":case"next":var e=l.modes[this.viewMode].navStep*("prev"==d[0].className?-1:1);switch(this.viewMode){case 0:this.viewDate=this.moveMonth(this.viewDate,e);break;case 1:case 2:this.viewDate=this.moveYear(this.viewDate,e)}this.fill();break;case"today":var f=new Date;f=b(f.getFullYear(),f.getMonth(),f.getDate(),0,0,0),this.showMode(-2);var g="linked"==this.o.todayBtn?null:"view";this._setDate(f,g);break;case"clear":var h;this.isInput?h=this.element:this.component&&(h=this.element.find("input")),h&&h.val("").change(),this._trigger("changeDate"),this.update(),this.o.autoclose&&this.hide()}break;case"span":if(!d.is(".disabled")){if(this.viewDate.setUTCDate(1),d.is(".month")){var i=1,j=d.parent().find("span").index(d),k=this.viewDate.getUTCFullYear();this.viewDate.setUTCMonth(j),this._trigger("changeMonth",this.viewDate),1===this.o.minViewMode&&this._setDate(b(k,j,i,0,0,0,0))}else{var k=parseInt(d.text(),10)||0,i=1,j=0;this.viewDate.setUTCFullYear(k),this._trigger("changeYear",this.viewDate),2===this.o.minViewMode&&this._setDate(b(k,j,i,0,0,0,0))}this.showMode(-1),this.fill()}break;case"td":if(d.is(".day")&&!d.is(".disabled")){var i=parseInt(d.text(),10)||1,k=this.viewDate.getUTCFullYear(),j=this.viewDate.getUTCMonth();d.is(".old")?0===j?(j=11,k-=1):j-=1:d.is(".new")&&(11==j?(j=0,k+=1):j+=1),this._setDate(b(k,j,i,0,0,0,0))}}},_setDate:function(a,b){b&&"date"!=b||(this.date=new Date(a)),b&&"view"!=b||(this.viewDate=new Date(a)),this.fill(),this.setValue(),this._trigger("changeDate");var c;this.isInput?c=this.element:this.component&&(c=this.element.find("input")),c&&(c.change(),!this.o.autoclose||b&&"date"!=b||this.hide())},moveMonth:function(a,b){if(!b)return a;var c,d,e=new Date(a.valueOf()),f=e.getUTCDate(),g=e.getUTCMonth(),h=Math.abs(b);if(b=b>0?1:-1,1==h)d=-1==b?function(){return e.getUTCMonth()==g}:function(){return e.getUTCMonth()!=c},c=g+b,e.setUTCMonth(c),(0>c||c>11)&&(c=(c+12)%12);else{for(var i=0;h>i;i++)e=this.moveMonth(e,b);c=e.getUTCMonth(),e.setUTCDate(f),d=function(){return c!=e.getUTCMonth()}}for(;d();)e.setUTCDate(--f),e.setUTCMonth(c);return e},moveYear:function(a,b){return this.moveMonth(a,12*b)},dateWithinRange:function(a){return a>=this.o.startDate&&a<=this.o.endDate},keydown:function(a){if(this.picker.is(":not(:visible)"))return void(27==a.keyCode&&this.show());var b,c,d,e=!1;switch(a.keyCode){case 27:this.hide(),a.preventDefault();break;case 37:case 39:if(!this.o.keyboardNavigation)break;b=37==a.keyCode?-1:1,a.ctrlKey?(c=this.moveYear(this.date,b),d=this.moveYear(this.viewDate,b)):a.shiftKey?(c=this.moveMonth(this.date,b),d=this.moveMonth(this.viewDate,b)):(c=new Date(this.date),c.setUTCDate(this.date.getUTCDate()+b),d=new Date(this.viewDate),d.setUTCDate(this.viewDate.getUTCDate()+b)),this.dateWithinRange(c)&&(this.date=c,this.viewDate=d,this.setValue(),this.update(),a.preventDefault(),e=!0);break;case 38:case 40:if(!this.o.keyboardNavigation)break;b=38==a.keyCode?-1:1,a.ctrlKey?(c=this.moveYear(this.date,b),d=this.moveYear(this.viewDate,b)):a.shiftKey?(c=this.moveMonth(this.date,b),d=this.moveMonth(this.viewDate,b)):(c=new Date(this.date),c.setUTCDate(this.date.getUTCDate()+7*b),d=new Date(this.viewDate),d.setUTCDate(this.viewDate.getUTCDate()+7*b)),this.dateWithinRange(c)&&(this.date=c,this.viewDate=d,this.setValue(),this.update(),a.preventDefault(),e=!0);break;case 13:this.hide(),a.preventDefault();break;case 9:this.hide()}if(e){this._trigger("changeDate");var f;this.isInput?f=this.element:this.component&&(f=this.element.find("input")),f&&f.change()}},showMode:function(a){a&&(this.viewMode=Math.max(this.o.minViewMode,Math.min(2,this.viewMode+a))),this.picker.find(">div").hide().filter(".datepicker-"+l.modes[this.viewMode].clsName).css("display","block"),this.updateNavArrows()}};var f=function(b,c){this.element=a(b),this.inputs=a.map(c.inputs,function(a){return a.jquery?a[0]:a}),delete c.inputs,a(this.inputs).datepicker(c).bind("changeDate",a.proxy(this.dateUpdated,this)),this.pickers=a.map(this.inputs,function(b){return a(b).data("datepicker")}),this.updateDates()};f.prototype={updateDates:function(){this.dates=a.map(this.pickers,function(a){return a.date}),this.updateRanges()},updateRanges:function(){var b=a.map(this.dates,function(a){return a.valueOf()});a.each(this.pickers,function(a,c){c.setRange(b)})},dateUpdated:function(b){var c=a(b.target).data("datepicker"),d=c.getUTCDate(),e=a.inArray(b.target,this.inputs),f=this.inputs.length;if(-1!=e){if(d<this.dates[e])for(;e>=0&&d<this.dates[e];)this.pickers[e--].setUTCDate(d);else if(d>this.dates[e])for(;f>e&&d>this.dates[e];)this.pickers[e++].setUTCDate(d);this.updateDates()}},remove:function(){a.map(this.pickers,function(a){a.remove()}),delete this.element.data().datepicker}};var g=a.fn.datepicker,h=a.fn.datepicker=function(b){var g=Array.apply(null,arguments);g.shift();var h;return this.each(function(){var j=a(this),k=j.data("datepicker"),l="object"==typeof b&&b;if(!k){var m=c(this,"date"),n=a.extend({},i,m,l),o=d(n.language),p=a.extend({},i,o,m,l);if(j.is(".input-daterange")||p.inputs){var q={inputs:p.inputs||j.find("input").toArray()};j.data("datepicker",k=new f(this,a.extend(p,q)))}else j.data("datepicker",k=new e(this,p))}return"string"==typeof b&&"function"==typeof k[b]&&(h=k[b].apply(k,g),void 0!==h)?!1:void 0}),void 0!==h?h:this},i=a.fn.datepicker.defaults={autoclose:!1,beforeShowDay:a.noop,calendarWeeks:!1,clearBtn:!1,daysOfWeekDisabled:[],endDate:1/0,forceParse:!0,format:"mm/dd/yyyy",keyboardNavigation:!0,language:"en",minViewMode:0,rtl:!1,startDate:-(1/0),startView:0,todayBtn:!1,todayHighlight:!1,weekStart:0},j=a.fn.datepicker.locale_opts=["format","rtl","weekStart"];a.fn.datepicker.Constructor=e;var k=a.fn.datepicker.dates={en:{days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],
+daysMin:["Su","Mo","Tu","We","Th","Fr","Sa","Su"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",clear:"Clear"}},l={modes:[{clsName:"days",navFnc:"Month",navStep:1},{clsName:"months",navFnc:"FullYear",navStep:1},{clsName:"years",navFnc:"FullYear",navStep:10}],isLeapYear:function(a){return a%4===0&&a%100!==0||a%400===0},getDaysInMonth:function(a,b){return[31,l.isLeapYear(a)?29:28,31,30,31,30,31,31,30,31,30,31][b]},validParts:/dd?|DD?|mm?|MM?|yy(?:yy)?/g,nonpunctuation:/[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g,parseFormat:function(a){var b=a.replace(this.validParts,"\x00").split("\x00"),c=a.match(this.validParts);if(!b||!b.length||!c||0===c.length)throw new Error("Invalid date format.");return{separators:b,parts:c}},parseDate:function(c,d,f){if(c instanceof Date)return c;if("string"==typeof d&&(d=l.parseFormat(d)),/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(c)){var g,h,i=/([\-+]\d+)([dmwy])/,j=c.match(/([\-+]\d+)([dmwy])/g);c=new Date;for(var m=0;m<j.length;m++)switch(g=i.exec(j[m]),h=parseInt(g[1]),g[2]){case"d":c.setUTCDate(c.getUTCDate()+h);break;case"m":c=e.prototype.moveMonth.call(e.prototype,c,h);break;case"w":c.setUTCDate(c.getUTCDate()+7*h);break;case"y":c=e.prototype.moveYear.call(e.prototype,c,h)}return b(c.getUTCFullYear(),c.getUTCMonth(),c.getUTCDate(),0,0,0)}var n,o,g,j=c&&c.match(this.nonpunctuation)||[],c=new Date,p={},q=["yyyy","yy","M","MM","m","mm","d","dd"],r={yyyy:function(a,b){return a.setUTCFullYear(b)},yy:function(a,b){return a.setUTCFullYear(2e3+b)},m:function(a,b){for(b-=1;0>b;)b+=12;for(b%=12,a.setUTCMonth(b);a.getUTCMonth()!=b;)a.setUTCDate(a.getUTCDate()-1);return a},d:function(a,b){return a.setUTCDate(b)}};r.M=r.MM=r.mm=r.m,r.dd=r.d,c=b(c.getFullYear(),c.getMonth(),c.getDate(),0,0,0);var s=d.parts.slice();if(j.length!=s.length&&(s=a(s).filter(function(b,c){return-1!==a.inArray(c,q)}).toArray()),j.length==s.length){for(var m=0,t=s.length;t>m;m++){if(n=parseInt(j[m],10),g=s[m],isNaN(n))switch(g){case"MM":o=a(k[f].months).filter(function(){var a=this.slice(0,j[m].length),b=j[m].slice(0,a.length);return a==b}),n=a.inArray(o[0],k[f].months)+1;break;case"M":o=a(k[f].monthsShort).filter(function(){var a=this.slice(0,j[m].length),b=j[m].slice(0,a.length);return a==b}),n=a.inArray(o[0],k[f].monthsShort)+1}p[g]=n}for(var u,m=0;m<q.length;m++)u=q[m],u in p&&!isNaN(p[u])&&r[u](c,p[u])}return c},formatDate:function(b,c,d){"string"==typeof c&&(c=l.parseFormat(c));var e={d:b.getUTCDate(),D:k[d].daysShort[b.getUTCDay()],DD:k[d].days[b.getUTCDay()],m:b.getUTCMonth()+1,M:k[d].monthsShort[b.getUTCMonth()],MM:k[d].months[b.getUTCMonth()],yy:b.getUTCFullYear().toString().substring(2),yyyy:b.getUTCFullYear()};e.dd=(e.d<10?"0":"")+e.d,e.mm=(e.m<10?"0":"")+e.m;for(var b=[],f=a.extend([],c.separators),g=0,h=c.parts.length;h>=g;g++)f.length&&b.push(f.shift()),b.push(e[c.parts[g]]);return b.join("")},headTemplate:'<thead><tr><th class="prev"><i class="icon-arrow-left"/></th><th colspan="5" class="datepicker-switch"></th><th class="next"><i class="icon-arrow-right"/></th></tr></thead>',contTemplate:'<tbody><tr><td colspan="7"></td></tr></tbody>',footTemplate:'<tfoot><tr><th colspan="7" class="today"></th></tr><tr><th colspan="7" class="clear"></th></tr></tfoot>'};l.template='<div class="datepicker"><div class="datepicker-days"><table class=" table-condensed">'+l.headTemplate+"<tbody></tbody>"+l.footTemplate+'</table></div><div class="datepicker-months"><table class="table-condensed">'+l.headTemplate+l.contTemplate+l.footTemplate+'</table></div><div class="datepicker-years"><table class="table-condensed">'+l.headTemplate+l.contTemplate+l.footTemplate+"</table></div></div>",a.fn.datepicker.DPGlobal=l,a.fn.datepicker.noConflict=function(){return a.fn.datepicker=g,this},a(document).on("focus.datepicker.data-api click.datepicker.data-api",'[data-provide="datepicker"]',function(b){var c=a(this);c.data("datepicker")||(b.preventDefault(),h.call(c,"show"))}),a(function(){h.call(a('[data-provide="datepicker-inline"]'))})}(window.jQuery),function(a){"use strict";a.fn.bdatepicker=a.fn.datepicker.noConflict(),a.fn.datepicker||(a.fn.datepicker=a.fn.bdatepicker);var b=function(a){this.init("date",a,b.defaults),this.initPicker(a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{initPicker:function(b,c){this.options.viewformat||(this.options.viewformat=this.options.format),b.datepicker=a.fn.editableutils.tryParseJson(b.datepicker,!0),this.options.datepicker=a.extend({},c.datepicker,b.datepicker,{format:this.options.viewformat}),this.options.datepicker.language=this.options.datepicker.language||"en",this.dpg=a.fn.bdatepicker.DPGlobal,this.parsedFormat=this.dpg.parseFormat(this.options.format),this.parsedViewFormat=this.dpg.parseFormat(this.options.viewformat)},render:function(){this.$input.bdatepicker(this.options.datepicker),this.options.clear&&(this.$clear=a('<a href="#"></a>').html(this.options.clear).click(a.proxy(function(a){a.preventDefault(),a.stopPropagation(),this.clear()},this)),this.$tpl.parent().append(a('<div class="editable-clear">').append(this.$clear)))},value2html:function(a,c){var d=a?this.dpg.formatDate(a,this.parsedViewFormat,this.options.datepicker.language):"";b.superclass.value2html.call(this,d,c)},html2value:function(a){return this.parseDate(a,this.parsedViewFormat)},value2str:function(a){return a?this.dpg.formatDate(a,this.parsedFormat,this.options.datepicker.language):""},str2value:function(a){return this.parseDate(a,this.parsedFormat)},value2submit:function(a){return this.value2str(a)},value2input:function(a){this.$input.bdatepicker("update",a)},input2value:function(){return this.$input.data("datepicker").date},activate:function(){},clear:function(){this.$input.data("datepicker").date=null,this.$input.find(".active").removeClass("active"),this.options.showbuttons||this.$input.closest("form").submit()},autosubmit:function(){this.$input.on("mouseup",".day",function(b){if(!a(b.currentTarget).is(".old")&&!a(b.currentTarget).is(".new")){var c=a(this).closest("form");setTimeout(function(){c.submit()},200)}})},parseDate:function(a,b){var c,d=null;return a&&(d=this.dpg.parseDate(a,b,this.options.datepicker.language),"string"==typeof a&&(c=this.dpg.formatDate(d,b,this.options.datepicker.language),a!==c&&(d=null))),d}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<div class="editable-date well"></div>',inputclass:null,format:"yyyy-mm-dd",viewformat:null,datepicker:{weekStart:0,startView:0,minViewMode:0,autoclose:!1},clear:"&times; clear"}),a.fn.editabletypes.date=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("datefield",a,b.defaults),this.initPicker(a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.date),a.extend(b.prototype,{render:function(){this.$input=this.$tpl.find("input"),this.setClass(),this.setAttr("placeholder"),this.$tpl.bdatepicker(this.options.datepicker),this.$input.off("focus keydown"),this.$input.keyup(a.proxy(function(){this.$tpl.removeData("date"),this.$tpl.bdatepicker("update")},this))},value2input:function(a){this.$input.val(a?this.dpg.formatDate(a,this.parsedViewFormat,this.options.datepicker.language):""),this.$tpl.bdatepicker("update")},input2value:function(){return this.html2value(this.$input.val())},activate:function(){a.fn.editabletypes.text.prototype.activate.call(this)},autosubmit:function(){}}),b.defaults=a.extend({},a.fn.editabletypes.date.defaults,{tpl:'<div class="input-append date"><input type="text"/><span class="add-on"><i class="icon-th"></i></span></div>',inputclass:"input-small",datepicker:{weekStart:0,startView:0,minViewMode:0,autoclose:!0}}),a.fn.editabletypes.datefield=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("datetime",a,b.defaults),this.initPicker(a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.abstractinput),a.extend(b.prototype,{initPicker:function(b,c){this.options.viewformat||(this.options.viewformat=this.options.format),b.datetimepicker=a.fn.editableutils.tryParseJson(b.datetimepicker,!0),this.options.datetimepicker=a.extend({},c.datetimepicker,b.datetimepicker,{format:this.options.viewformat}),this.options.datetimepicker.language=this.options.datetimepicker.language||"en",this.dpg=a.fn.datetimepicker.DPGlobal,this.parsedFormat=this.dpg.parseFormat(this.options.format,this.options.formatType),this.parsedViewFormat=this.dpg.parseFormat(this.options.viewformat,this.options.formatType)},render:function(){this.$input.datetimepicker(this.options.datetimepicker),this.$input.on("changeMode",function(b){var c=a(this).closest("form").parent();setTimeout(function(){c.triggerHandler("resize")},0)}),this.options.clear&&(this.$clear=a('<a href="#"></a>').html(this.options.clear).click(a.proxy(function(a){a.preventDefault(),a.stopPropagation(),this.clear()},this)),this.$tpl.parent().append(a('<div class="editable-clear">').append(this.$clear)))},value2html:function(a,c){var d=a?this.dpg.formatDate(this.toUTC(a),this.parsedViewFormat,this.options.datetimepicker.language,this.options.formatType):"";return c?void b.superclass.value2html.call(this,d,c):d},html2value:function(a){var b=this.parseDate(a,this.parsedViewFormat);return b?this.fromUTC(b):null},value2str:function(a){return a?this.dpg.formatDate(this.toUTC(a),this.parsedFormat,this.options.datetimepicker.language,this.options.formatType):""},str2value:function(a){var b=this.parseDate(a,this.parsedFormat);return b?this.fromUTC(b):null},value2submit:function(a){return this.value2str(a)},value2input:function(a){a&&this.$input.data("datetimepicker").setDate(a)},input2value:function(){var a=this.$input.data("datetimepicker");return a.date?a.getDate():null},activate:function(){},clear:function(){this.$input.data("datetimepicker").date=null,this.$input.find(".active").removeClass("active"),this.options.showbuttons||this.$input.closest("form").submit()},autosubmit:function(){this.$input.on("mouseup",".minute",function(b){var c=a(this).closest("form");setTimeout(function(){c.submit()},200)})},toUTC:function(a){return a?new Date(a.valueOf()-6e4*a.getTimezoneOffset()):a},fromUTC:function(a){return a?new Date(a.valueOf()+6e4*a.getTimezoneOffset()):a},parseDate:function(a,b){var c,d=null;return a&&(d=this.dpg.parseDate(a,b,this.options.datetimepicker.language,this.options.formatType),"string"==typeof a&&(c=this.dpg.formatDate(d,b,this.options.datetimepicker.language,this.options.formatType),a!==c&&(d=null))),d}}),b.defaults=a.extend({},a.fn.editabletypes.abstractinput.defaults,{tpl:'<div class="editable-date well"></div>',inputclass:null,format:"yyyy-mm-dd hh:ii",formatType:"standard",viewformat:null,datetimepicker:{todayHighlight:!1,autoclose:!1},clear:"&times; clear"}),a.fn.editabletypes.datetime=b}(window.jQuery),function(a){"use strict";var b=function(a){this.init("datetimefield",a,b.defaults),this.initPicker(a,b.defaults)};a.fn.editableutils.inherit(b,a.fn.editabletypes.datetime),a.extend(b.prototype,{render:function(){this.$input=this.$tpl.find("input"),this.setClass(),this.setAttr("placeholder"),this.$tpl.datetimepicker(this.options.datetimepicker),this.$input.off("focus keydown"),this.$input.keyup(a.proxy(function(){this.$tpl.removeData("date"),this.$tpl.datetimepicker("update")},this))},value2input:function(a){this.$input.val(this.value2html(a)),this.$tpl.datetimepicker("update")},input2value:function(){return this.html2value(this.$input.val())},activate:function(){a.fn.editabletypes.text.prototype.activate.call(this)},autosubmit:function(){}}),b.defaults=a.extend({},a.fn.editabletypes.datetime.defaults,{tpl:'<div class="input-append date"><input type="text"/><span class="add-on"><i class="icon-th"></i></span></div>',inputclass:"input-medium",datetimepicker:{todayHighlight:!1,autoclose:!0}}),a.fn.editabletypes.datetimefield=b}(window.jQuery);
\ No newline at end of file
diff --git a/cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js b/cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
new file mode 100644
index 00000000..e93e8246
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
@@ -0,0 +1,7 @@
+/*
+* bootstrap-table - v1.12.1 - 2018-03-12
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2018 zhixin wen
+* Licensed MIT License
+*/
+!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{editable:!0,onEditableInit:function(){return!1},onEditableSave:function(){return!1},onEditableShown:function(){return!1},onEditableHidden:function(){return!1}}),a.extend(a.fn.bootstrapTable.Constructor.EVENTS,{"editable-init.bs.table":"onEditableInit","editable-save.bs.table":"onEditableSave","editable-shown.bs.table":"onEditableShown","editable-hidden.bs.table":"onEditableHidden"});var b=a.fn.bootstrapTable.Constructor,c=b.prototype.initTable,d=b.prototype.initBody;b.prototype.initTable=function(){var b=this;c.apply(this,Array.prototype.slice.apply(arguments)),this.options.editable&&a.each(this.columns,function(c,d){if(d.editable){var e={},f=[],g="editable-",h=function(a,b){var c=a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()});if(c.slice(0,g.length)==g){var d=c.replace(g,"data-");e[d]=b}};a.each(b.options,h),d.formatter=d.formatter||function(a){return a},d._formatter=d._formatter?d._formatter:d.formatter,d.formatter=function(c,g,i){var j=d._formatter?d._formatter(c,g,i):c;a.each(d,h),a.each(e,function(a,b){f.push(" "+a+'="'+b+'"')});var k=!1;return d.editable.hasOwnProperty("noeditFormatter")&&(k=d.editable.noeditFormatter(c,g,i)),k===!1?['<a href="javascript:void(0)"',' data-name="'+d.field+'"',' data-pk="'+g[b.options.idField]+'"',' data-value="'+j+'"',f.join(""),"></a>"].join(""):k}}})},b.prototype.initBody=function(){var b=this;d.apply(this,Array.prototype.slice.apply(arguments)),this.options.editable&&(a.each(this.columns,function(c,d){d.editable&&(b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("save").on("save",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g],i=h[d.field];a(this).data("value",e.submitValue),h[d.field]=e.submitValue,b.trigger("editable-save",d.field,h,i,a(this)),b.resetFooter()}),b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("shown").on("shown",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g];b.trigger("editable-shown",d.field,h,a(this),e)}),b.$body.find('a[data-name="'+d.field+'"]').editable(d.editable).off("hidden").on("hidden",function(c,e){var f=b.getData(),g=a(this).parents("tr[data-index]").data("index"),h=f[g];b.trigger("editable-hidden",d.field,h,a(this),e)}))}),this.trigger("editable-init"))}}(jQuery);
\ No newline at end of file
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 5430becb..f36ecd9c 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -2,7 +2,6 @@
 {% block body %}
 <div class="discover">
   <h2>{{_('User list')}}</h2>
-    <div id="divLoading"></div>
   <table class="table table-striped" id="table_user">
     <tr>
         <th>{{_('Nickname')}}</th>
@@ -13,7 +12,6 @@
         <th>{{_('Download')}}</th>
         <th>{{_('Upload')}}</th>
         <th>{{_('Edit')}}</th>
-        <th>{{_('Passwd')}}</th>
     </tr>
     {% for user in content %}
       {% if not user.role_anonymous() or config.config_anonbrowse %}
@@ -26,20 +24,18 @@
         <td>{% if user.role_download() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
         <td>{% if user.role_upload() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
         <td>{% if user.role_edit() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if user.role_passwd() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
       </tr>
       {% endif %}
     {% endfor %}
   </table>
     <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('new_user')}}">{{_('Add new user')}}</a></div>
-  <h2>{{_('SMTP mail settings')}}</h2>
+  <h2>{{_('SMTP e-mail server settings')}}</h2>
   <table class="table table-striped" id="table_email">
     <tr>
         <th>{{_('SMTP hostname')}}</th>
         <th>{{_('SMTP port')}}</th>
         <th>{{_('SSL')}}</th>
         <th>{{_('SMTP login')}}</th>
-        <th>{{_('SMTP password')}}</th>
         <th>{{_('From mail')}}</th>
     </tr>
       <tr>
@@ -47,44 +43,56 @@
         <td>{{email.mail_port}}</td>
         <td>{% if email.mail_use_ssl %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
         <td>{{email.mail_login}}</td>
-        <td>********</td>
         <td>{{email.mail_from}}</td>
-
   </table>
-
     <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
-
+<div id="container">
   <h2>{{_('Configuration')}}</h2>
-  <table class="table table-striped" id="table_configuration">
-    <tr>
-        <th>{{_('Calibre DB dir')}}</th>
-        <th>{{_('Log Level')}}</th>
-        <th>{{_('Port')}}</th>
-        <th>{{_('Books per page')}}</th>
-        <th>{{_('Uploading')}}</th>
-        <th>{{_('Public registration')}}</th>
-        <th>{{_('Anonymous browsing')}}</th>
-        <th>{{_('Remote Login')}}</th>
-    </tr>
-      <tr>
-        <td>{{config.config_calibre_dir}}</td>
-        <td>{{config.get_Log_Level()}}</td>
-        <td>{{config.config_port}}</td>
-        <td>{{config.config_books_per_page}}</td>
-        <td>{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td>{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-  </table>
+  <div class="col-xs-12 col-sm-6">
+    <div class="Row">
+        <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
+        <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
+    </div>
+    <div class="Row">  
+        <div class="col-xs-6 col-sm-6">{{_('Log Level')}}</div>
+        <div class="col-xs-6 col-sm-6">{{config.get_Log_Level()}}</div>
+    </div>
+    <div class="Row">    
+        <div class="col-xs-6 col-sm-6">{{_('Port')}}</div>
+        <div class="col-xs-6 col-sm-6">{{config.config_port}}</div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-6">
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
+        <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
+    </div>
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
+        <div class="col-xs-6 col-sm-5">{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+    </div>
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
+        <div class="col-xs-6 col-sm-5">{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+    </div>
+    <div class="Row">
+        <div class="col-xs-6 col-sm-7">{{_('Remote Login')}}</div>
+        <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+    </div>      
+  </div>
+</div>
+    <div class="col-xs-12 col-sm-12">
+        <p></p>
   <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Basic Configuration')}}</a></div>
   <div class="btn btn-default"><a href="{{url_for('view_configuration')}}">{{_('UI Configuration')}}</a></div>
+    </div>
   <h2>{{_('Administration')}}</h2>
     <div>{{_('Current commit timestamp')}}: <span>{{commit}} </span></div>
     <div class="hidden" id="update_info">{{_('Newest commit timestamp')}}: <span></span></div>
     <p></p>
     <div class="btn btn-default" id="restart_database">{{_('Reconnect to Calibre DB')}}</div>
-    <div class="btn btn-default" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-web')}}</div>
-    <div class="btn btn-default" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-web')}}</div>
+    <div class="btn btn-default" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-Web')}}</div>
+    <div class="btn btn-default" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-Web')}}</div>
     <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
     <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
 </div>
@@ -95,7 +103,7 @@
     <div class="modal-content">
       <div class="modal-header bg-info"></div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to restart Calibre-web?')}}</p>
+        <p>{{_('Do you really want to restart Calibre-Web?')}}</p>
           <div id="spinner" class="spinner"  style="display:none;">
                 <img id="img-spinner" src="/static/css/images/loading-icon.gif"/>
           </div>
@@ -113,7 +121,7 @@
       <div class="modal-header bg-info">
       </div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to stop Calibre-web?')}}</p>
+        <p>{{_('Do you really want to stop Calibre-Web?')}}</p>
         <button type="button" class="btn btn-default" id="shutdown" data-dismiss="modal">{{_('Ok')}}</button>
         <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
       </div>
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 319481fb..75d1ed0c 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -154,7 +154,7 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header bg-danger text-center">
-          <span>{{_('Are really you sure?')}}</span>
+          <span>{{_('Are you really sure?')}}</span>
       </div>
         <div class="modal-body text-center">
           <span>{{_('Book will be deleted from Calibre database')}}</span>
@@ -239,7 +239,7 @@
   var i18nMsg = {
     'loading': {{_('Loading...')|safe|tojson}},
     'search_error': {{_('Search error!')|safe|tojson}},
-    'no_result': {{_('No Result! Please try anonther keyword.')|safe|tojson}},
+    'no_result': {{_('No Result(s) found! Please try aonther keyword.')|safe|tojson}},
     'author': {{_('Author')|safe|tojson}},
     'publisher': {{_('Publisher')|safe|tojson}},
     'description': {{_('Description')|safe|tojson}},
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 8cb939e4..0af404b8 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -1,4 +1,8 @@
 {% extends "layout.html" %}
+{% block header %}
+<link href="{{ url_for('static', filename='css/libs/bootstrap-table.min.css') }}" rel="stylesheet">
+<link href="{{ url_for('static', filename='css/libs/bootstrap-editable.css') }}" rel="stylesheet">
+{% endblock %}
 {% block body %}
 <div class="discover">
   <h1>{{title}}</h1>
@@ -35,6 +39,52 @@
     <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save settings and send Test E-Mail')}}</button>
     <a href="{{ url_for('admin') }}" id="back" class="btn btn-default">{{_('Back')}}</a>
   </form>
-
+    {% if g.allow_registration %}
+    <h2>{{_('Allowed domains for registering')}}</h2>
+    <table class="table table-no-bordered" id="domain-table" data-url="{{url_for('list_domain')}}" data-id-field="id" data-show-header="false" data-editable-mode="inline">
+      <thead>
+        <tr>
+            <th data-field="domain" id="domain" data-editable-type="text" data-editable-url="{{ url_for('edit_domain')}}" data-editable="true" data-editable-title="{{_('Enter domainname')}}"></th>
+            <th data-field="id" id="id" data-visible="false"></th>
+            <th data-align="right" data-formatter="TableActions"></th>
+        </tr>
+      </thead>
+    </table>
+    <form id="domain_add" action="{{ url_for('add_domain')}}" method="POST">
+    <div class="form-group required">
+      <label for="domainname">{{_('Add Domain')}}</label>
+      <input type="text" class="form-control" name="domainname" id="domainname" >
+    </div>
+    <button id="domain_submit" class="btn btn-default">{{_('Add')}}</button>
+    </form>
+    {% endif %}
+</div>
+{% endblock %}
+{% block modal %}
+{% if g.allow_registration %}
+<div id="DeleteDomain" class="modal fade" role="dialog">
+  <div class="modal-dialog modal-sm">
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header bg-danger">
+      </div>
+      <div class="modal-body text-center">
+        <p>{{_('Do you really want to delete this domain rule?')}}</p>
+        <button type="button" class="btn btn-danger" id="btndeletedomain" >{{_('Delete')}}</button>
+        <!--a href="{{ url_for('delete_domain')}}" class="btn btn-danger">{{_('Delete')}}</a-->
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+      </div>
+    </div>
+  </div>
 </div>
+{% endif %}
 {% endblock %}
+{% block js %}
+{% if g.allow_registration %}
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"></script>
+<script src="{{ url_for('static', filename='js/table.js') }}"></script>
+{% endif %}
+{% endblock %}
+
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 99182d66..634a3426 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -124,7 +124,7 @@
               {% if g.user.show_sorted() %}
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                  <span class="glyphicon glyphicon-sort-by-attributes"></span> {{_('Sorted Books')}}
+                  <span class="glyphicon glyphicon-sort-by-attributes"></span>{{_('Sorted Books')}}
                   <span class="caret"></span>
                 </a>
                 <ul class="dropdown-menu">
@@ -136,44 +136,44 @@
               </li>
               {%endif%}
               {% if g.user.show_hot_books() %}
-              <li id="nav_hot" {% if page == 'hot' %}class="active"{% endif %}><a href="{{url_for('hot_books')}}"><span class="glyphicon glyphicon-fire"></span> {{_('Hot Books')}}</a></li>
+              <li id="nav_hot" {% if page == 'hot' %}class="active"{% endif %}><a href="{{url_for('hot_books')}}"><span class="glyphicon glyphicon-fire"></span>{{_('Hot Books')}}</a></li>
               {%endif%}
               {% if g.user.show_best_rated_books() %}
-              <li {% if page == 'rated' %}class="active"{% endif %}><a href="{{url_for('best_rated_books')}}"><span class="glyphicon glyphicon-star"></span> {{_('Best rated Books')}}</a></li>
+              <li {% if page == 'rated' %}class="active"{% endif %}><a href="{{url_for('best_rated_books')}}"><span class="glyphicon glyphicon-star"></span>{{_('Best rated Books')}}</a></li>
               {%endif%}
               {% if g.user.show_read_and_unread() %}
                 {% if not g.user.is_anonymous %}
-                  <li {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('read_books')}}"><span class="glyphicon glyphicon-eye-open"></span> {{_('Read Books')}}</a></li>
+                  <li {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('read_books')}}"><span class="glyphicon glyphicon-eye-open"></span>{{_('Read Books')}}</a></li>
                 {%endif%}
-                <li {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('unread_books')}}"><span class="glyphicon glyphicon-eye-close"></span> {{_('Unread Books')}}</a></li>
+                <li {% if page == 'read' %}class="active"{% endif %}><a href="{{url_for('unread_books')}}"><span class="glyphicon glyphicon-eye-close"></span>{{_('Unread Books')}}</a></li>
               {%endif%}
               {% if g.user.show_random_books() %}
-              <li id="nav_rand" {% if page == 'discover' %}class="active"{% endif %}><a href="{{url_for('discover')}}"><span class="glyphicon glyphicon-random"></span> {{_('Discover')}}</a></li>
+              <li id="nav_rand" {% if page == 'discover' %}class="active"{% endif %}><a href="{{url_for('discover')}}"><span class="glyphicon glyphicon-random"></span>{{_('Discover')}}</a></li>
               {%endif%}
               {% if g.user.show_category() %}
-              <li id="nav_cat" {% if page == 'discover' %}class="category"{% endif %}><a href="{{url_for('category_list')}}"><span class="glyphicon glyphicon-inbox"></span> {{_('Categories')}}</a></li>
+              <li id="nav_cat" {% if page == 'discover' %}class="category"{% endif %}><a href="{{url_for('category_list')}}"><span class="glyphicon glyphicon-inbox"></span>{{_('Categories')}}</a></li>
               {%endif%}
               {% if g.user.show_series() %}
-              <li id="nav_serie" {% if page == 'series' %}class="active"{% endif %}><a href="{{url_for('series_list')}}"><span class="glyphicon glyphicon-bookmark"></span> {{_('Series')}}</a></li>
+              <li id="nav_serie" {% if page == 'series' %}class="active"{% endif %}><a href="{{url_for('series_list')}}"><span class="glyphicon glyphicon-bookmark"></span>{{_('Series')}}</a></li>
               {%endif%}
               {% if g.user.show_author() %}
-              <li id="nav_author" {% if page == 'author' %}class="active"{% endif %}><a href="{{url_for('author_list')}}"><span class="glyphicon glyphicon-user"></span> {{_('Authors')}}</a></li>
+              <li id="nav_author" {% if page == 'author' %}class="active"{% endif %}><a href="{{url_for('author_list')}}"><span class="glyphicon glyphicon-user"></span>{{_('Authors')}}</a></li>
               {%endif%}
               {% if g.user.filter_language() == 'all' and g.user.show_language() %}
-                <li id="nav_lang" {% if page == 'language' %}class="active"{% endif %}><a href="{{url_for('language_overview')}}"><span class="glyphicon glyphicon-flag"></span> {{_('Languages')}} </a></li>
+                <li id="nav_lang" {% if page == 'language' %}class="active"{% endif %}><a href="{{url_for('language_overview')}}"><span class="glyphicon glyphicon-flag"></span>{{_('Languages')}} </a></li>
               {%endif%}
               {% if g.user.is_authenticated or g.user.is_anonymous %}
                 <li class="nav-head hidden-xs">{{_('Public Shelves')}}</li>
                 {% for shelf in g.public_shelfes %}
-                  <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list"></span> {{shelf.name}}</a></li>
+                  <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list"></span>{{shelf.name}}</a></li>
                 {% endfor %}
                 <li class="nav-head hidden-xs">{{_('Your Shelves')}}</li>
                 {% for shelf in g.user.shelf %}
-                  <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list"></span> {{shelf.name}}</a></li>
+                  <li><a href="{{url_for('show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list"></span>{{shelf.name}}</a></li>
                 {% endfor %}
               {% if not g.user.is_anonymous %}
                 <li id="nav_createshelf" class="create-shelf"><a href="{{url_for('create_shelf')}}">{{_('Create a Shelf')}}</a></li>
-                <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('stats')}}"><span class="glyphicon glyphicon-info-sign"></span> {{_('About')}}</a></li>
+                <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('stats')}}"><span class="glyphicon glyphicon-info-sign"></span>{{_('About')}}</a></li>
               {% endif %}
               {% endif %}
 
diff --git a/cps/templates/osd.xml b/cps/templates/osd.xml
index 77709478..b88e6823 100644
--- a/cps/templates/osd.xml
+++ b/cps/templates/osd.xml
@@ -2,7 +2,7 @@
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
    <LongName>{{instance}}</LongName>
    <ShortName>{{instance}}</ShortName>
-   <Description>{{_('Calibre Web ebook catalog')}}</Description>
+   <Description>{{_('Calibre-Web ebook catalog')}}</Description>
    <Developer>Janeczku</Developer>
    <Contact>https://github.com/janeczku/calibre-web</Contact>
    <Url type="text/html"
diff --git a/cps/templates/register.html b/cps/templates/register.html
index 0da82dfa..92272771 100644
--- a/cps/templates/register.html
+++ b/cps/templates/register.html
@@ -7,10 +7,10 @@
       <label for="nickname">{{_('Username')}}</label>
       <input type="text" class="form-control" id="nickname" name="nickname" placeholder="{{_('Choose a username')}}" required>
     </div>
-    <div class="form-group required">
+    <!--div class="form-group required">
       <label for="password">{{_('Password')}}</label>
       <input type="password" class="form-control" id="password" name="password" placeholder="{{_('Choose a password')}}" required>
-    </div>
+    </div-->
     <div class="form-group required">
       <label for="email">{{_('Email address')}}</label>
       <input type="email" class="form-control" id="email" name="email" placeholder="{{_('Your email address')}}" required>
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index a99f13b0..7f941ac9 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -2,7 +2,7 @@
 {% block body %}
   <h3>{{_('About')}}</h3>
 <p>{{instance}} powered by 
-<a href="https://github.com/janeczku/calibre-web" title="Calibre-Web">Calibre Web</a>.
+<a href="https://github.com/janeczku/calibre-web" title="Calibre-Web">Calibre-Web</a>.
 </p>  
   <h3>{{_('Calibre library statistics')}}</h3>
 <table id="stats" class="table">
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 3ffd48a3..d4f72829 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -28,6 +28,7 @@
 {% block js %}
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
         <script>
+            // ToDo: Move to js file
             $('#table').bootstrapTable({
                formatNoMatches: function () {
                 return '';
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 9a44cfcc..5a9abf2b 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -14,10 +14,16 @@
       <input type="email" class="form-control" name="email" id="email" value="{{ content.email if content.email != None }}" autocomplete="off">
     </div>
     {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
-    <div class="form-group">
-      <label for="password">{{_('Password')}}</label>
-      <input type="password" class="form-control" name="password" id="password" value="" autocomplete="off">
-    </div>
+      {% if g.user and g.user.role_admin() and g.allow_registration and not new_user %}
+        <div class="btn btn-default" id="resend_password"><a href="{{url_for('reset_password', user_id = content.id) }}">{{_('Reset user Password')}}</a></div>
+      {% else %}            
+        <div class="form-group">
+          <label for="password">{{_('Password')}}</label>
+          <input type="password" class="form-control" name="password" id="password" value="" autocomplete="off">
+        </div>
+    {% endif %}
+
+    
     {% endif %}
     <div class="form-group">
       <label for="kindle_mail">{{_('Kindle E-Mail')}}</label>
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 608c621b..4016b93a 100644
Binary files a/cps/translations/de/LC_MESSAGES/messages.mo and b/cps/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 7b726081..ec47bef2 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# German translations for Calibre-web.
+# German translations for Calibre-Web.
 # Copyright (C) 2016 Ozzieisaacs
-# This file is distributed under the same license as the Calibre-web
+# This file is distributed under the same license as the Calibre-Web
 # project.
 # FIRST AUTHOR OzzieIsaacs, 2016.
 # # Translation template file..
@@ -19,9 +19,9 @@
 # Wolfgang Rohdewald <wolfgang@rohdewald.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -41,171 +41,171 @@ msgstr "Nicht installiert"
 msgid "Excecution permissions missing"
 msgstr "Ausführungsberechtigung nicht vorhanden"
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr "epub Format für Bücher-ID %(book)d nicht gefunden"
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr "Konvertiere: %s"
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "Calibre-web Test E-Mail"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "Calibre-Web Test E-Mail"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr "Test E-Mail"
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 "Konnte keine Formate finden welche für das versenden per E-Mail geeignet "
 "sind"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr "E-Mail: %s"
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 "Die angeforderter Dazei konnte nicht gelesen werden. Evtl. falsche "
 "Zugriffsrechte"
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "Umbenennen des Titelpfades \"%s\" nach \"%s\" schlug fehl: %s"
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "Umbenennen des Authorpfades \"%s\" nach \"%s\" schlug fehl: %s"
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr "Datei %s wirde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr "Buchpfad %s wurde nicht auf Google Drive gefunden"
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "Frage Update Paket an"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "Lade Update Paket herunter"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "Entpacke Update Paket"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "Ersetze Dateien"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "Stoppe Server"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr "Kürzlich hinzugefügte Bücher"
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr "Neueste Bücher"
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr "Älteste Bücher"
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr "Bücher (A-Z)"
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr "Bücher (Z-A)"
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "Best bewertete Bücher"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
 "zugänglich."
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "Liste Serien"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "Kategorieliste"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
@@ -213,360 +213,397 @@ msgstr ""
 "Callback Domain ist nicht verifiziert, bitte Domain in der Google "
 "Developer Console verifizieren"
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "Update durchgeführt"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr "Herausgegeben nach dem %s"
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr "Herausgegeben vor dem %s"
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr "Bewertung <= %s"
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr "Bewertung >= %s"
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "Suche"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "Der Benutzername oder die E-Mailadresse ist in bereits in Benutzung."
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Das Buch wurde dem Bücherregal: %(sname)s hinzugefügt"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Keine Erlaubnis das Buch aus dem Bücherregal %(sname)s zu entfernen"
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereits ein Bücheregal mit dem Titel '%(title)s'"
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fehler beim Öffnen. Bücherregel exisitert nicht oder ist nicht zugänglich"
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "Es existiert ein Benutzerkonto für diese E-Mailadresse"
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web Konfiguration wurde aktualisiert"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web Konfiguration wurde aktualisiert"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr "Konfiguration Benutzeroberfläche"
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Optionale Abhängigkeiten für Google Drive fehlen"
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json nicht vorhanden, oder nicht lesbar"
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json nicht als Webapplication konfiguriert"
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "SSL-Keydatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "SSL-Certdatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Speicherort Logdatei ist ungültig, bitte Pfad korrigieren"
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren"
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "Es existiert ein Benutzerkonto für diese Emailadresse oder den "
 "Benutzernamen."
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "E-Mail Einstellungen aktualisiert"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "Fehler beim versenden der Test E-Mail: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "E-Mail Einstellungen wurden aktualisiert"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "E-Mail Einstellungen editieren"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
 "zugänglich"
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Die Dateiendung \"%s\" kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr "Fehler beim speichern der Datei %s."
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr "Dateiformat %s zu %s hinzugefügt"
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr "Cover ist keine JPG Datei, konnte nicht gespeichert werden"
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr "DAtei %s hochgeladen"
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr "Gestartet"
 
@@ -580,29 +617,29 @@ msgstr "E-Mail: %stitle"
 msgid "Convertertool %(converter)s not found"
 msgstr "Konvertertool %(converter)s nicht gefunden"
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr "Fehler EBook-converter: %s"
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen Aufruf mit Fehler %(error)s. Text: %(message)s fehlgeschlagen "
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "Die E-Mail wurde via calibre-web versendet"
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
@@ -610,170 +647,159 @@ msgstr "Fehlgeschlagen"
 msgid "User list"
 msgstr "Benutzerliste"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "Benutzername"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr "E-Mail"
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "Admin"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "Hochladen"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "Editieren"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "Passwort"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "SMTP Mail Einstellungen"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "SMTP Hostname"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "SMTP Port"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "SMTP Login"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "SMTP Passwort"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "Absenderadresse"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "SMTP Einstellungen ändern"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
-msgstr "Editiere erlaubte Domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
+msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Calibre DB Pfad"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "Log Level"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Bücher pro Seite"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "Hochladen"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "Öffentliche Registrierung"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "Anonymer Zugriff"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr "Remote Login"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr "Aktuelles Commit Datum"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr "Neuestes Commit Datum"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "Calibre-DB neu verbinden"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "Calibre-web Neustarten"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "Calibre-Web Neustarten"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "Stoppe Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "Stoppe Calibre-Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "Suche nach Update"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
-msgstr "Calibre-web wirklich neustarten?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "Calibre-Web wirklich neustarten?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "Zurück"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
-msgstr "Calibre-web wirklich stoppen"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "Calibre-Web wirklich stoppen"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "Updatevorgang, bitte Seite nicht neu laden"
 
@@ -798,6 +824,7 @@ msgid "Delete formats:"
 msgstr "Lösche Formate:"
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr "Löschen"
 
@@ -870,13 +897,13 @@ msgstr "Metadaten laden"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Abschicken"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr "Sicher?"
 
 #: cps/templates/book_edit.html:160
@@ -925,8 +952,8 @@ msgid "Search error!"
 msgstr "Fehler bei Suche!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "Kein Ergebniss! Bitte anderen Begriff versuchen"
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -986,7 +1013,7 @@ msgstr "Konfiguration Logdatei"
 
 #: cps/templates/config_edit.html:115
 msgid "Location and name of logfile (calibre-web.log for no entry)"
-msgstr "Pfad und Name der Logdatei (calibre-web.log bei keinem Eintrag)"
+msgstr ""
 
 #: cps/templates/config_edit.html:126
 msgid "Feature Configuration"
@@ -1190,7 +1217,7 @@ msgstr "Gelesen"
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
@@ -1220,6 +1247,10 @@ msgstr "STARTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "SMTP Passwort"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "Absenderadresse"
@@ -1232,11 +1263,11 @@ msgstr "Einstellungen speichern"
 msgid "Save settings and send Test E-Mail"
 msgstr "Einstellungen speichern und Test E-Mail versenden"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "Nächste"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "Suche"
@@ -1245,67 +1276,67 @@ msgstr "Suche"
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufälliges Buch)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Start"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "Beliebte Bücher"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Beliebte Publikationen aus dieser Bibliothek basierend auf Downloadzahlen"
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "Best bewertete Bücher"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Beliebte Veröffentlichungen dieses Katalogs basierend auf Bewertungen"
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "Neue Bücher"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "Die neuesten Bücher"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "Autoren"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "Bücher nach Autoren sortiert"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "Bücher nach Kategorien sortiert"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "Bücher nach Reihen geordnet"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "Öffentliche Bücherregale"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Bücher organisiert in öffentlichem Bücherregal, sichtbar für jedermann"
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "Deine Bücherregale"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 "Persönliches Bücherregal des Benutzers, nur sichtbar für den aktuellen "
@@ -1415,8 +1446,8 @@ msgid "Log in with magic link"
 msgstr "Einloggen mit magischem Link"
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Calibre Web Ebook Katalog"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1454,6 +1485,22 @@ msgstr "E-Mail Adresse"
 msgid "Your email address"
 msgstr "Deine E-Mail Adresse"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr "Benutze das andere Gerät und besuche"
@@ -1478,10 +1525,6 @@ msgstr "Versuche eine andere Suche"
 msgid "Results for:"
 msgstr "Ergebnisse für:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr "Such Resultate zu Bücherregal hinzufügen"
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr "Herausgabedatum von"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index c4d4bc81..03e9282e 100644
Binary files a/cps/translations/es/LC_MESSAGES/messages.mo and b/cps/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 1b98c9fa..17c9c531 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# Traducción al Español for Calibre-web.
+# Traducción al Español for Calibre-Web.
 # Copyright (C) 2016 Smart Cities Community
-# This file is distributed under the same license as the Calibre-web
+# This file is distributed under the same license as the Calibre-Web
 # Juan F. Villa <juan.villa@paisdelconocimiento.org>, 2016.
 # # Translation template file..
 # Copyright (C) 2011 Kovid Goyal
@@ -12,9 +12,9 @@
 # Jellby <jellby@yahoo.com>, 2014-2015# Translation template file..
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n"
 "Language: es\n"
@@ -34,522 +34,559 @@ msgstr "No instalado"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "Prueba de Correo Calibre-web"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "Prueba de Correo Calibre-Web"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Formato no compatible para enviar por correo electronico"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "Enviar a Kindle"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "Ficheros sustituidos"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "Los conexiones de base datos están cerradas"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "El servidor está detenido"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "Libros populares (los mas descargados)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "Libros mejor valorados"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "Libros al azar"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "Lista de autores"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Error en la apertura del eBook. El archivo no existe o no es accesible:"
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "Lista de series"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series : %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "Lenguajes disponibles"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lenguaje: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "Lista de categorias"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "Servidor en proceso de apagado. Por favor, cierre la ventana."
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "Actualización realizada"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "búsqueda"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "Libros leídos"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "¡Por favor completar todos los campos!"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "Error desconocido. Por favor, inténtelo de nuevo mas tarde."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "Usuario o dirección de correo en uso."
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "Iniciar sesión"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ha sucedido un error en el envio del Libro: %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Configurar primero la dirección de correo Kindle por favor..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Une étagère de ce nom '%(title)s' existe déjà."
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "crear un estante"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "Existe una cuenta vinculada a esta dirección de correo."
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Configuración de Calibre-web actualizada"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "Localicación de la BD inválida. Por favor, introduzca la ruta correcta."
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "Se ha encontrado una cuenta vinculada a esta dirección de correo o nombre"
 " de usuario."
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "Parámetros de correo actualizados"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "Exito al realizar envio de prueba a %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "Error al realizar envio de prueba a E-Mail: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "Ajustes de correo electrónico actualizados"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "Editar parametros de correo"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "Error inesperado."
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "editar metainformación"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión \"%s\" a este servidor"
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -563,29 +600,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "Este mensaje ha sido enviado via Calibre Web."
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -593,170 +630,159 @@ msgstr ""
 msgid "User list"
 msgstr "lista de usuarios"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "Nickname"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr "Correo"
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "Administración"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "Descarga"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "Subir archivo"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "Editar"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "Clave"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "Parámetros smtp del correo"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "Servidor smtp"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "Puerto smtp"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "Clave SMTP"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "Desde el correo"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "Cambiar parametros smtp"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "Configuración"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Dir DB Calibre"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "Nivel de registro"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "Puerto"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Libros por página"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "Subiendo"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "Registro público"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "Navegación anónima"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "Administración"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr "Marca temporal del commit actual"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr "Marca temporal del commit más reciente"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "Reconectar la BD Calibre"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "Reinicial Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "Reinicial Calibre-Web"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "Detener Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "Detener Calibre-Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "Buscar actualizaciones"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "Actualizar"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
-msgstr "¿Seguro que quiere reiniciar Calibre-web?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "¿Seguro que quiere reiniciar Calibre-Web?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "Regresar"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
-msgstr "¿Seguro que quiere detener Calibre-web?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "¿Seguro que quiere detener Calibre-Web?"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "Actualizando. Por favor, no recargue la página."
 
@@ -781,6 +807,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr ""
 
@@ -851,13 +878,13 @@ msgstr "Obtener metainformación"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Enviar"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr ""
 
 #: cps/templates/book_edit.html:160
@@ -906,8 +933,8 @@ msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "¡Sin resultados! Por favor, pruebe otra palabra clave."
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -1171,7 +1198,7 @@ msgstr "Leer"
 msgid "Description:"
 msgstr "Descripcion :"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Agregar al estante"
 
@@ -1201,6 +1228,10 @@ msgstr "STATRTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "Clave SMTP"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "Desde el correo"
@@ -1213,11 +1244,11 @@ msgstr "Guardar cambios"
 msgid "Save settings and send Test E-Mail"
 msgstr "Guardar cambios y enviar un correo de prueba"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "Siguiente"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "Buscar"
@@ -1226,67 +1257,67 @@ msgstr "Buscar"
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Iniciar"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "Libros Populares"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Publicaciones mas populares para este catálogo basadas en las descargas."
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "Libros mejor valorados"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Publicaciones populares del catalogo basados en el puntaje."
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "Nuevos libros"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "Libros recientes"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "Autores"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "Libros ordenados por Autor"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "Libros ordenados por Categorias"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "Libros ordenados por Series"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "Estantes públicos"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "Sus estantes"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1394,8 +1425,8 @@ msgid "Log in with magic link"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Catálogo de libros electrónicos Calibre Web"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1433,6 +1464,22 @@ msgstr "Direccion de correo"
 msgid "Your email address"
 msgstr "Tu direccion de correo"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr ""
@@ -1457,10 +1504,6 @@ msgstr "Intente una busqueda diferente"
 msgid "Results for:"
 msgstr "Resultados para:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1494,8 +1537,8 @@ msgid "Delete this Shelf"
 msgstr "Borrar este estante"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "Editar nombre del estante"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 39eac778..37ca5371 100644
Binary files a/cps/translations/fr/LC_MESSAGES/messages.mo and b/cps/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 57113aeb..f8208f24 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# French translations for Calibre-web.
-# Copyright (C) 2016 Calibre-web
-# This file is distributed under the same license as the Calibre-web
+# French translations for Calibre-Web.
+# Copyright (C) 2016 Calibre-Web
+# This file is distributed under the same license as the Calibre-Web
 # project.
 # FIRST AUTHOR <nicoroud@gmail.com>, 2016.
 # # Translation template file..
@@ -18,9 +18,9 @@
 # Xotes <alois.glibert@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2017-10-26 22:42+0200\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -40,524 +40,561 @@ msgstr "non installé"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
+#: cps/helper.py:80
+msgid "Calibre-Web test email"
 msgstr ""
 
-#: cps/helper.py:80
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossible de trouver un format adapté à envoyer par courriel"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "Envoyer vers Kindle"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "Téléchargement la mise à jour"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "Fichiers remplacés"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "Connexion à la base de donnée fermée"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "Serveur arrêté"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "Mise à jour terminée, merci d’appuyer sur okay et de rafraîchir la page"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr "Ajouts récents"
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr "Livres récents"
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr "Anciens livres"
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr "Livres (A-Z)"
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr "Livres (Z-A)"
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "Livres les mieux notés"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "Livres au hasard"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "Liste des auteurs"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est "
 "pas accessible :"
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "Liste des séries"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "Langues disponibles"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "Liste des catégories"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "Mise à jour effectuée"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "recherche"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "Livres lus"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "Une erreur a eu lieu. Merci de réessayez plus tard."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
+
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "Ce nom d'utilisateur ou cette adresse de courriel est déjà utilisée."
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "connexion"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veillez configurer les paramètres smtp d'abord..."
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Veuillez configurer votre adresse kindle d'abord..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Une étagère de ce nom '%(title)s' existe déjà."
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "créer une étagère"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "l’étagère %(name)s a été supprimé avec succès"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "Un compte avec cette adresse de courriel existe déjà."
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "Page administrateur"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Configuration de Calibre-web mise à jour"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "Configuration basique"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr "Un compte avec cette adresse de courriel ou ce surnom existe déjà."
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "Paramètres de courriel mis à jour"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
+msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "Préférences e-mail mises à jour"
-
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "Éditer les paramètres de courriel"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 "Erreur à l’ouverture du livre. Le fichier n’existe pas ou n’est pas "
 "accessible"
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être téléverser le fichier doit avoir une extension"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr "inconnu"
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -571,29 +608,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "Ce message a été envoyé depuis calibre web."
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -601,170 +638,159 @@ msgstr ""
 msgid "User list"
 msgstr "Liste des utilisateurs"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "Surnom"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr "Courriel"
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "Administration"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "Télécharger"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "Téléverser"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "Éditer"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "Mot de passe"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "Paramètres smtp"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "Serveur smtp"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "Port smtp"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "Login smtp"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "Mot de passe smtp"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "Expéditeur des courriels"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "Changer les paramètre smtp"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "Configuration"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Livres par page"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "Téléversement"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "Inscription public"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "Navigation anonyme"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
-msgstr "Se reconnecter à Calibre-web"
+msgstr "Se reconnecter à Calibre-Web"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "Redémarrer Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "Redémarrer Calibre-Web"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "Arrêter Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "Arrêter Calibre-Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "Rechercher les mise à jour"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
-msgstr "Voulez-vous vraiment redémarrer Calibre-web?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "D’accord"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "Retour"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
-msgstr "Voulez-Vous vraiment arrêter Calibre-web?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "Voulez-Vous vraiment arrêter Calibre-Web?"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -789,6 +815,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -859,13 +886,13 @@ msgstr "Obtenir les métadonnées"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Soumettre"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr "Etes-vous vraiment sur?"
 
 #: cps/templates/book_edit.html:160
@@ -914,8 +941,8 @@ msgid "Search error!"
 msgstr "Rechercher les erreur!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "Aucun résultat, Merci d’essayer un autre mot-clé."
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -1179,7 +1206,7 @@ msgstr "Lu"
 msgid "Description:"
 msgstr "Description :"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
@@ -1209,6 +1236,10 @@ msgstr "STARTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "Mot de passe smtp"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "Expéditeur des courriels"
@@ -1221,11 +1252,11 @@ msgstr "Sauvegarder les réglages"
 msgid "Save settings and send Test E-Mail"
 msgstr "Sauvegarder les réglages et tester l’envoi d’e-mail"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "Suivant"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "Chercher"
@@ -1234,69 +1265,69 @@ msgstr "Chercher"
 msgid "Discover (Random Books)"
 msgstr "Découverte (livres au hasard)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Démarrer"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "Livres populaires"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr ""
 "Publications populaires depuis le catalogue basées sur les "
 "téléchargements."
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "Livres les mieux notés"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Publications populaires de ce catalogue sur la base de notes."
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "Nouveaux livres"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "Les derniers livres"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "Livres classés par auteur"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "Livres classés par catégorie"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "Livres classés par série"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "Étagères publiques"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1404,8 +1435,8 @@ msgid "Log in with magic link"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Catalogue de livre Calibre Web"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1443,6 +1474,22 @@ msgstr "Adresse de courriel"
 msgid "Your email address"
 msgstr "Votre adresse de courriel"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr "Utilisez votre autre dispositif, visitez"
@@ -1467,10 +1514,6 @@ msgstr "Essayer une recherche différente"
 msgid "Results for:"
 msgstr "Résultats pour :"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1504,8 +1547,8 @@ msgid "Delete this Shelf"
 msgstr "Effacer cette étagère"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "Modifier le nom de l’étagère"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 1c350134..e03f8db7 100644
Binary files a/cps/translations/it/LC_MESSAGES/messages.mo and b/cps/translations/it/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index c586ddee..40469360 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# Traduzione in italiano per Calibre-web.
+# Traduzione in italiano per Calibre-Web.
 # Copyright (C) 2016 Smart Cities Community
-# This file is distributed under the same license as the Calibre-web
+# This file is distributed under the same license as the Calibre-Web
 # Juan F. Villa <juan.villa@paisdelconocimiento.org>, 2016.
 # # Translation template file..
 # Copyright (C) 2011 Kovid Goyal
@@ -12,9 +12,9 @@
 # Jellby <jellby@yahoo.com>, 2014-2015# Translation template file..
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Marco Picone <marcovendere@gmail.com>\n"
 "Language: it\n"
@@ -34,528 +34,565 @@ msgstr "non installato"
 msgid "Excecution permissions missing"
 msgstr "Mancano autorizzazioni di esecuzione"
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr "formato epub non trovato"
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "test email Calibre-web"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "test email Calibre-Web"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossibile trovare i formati adatti per l'invio tramite email"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "Invia a Kindle"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "Richiesta del pacchetto di aggiornamento"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "Scaricare il pacchetto di aggiornamento"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "Decomprimere pacchetto di aggiornamento"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "I file vengono sostituiti"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "Le connessioni di database sono chiuse"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "Il server viene arrestato"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, prego premere bene e ricaricare pagina"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr "Libri aggiunti di recente"
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr "I più nuovi libri"
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr "Libri più vecchi"
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr "Ebook (A-Z)"
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr "Ebook (Z-A)"
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "Hot Books (più scaricati)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "I migliori libri valutati"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "Libri casuali"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "Elenco degli autori"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Errore durante l'apertura di eBook. Il file non esiste o il file non è "
 "accessibile:"
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "Lista delle serie"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie :"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "Lingue disponibili"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingue: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "Elenco categorie"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "Statistica"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, ricarica pagina"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguire l'arresto del server, chiudi la finestra."
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "Aggiornamento fatto"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "ricerca"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "Leggere libri"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "Libri non letti"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "Leggere un libro"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "Compila tutti i campi"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "Registrare"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "Si è verificato un errore sconosciuto. Per favore riprova più tardi."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "Questo nome utente o indirizzo email è già in uso."
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come : '%(nickname)s'"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errata"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "Accesso"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr "Successo! Torna al tuo dispositivo"
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurare prima le impostazioni della posta SMTP..."
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Si prega di configurare innanzitutto il tuo indirizzo email..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Il libro è stato aggiunto alla mensola: %(sname)s"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Il libro è stato rimosso dalla mensola: %(sname)s"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Uno scaffale con il nome '%(title)s' esiste già."
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Mensola %(title)s creato"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "c'era un errore"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "creare uno scaffale"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Mensola %(title)s cambiato"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "Modifica un ripiano"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "cancellato con successo il ripiano %(name)s"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Mensola: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 "Errore durante l'apertura dello scaffale. La mensola non esiste o non è "
 "accessibile"
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modificare l'ordine della mensola: '%(name)s'"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "Trovato un account esistente per questo indirizzo email."
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
 msgstr "Aggiornamento della configurazione del calibro-web"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "Posizione DB non valida. Inserisci il percorso corretto."
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "utente '%(user)s' creato"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "È stato trovato un account collegato a questo indirizzo e-mail o nome "
 "utente."
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "Parametri di posta aggiornati"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "Successo quando invii il test a %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "Impossibile inviare il test a E-Mail: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "Impostazioni email aggiornate"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "Modificare i parametri della posta"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "utente '%(nick)s' cancellati"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "utente '%(nick)s'  aggiornato"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "Errore imprevisto."
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica utente %(nick)s"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 "Errore durante l'apertura di eBook. Il file non esiste o il file non è "
 "accessibile"
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "modificare la metainformazione"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Non è consentito caricare i file con l'estensione \"%s\" a questo server"
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossibile creare il percorso %s (autorizzazione negata)"
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr "Sconosciuto"
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossibile archiviare il file %s (autorizzazione negata)"
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossibile eliminare il file %s (autorizzazione negata)"
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -569,29 +606,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "errore"
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "L'email è stata inviata tramite Calibre Web."
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -599,170 +636,159 @@ msgstr ""
 msgid "User list"
 msgstr "elenco utenti"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "Nickname"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr "Email"
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "Admin"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "Upload"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "Modifica"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "Passwd"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "SMTP mail impostazioni"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "SMTP hostname"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "SMTP login"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "SMTP password"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "From mail"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "Modificare SMTP impostazioni"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Calibre DB dir"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "Livello del registro"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Libri per pagina"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "Uploading"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "Registrazione pubblica"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "Navigazione anonima"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr "Login remoto"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr "Timestamp di commit corrente"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr "Più recente commit timestamp"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "Ricollegare al DB Calibre"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "Ricomincia Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "Ricomincia Calibre-Web"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "Stop Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "Stop Calibre-Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "Esegui aggiornamento"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
 msgstr "Vuoi veramente riavviare Caliber-web?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "Indietro"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
 msgstr "Vuoi veramente fermare Caliber-web?"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -787,6 +813,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr "Elimina"
 
@@ -857,13 +884,13 @@ msgstr "Ottieni metadati"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Sottoscrivi"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr "Sei davvero sicuro?"
 
 #: cps/templates/book_edit.html:160
@@ -912,8 +939,8 @@ msgid "Search error!"
 msgstr "Errore di ricerca!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "Nessun risultato! Prova un'altra parola chiave."
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -1177,7 +1204,7 @@ msgstr "Leggere"
 msgid "Description:"
 msgstr "Descrizione :"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Aggiungi al ripiano"
 
@@ -1207,6 +1234,10 @@ msgstr "STATRTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "SMTP password"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "Dall'email"
@@ -1219,11 +1250,11 @@ msgstr "Salva le impostazioni"
 msgid "Save settings and send Test E-Mail"
 msgstr "Salvare le impostazioni e inviare Test e-mail"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "Prossimo"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "Cerca"
@@ -1232,67 +1263,67 @@ msgstr "Cerca"
 msgid "Discover (Random Books)"
 msgstr "Scoprire (Libri casuali)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Inizio"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "Hot Ebook"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Pubblicazioni popolari di questo catalogo in base ai download."
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "Libri più votati"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Pubblicazioni popolari di questo catalogo basate su Rating."
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "Nuovi libri"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "Gli ultimi Libri"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "Mostra libri casuali"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "Autori"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "Libri ordinati dall'autore"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "Libri ordinati per categoria"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "Libri ordinati per serie"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "Ripiani pubblici"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "I tuoi scaffali"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1400,8 +1431,8 @@ msgid "Log in with magic link"
 msgstr "Accedi con il collegamento magico"
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Catalogo EBook Caliber Web"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1439,6 +1470,22 @@ msgstr "Indirizzo e-mail"
 msgid "Your email address"
 msgstr "Il tuo indirizzo e-mail"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr "Utilizzando l'altro dispositivo, visita"
@@ -1465,10 +1512,6 @@ msgstr "Prova una ricerca diversa"
 msgid "Results for:"
 msgstr "Risultati per:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1502,8 +1545,8 @@ msgid "Delete this Shelf"
 msgstr "Cancellare questa libreria"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "Modifica nome scaffale"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 5ef4683c..99d1799c 100644
Binary files a/cps/translations/ja/LC_MESSAGES/messages.mo and b/cps/translations/ja/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 1318c706..4a7bebb9 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# Japanese translations for Calibre-web.
-# Copyright (C) 2017 Calibre-web
-# This file is distributed under the same license as the Calibre-web
+# Japanese translations for Calibre-Web.
+# Copyright (C) 2017 Calibre-Web
+# This file is distributed under the same license as the Calibre-Web
 # project.
 # FIRST AUTHOR white<space_white@yahoo.com>, 2017.
 # # Translation template file..
 # Copyright (C) 2011 Kovid Goyal
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -29,520 +29,557 @@ msgstr "インストールされません"
 msgid "Excecution permissions missing"
 msgstr "実行許可はありません"
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr "本ID %(book)d のepub拡張子は見つからない"
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "Calibre-webのテストメール"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "Calibre-Webのテストメール"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr "メールを送るための適切な拡張子は見つかりません"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "Kindleに送信する"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "タイトルを\"%s\"から\"%s\"の改名は失敗しました。エーラ: %s"
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "著者を\"%s\"から\"%s\"の改名は失敗しました。エーラ：%s"
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "更新パッケージを要求します"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "更新パッケージをダウンロードします"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "更新パッケージをZIP解凍します"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "ファイルを書き換えました"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "データベースの接続が閉じられました"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "サーバがシャットダウンされました"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完了、Okayまたは再読み込みボタンを押してください"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr "最近追加された本"
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr "最新の本"
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr "最古の本"
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr "本(A-Z)"
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr "本 (Z-A)"
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "有名な本(ダウンロード数)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "最高評判の本"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "任意の本"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "著者リスト"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "叢書リスト"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書: %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "利用可能な言語"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "カテゴリーリスト"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリー: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました、ページを再読み込みしてください"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンします、ページを閉じてください"
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "更新完了"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "検索"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "既読の本"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "未読の本"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "未知のエーラが発生しました、再度試してください"
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "ユーザ名またはメールアドレスは使われました"
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログインします"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードは間違いました"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "ログイン"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr "トークンは見つかりません"
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr "トークンは失効されました"
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr "成功しまた！端末に戻ってください"
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "SMTPメールをまず設定してください"
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信する際にエーラが発生しました"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Kindleのメールアドレスをまず設定してください"
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "本 %(sname)s を書架に追加されました"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "本 %(sname)s を書架から除去されました"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "名前を使った書架 '%(title)s'　は既に存在しました"
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架%(title)s は作成されました"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "エーラが発生しました"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "書架を作成する"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 変わりました"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "書架を編集する"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "%(name)s の書架を削除されました"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "書架を開けません。書架は存在しないまたはアクセスできません"
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' の書架の順番を入れ替える"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "このメールアドレスを使ったアカウント名は既に存在します"
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sのプロファイル"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "プロファイルが更新されました"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web 設定を更新されました"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web 設定を更新されました"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ログファイルの場所は不適切です。正しい場所を入力してください"
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "データベースの場所は不適切です。正しい場所を入力してください"
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ　'%(user)s' が作成されました"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr "同じメールアドレスまたは通所は既に存在しました"
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "メール設定が更新されました"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "テストメールから%(kindlemail)sまでの送信は完了しました"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "テストメールに送信するエラーが発生しました: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "メール設定更新されました"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "メール編集設定"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' 削除されました"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' 更新されました"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "不明のエーラが発生しました"
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "ユーザ編集 %(nick)s"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "メタデータを編集します"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 \"%s\" をこのサーバにアップロードする許可はありません"
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "ファイルをアップロードするために拡張子が必要です"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "場所 %s の作成を失敗しました (許可拒否)"
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr "フアイル %s の保存を失敗しました"
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr "不明"
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "ファイル %s の保存を失敗しました (許可拒否)"
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "ファイル %s の削除を失敗しました (許可拒否)"
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -556,29 +593,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen 失敗しました、エーラ %(error)s. メッセージ: %(message)s"
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "このメールはcalibre webより送信されました"
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -586,170 +623,159 @@ msgstr ""
 msgid "User list"
 msgstr "ユーザリスト"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "通称"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr "メール"
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "管理者"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "ダウンロード"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "アップロード"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "編集"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "パスワード"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "SMTPメール設定"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "SMTPホスト名"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "SMTPポート"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "SMTP ログイン"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "SMTP パスワード"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "メールから"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "SMTP設定を変更する"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "設定"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Calibre データベースの場所"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "ログレベル"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "ポート"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "本数毎ページ"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "アップロード中"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "公的登録"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "匿名ブラウジング"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr "遠距離ログイン"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr "現在コミットのタイムスタンプ"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr "最新コミットのタイムスタンプ"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "Calibreデータベースに再接続します"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "Calibre-webを再起動します"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "Calibre-Webを再起動します"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "Calibre-webを停止します"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "Calibre-Webを停止します"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "更新を確認します"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "更新を実行します"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
-msgstr "Calibre-webを再起動します。宜しいですか?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "Calibre-Webを再起動します。宜しいですか?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "はい"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "戻る"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
-msgstr "Calibre-webを停止します。宜しいですか?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "Calibre-Webを停止します。宜しいですか?"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "更新中、ページ再読み込みしないでください"
 
@@ -774,6 +800,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr "削除"
 
@@ -844,13 +871,13 @@ msgstr "メタデータを取得します"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "提出"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr "宜しいですか?"
 
 #: cps/templates/book_edit.html:160
@@ -899,8 +926,8 @@ msgid "Search error!"
 msgstr "検索エーラ!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "結果なし! 他のキーワードで検索してください。"
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -960,7 +987,7 @@ msgstr ""
 
 #: cps/templates/config_edit.html:115
 msgid "Location and name of logfile (calibre-web.log for no entry)"
-msgstr "ログファイルの場所と名前 (エントリーなしでcalibre-web.log)"
+msgstr ""
 
 #: cps/templates/config_edit.html:126
 msgid "Feature Configuration"
@@ -1164,7 +1191,7 @@ msgstr "読む"
 msgid "Description:"
 msgstr "詳細:"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "書架に追加"
 
@@ -1192,6 +1219,10 @@ msgstr "STARTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "SMTP パスワード"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "メールより"
@@ -1204,11 +1235,11 @@ msgstr "設定を保存する"
 msgid "Save settings and send Test E-Mail"
 msgstr "設定を保存するとテストメールを送信する"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "次"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "検索"
@@ -1217,67 +1248,67 @@ msgstr "検索"
 msgid "Discover (Random Books)"
 msgstr "発見 (任意の本)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "開始"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "最新の本"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "ダウンロードによりカタログの有名な出版"
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "最高評価の本"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "評価によりカタログの有名な出版"
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "新しい本"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "最近の本"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "任意の本を表示する"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "著者"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "著者の名前で並び替える"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "カテゴリーで並び替える"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "叢書で並び替える"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "公的の叢書"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "公的の叢書に選び分ける、みんなに見える"
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "あなたの叢書"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "ユーザ自身の叢書、自分しか見えない"
 
@@ -1385,8 +1416,8 @@ msgid "Log in with magic link"
 msgstr "マジックリンクでログインする"
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Calibreウェブ電子本のカタログ"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1424,6 +1455,22 @@ msgstr "メールアドレス"
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr "他の端末を使っています"
@@ -1448,10 +1495,6 @@ msgstr "他の検索を試してくだい"
 msgid "Results for:"
 msgstr "結果:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1485,8 +1528,8 @@ msgid "Delete this Shelf"
 msgstr "この叢書を削除"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "叢書の名前を編集する"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index c7001bd6..24b031b8 100644
Binary files a/cps/translations/nl/LC_MESSAGES/messages.mo and b/cps/translations/nl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 9bb4a307..6aac613f 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# Dutch translations for Calibre-web
-# Copyright (C) 2017 Calibre-web
-# This file is distributed under the same license as the Calibre-web
+# Dutch translations for Calibre-Web
+# Copyright (C) 2017 Calibre-Web
+# This file is distributed under the same license as the Calibre-Web
 # project.
 # translation by Ed Driesen
 # FIRST AUTHOR <ed.driesen@telenet.be>, 2017.
@@ -20,9 +20,9 @@
 # W.P.M.E. Hofland <wpme.hofland@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Calibre-web dutch translation by Ed Driesen (GPL V3)\n"
+"Project-Id-Version: Calibre-Web dutch translation by Ed Driesen (GPL V3)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2017-06-21 20:15+0200\n"
 "Last-Translator: \n"
 "Language: nl\n"
@@ -42,524 +42,561 @@ msgstr "niet geïnstalleerd"
 msgid "Excecution permissions missing"
 msgstr "Rechten om uit te voeren ontbreken"
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr "epub type niet gevonden voor boek met id: %(book)d"
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "Calibre-web test email"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "Calibre-Web test email"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Kon geen geschikte formaten vinden om te verzenden per email"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "Stuur naar Kindle:"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "Update pakket wordt aangevraagd"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "Update pakket wordt gedownload"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "Update pakket wordt uitgepakt"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "Bestanden zijn vervangen"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "Database verbindingen zijn gesloten"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "Server is gestopt"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op ok en herlaad de pagina"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr "Recent toegevoegde boeken"
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr "Nieuwste boeken"
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr "Oudste boeken"
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr "Boeken (A-Z)"
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr "Boeken (A-Z)"
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "Populaire boeken (meeste downloads)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "Best beoordeelde boeken"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "Willekeurige boeken"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "Auteur lijst"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Fout bij openen van het boek. Bestand bestaat niet of is niet "
 "toegankelijk:"
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "Serie lijst"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "Beschikbare talen"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "Categorie lijst"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "Server herstart, gelieve de pagina herladen"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met het stoppen van de server, gelieve venster te sluiten"
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "Update voltooid"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "zoek"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "Gelezen Boeken"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "Ongelezen Boeken"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "Gelieve alle velden in te vullen!"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "registreer"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "Een onbekende fout deed zich voor. Gelieve later nog eens te proberen."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "Deze gebruikersnaam of dit emailadres is reeds in gebruik."
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent nu ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of Wachtwoord"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "login"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr "Token niet gevonden"
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr "Token is verlopen"
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Gelieve de SMTP mail instellingen eerst te configureren..."
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Er trad een fout op bij het versturen van dit boek: %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Gelieve eerst je kindle email adres te configureren..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Boek werd toegevoegd aan boekenplank: %(sname)s"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Boek werd verwijderd van boekenplank: %(sname)s"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Een boekenplank met de naam '%(title)s' bestaat reeds."
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank %(title)s aangemaakt"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "Er deed zich een fout voor"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "maak een boekenplank"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank %(title)s gewijzigd"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "Bewerk een boekenplank"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Boekenplank %(name)s succesvol gewist"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 "Fout bij openen boekenplank. Boekenplank bestaat niet of is niet "
 "toegankelijk"
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Verander volgorde van Boekenplank: '%(name)s'"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "Een bestaand gebruiker gevonden voor dit email adres."
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "Profiel aangepast"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "Administratie pagina"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web configuratie aangepast"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web configuratie aangepast"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB locatie is niet geldig, gelieve het correcte pad in te geven"
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "Voeg nieuwe gebruiker toe"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr "Een bestaande gebruiker gevonden voor dit emailadres of gebruikersnaam."
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "Mail instellingen aangepast"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "Test email met succes verstuurd naar %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "Er trad een fout op met het versturen van de test email: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "Email instellingen aangepast"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "Bewerk mail instellingen"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' aangepast"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "Een onbekende fout deed zich voor."
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Bewerk gebruiker '%(nick)s'"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Fout bij openen eBook. Het bestand bestaat niet of is niet toegankelijk"
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "Bewerk metadata"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Het uploaden van bestandsextensie \"%s\" is niet toegestaan op deze server"
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "Up te loaden bestanden dienen een extensie te hebben"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Het pad %s aanmaken mislukt (Geen toestemming)."
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr "Bestand opslaan niet gelukt voor %s."
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr "onbekend"
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Bestand %s opslaan mislukt (Geen toestemming)."
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Bestand %s wissen mislukt (Geen toestemming)."
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -573,29 +610,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen gefaald met Error %(error)s. Bericht: %(message)s"
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "Deze mail werd verstuurd met calibre web."
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -603,170 +640,159 @@ msgstr ""
 msgid "User list"
 msgstr "Gebruikerslijst"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr "Email"
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindlle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "Administratie"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "Upload"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "Bewerk"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "Wachtwoord"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "SMTP mail instellingen"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "SMTP hostnaam"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "SMTP poort"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "SMTP login"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "SMTP wachtwoord"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "Van mail"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "Bewerk SMTP instellingen"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Calibre DB map"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "Log niveau"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "Poort"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Boeken per pagina"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "Aan het uploaden"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "Publieke registratie"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "Anoniem verkennen"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr "Login op afstand"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "Administratie"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr "Huidige commit tijdsstempel"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr "Nieuwste commit tijdsstempel"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "Herverbinden met calibre DB"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "Herstart Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "Herstart Calibre-Web"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "Stop Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "Stop Calibre-Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "Controleer voor update"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "Voer update uit"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
-msgstr "Wil je Calibre-web echt herstarten?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "Wil je Calibre-Web echt herstarten?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "Terug"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
-msgstr "Wil je Calibre-web echt stoppen?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "Wil je Calibre-Web echt stoppen?"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "Aan het updaten, gelieve de pagina niet te herladen"
 
@@ -791,6 +817,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr "Wis"
 
@@ -861,13 +888,13 @@ msgstr "Verkrijg metadata"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Opslaan"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr "Ben je zeker?"
 
 #: cps/templates/book_edit.html:160
@@ -916,8 +943,8 @@ msgid "Search error!"
 msgstr "Zoek fout!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "Geen resultaat! Gelieve een ander zoekwoord proberen"
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -1181,7 +1208,7 @@ msgstr "Lees"
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Voeg toe aan boekenplank"
 
@@ -1211,6 +1238,10 @@ msgstr "STARTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "SMTP wachtwoord"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "Van email"
@@ -1223,11 +1254,11 @@ msgstr "Bewaar instelling"
 msgid "Save settings and send Test E-Mail"
 msgstr "Bewaar instellingen en stuur test email"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "Volgende"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "Zoek"
@@ -1236,67 +1267,67 @@ msgstr "Zoek"
 msgid "Discover (Random Books)"
 msgstr "Ontdek (Willekeurige Boeken)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Start"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "Populaire Boeken"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Populaire publicaties van deze cataloog gebaseerd op Downloads."
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "Best beoordeeld"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Populaire publicaties van deze cataloog gebaseerd op Beoordeling."
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "Nieuwe Boeken"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "Recentste boeken"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "Toon Willekeurige Boeken"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "Boeken gesorteerd op Auteur"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "Boeken gesorteerd op Categorie"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "Boeken gesorteerd op Serie"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "Publieke Boekenplanken"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "Jou Boekenplanken"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1404,8 +1435,8 @@ msgid "Log in with magic link"
 msgstr "Inloggen met magische koppeling"
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Calible web ebook cataloog"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1443,6 +1474,22 @@ msgstr "Email adres"
 msgid "Your email address"
 msgstr "Jou email adres"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr "Bezoek met je andere apparaat"
@@ -1467,10 +1514,6 @@ msgstr "Gelieve een ander zoekwoord proberen"
 msgid "Results for:"
 msgstr "Resultaten voor:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1504,8 +1547,8 @@ msgid "Delete this Shelf"
 msgstr "Wis deze boekenplank"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "Bewerk boekenplank naam"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 1d5d0071..39b6cdc4 100644
Binary files a/cps/translations/pl/LC_MESSAGES/messages.mo and b/cps/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 0ed7ca56..771b54a1 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2017-04-11 22:51)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2017-04-11 22:51+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -33,522 +33,559 @@ msgstr "nie zainstalowane"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "Calibre-web testowy email"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "Calibre-Web testowy email"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 "Nie można znaleźć żadnych formatów przystosowane do wysyłania pocztą "
 "e-mail"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "Wyślij do Kindle"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "Pliki zostały zastąpione"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "Serwer jest zatrzymany"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "Najlepiej oceniane książki"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "Losowe książki"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "Lista autorów"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:"
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "Lista serii"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seria: %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "Dostępne języki"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "Lista kategorii"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "Aktualizacja zakończona"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "szukaj"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "Przeczytane książki"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "Nieprzeczytane książki"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "Nazwa użytkownika lub adres e-mail jest już w użyciu."
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Proszę najpierw skonfigurować adres e-mail swojego kindla..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Książka została dodana do półki: %(sname)s"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Książka została usunięta z półki: %(sname)s"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Półka o nazwie '%(title)s' już istnieje."
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "utwórz półkę"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "pomyślnie usunięto półkę %(name)s"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "Portal administracyjny"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Konfiguracja Calibre-web została zaktualizowana"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wpisz poprawną ścieżkę"
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy użytkownika."
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "Zaktualizowano ustawienia poczty e-mail"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "Testowy e-mail został pomyślnie wysłany do %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "Wystąpił błąd podczas wysyłania testowej wiadomości e-mail: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "Zaktualizowano ustawienia e-mail"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "Edytuj ustawienia poczty e-mail"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku \"%s\" nie jest dozwolone do przesłania na ten serwer"
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do przesłania musi mieć rozszerzenie"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)."
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)."
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)."
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -562,29 +599,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "Ten e-mail został wysłany przez Calibre Web."
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -592,170 +629,159 @@ msgstr ""
 msgid "User list"
 msgstr "Lista użytkowników"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "Nazwa użytkownika"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr "Email"
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "Portal administracyjny"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "Pobierz"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "Wyślij"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "Edytuj"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "Zmiana hasła"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "Ustawienia poczty SMTP"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "Adres serwera SMTP"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "Port serwera SMTP"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "Nazwa użytkownika SMTP"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "Hasło SMTP"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "Wyślij z adresu e-mail"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "Poziom logów"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Ilość książek na stronie"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "Wysyłanie"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "Publiczna rejestracja"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "Anonimowe przeglądanie"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr "Znacznik czasowy zainstalowanej wersji"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr "Znacznik czasowy nowej wersji"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "Połącz ponownie z bazą danych Calibre"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
 msgstr "Uruchom ponownie Calibre Web"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
 msgstr "Zatrzymaj Calibre Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "OK"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "Wróć"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -780,6 +806,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr ""
 
@@ -850,13 +877,13 @@ msgstr "Uzyskaj metadane"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Wyślij"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr ""
 
 #: cps/templates/book_edit.html:160
@@ -905,8 +932,8 @@ msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "Brak wyników! Spróbuj innego słowa kluczowego."
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -1171,7 +1198,7 @@ msgstr "Czytaj"
 msgid "Description:"
 msgstr "Opis:"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
@@ -1201,6 +1228,10 @@ msgstr "STARTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "Hasło SMTP"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "Z adresu e-mail"
@@ -1213,11 +1244,11 @@ msgstr "Zapisz ustawienia"
 msgid "Save settings and send Test E-Mail"
 msgstr "Zapisz ustawienia i wyślij testową wiadomość e-mail"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "Następne"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "Szukaj"
@@ -1226,67 +1257,67 @@ msgstr "Szukaj"
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Rozpocznij"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "Najpopularniejsze książki"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Popularne publikacje z tego katalogu bazujące na pobranych."
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "Najlepiej ocenione książki"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Popularne publikacje z tego katalogu bazujące na ocenach."
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "Nowe książki"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "Ostatnie książki"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "Autorzy"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "Książki sortowane według autorów"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "Książki sortowane według kategorii"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "Książki sortowane według serii"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "Publiczne półki"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "Twoje półki"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1394,8 +1425,8 @@ msgid "Log in with magic link"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Calibre Web katalog ebooków"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1434,6 +1465,22 @@ msgstr "Adres e-mail"
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr ""
@@ -1458,10 +1505,6 @@ msgstr "Proszę wypróbować podobne wyszukiwanie"
 msgid "Results for:"
 msgstr "Wyniki dla:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1495,8 +1538,8 @@ msgid "Delete this Shelf"
 msgstr "Usuń tą półkę"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "Edytuj nazwę półki"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 1c912c34..4f637043 100644
Binary files a/cps/translations/ru/LC_MESSAGES/messages.mo and b/cps/translations/ru/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index ddeab9c4..e83d50fd 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# Перевод на русский язык для Calibre-web.
+# Перевод на русский язык для Calibre-Web.
 # Copyright (C) 2017 Pavel Korovin
-# This file is distributed under the same license as the Calibre-web project
+# This file is distributed under the same license as the Calibre-Web project
 # Pavel Korovin <p@tristero.se>, 2017.
 #
 # Translators:
@@ -12,9 +12,9 @@
 # Сергей <boss-rom@yandex.ru>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: Pavel Korovin <p@tristero.se>\n"
 "Language: ru\n"
@@ -35,520 +35,557 @@ msgstr "Отсутствует"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "Тестовое письмо от Calibre-web"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "Тестовое письмо от Calibre-Web"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Невозоможно найти формат, подходящий для отправки по email"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "Отправить на Kindle"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "Файлы заменены"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "Соеднинения с базой данных закрыты"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "Сервер остановлен"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите okay и перезагрузите страницу"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "Книги с наивысшим рейтингом"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "Случайный выбор"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "Авторы"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "Серии"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "Языки"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "Категории"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, перезагрузите страницу"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "Обновление закончено"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "поиск"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "Прочитанные"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "Непрочитанные"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "Читать книгу"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "зарегистрироваться"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "Неизвестная ошибка. Пожалуйста, попробуйте позже."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "Имя пользователя или адрес эл. почты уже используется"
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как пользователь '%(nickname)s'"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "войти"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ошибка при отправке книги: %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "Пожалуйста, сначала укажите ваш kindle email..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Книга добавлена на книжную полку: %(sname)s"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга удалена с книжной полки: %(sname)s"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Книжкная полка с названием '%(title)s' уже существует."
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана книжная полка %(title)s"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "создать книжную полку"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжная полка %(title)s изменена"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "Изменить книжную полку"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Книжная полка %(name)s удалена"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжная полка: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение книжной полки '%(name)s'"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "Найдена учётная запись для для данного адреса email."
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Конфигурация Calibre-web обновлена"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "Неверный путь к фалу БД, пожалуйста, укажите правильное расположение БД"
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr "Для указанного адреса или имени найдена существующая учётная запись."
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "Настройки почты изменены"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "Тестовое сообщение успешно отправлено на адрес %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "Ошибка отправки тестового сообщения: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "Обновлены настройки e-mail"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "Изменить почтовые настройки"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением \"%s\""
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Ошибка при создании пути %s (доступ запрещён)"
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr "неизвестно"
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Ошибка записи файоа %s (доступ запрещён)"
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Ошибка удаления файла %s (доступ запрещён)"
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -562,29 +599,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "Письмо было отправлено через calibre web"
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -592,170 +629,159 @@ msgstr ""
 msgid "User list"
 msgstr "Список пользователей"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "Имя пользователя"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr ""
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr "Kindle"
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "Управление"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "Скачать"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "Загрузить"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "Редактировать"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "Менять пароль"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "Параметры SMTP"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr ""
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "Пароль SMTP"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "Отправитель"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "Настройки сервера"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "Уровень логирования"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Количество книг на странице"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "Загрузка на сервер"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "Публичная регистрация"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "Анонимный просмотр"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "Управление"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "Переподключиться к БД Calibre"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "Перезагрузить Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "Перезагрузить Calibre-Web"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "Остановить Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "Остановить Calibre-Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
-msgstr "Вы действительно хотите перезагрузить Calibre-web?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "Назад"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
-msgstr "Вы действительно хотите остановить Calibre-web?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу."
 
@@ -780,6 +806,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr "Удалить"
 
@@ -850,13 +877,13 @@ msgstr "Получить метаданные"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Отправить"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr "Вы действительно уверены?"
 
 #: cps/templates/book_edit.html:160
@@ -905,8 +932,8 @@ msgid "Search error!"
 msgstr "Ошибка поиска!"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "Нет результатов. Пожалуйста, попробуйте другое ключевое слово"
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -1170,7 +1197,7 @@ msgstr "Прочитано"
 msgid "Description:"
 msgstr "Описание:"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
@@ -1198,6 +1225,10 @@ msgstr "STARTTLS"
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "Пароль SMTP"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "Адрес отправителя"
@@ -1210,11 +1241,11 @@ msgstr "Сохранить настройки"
 msgid "Save settings and send Test E-Mail"
 msgstr "Сохранить настройки и отправить тестовое письмо"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "Дальше"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "Поиск"
@@ -1223,67 +1254,67 @@ msgstr "Поиск"
 msgid "Discover (Random Books)"
 msgstr "Обзор (случайные книги)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Старт"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "Популярные книги"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Популярные книги в этом каталоге, на основе количества скачиваний"
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Популярные книги из этого каталога на основании рейтинга"
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "Новые"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "Последние поступления"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "Показывать случайные книги"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "Авторы"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "Книги, отсортированные по автору"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "Книги, отсортированные по категории"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "Книги, отсортированные по серии"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "Общие книжные полки"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "Ваши книжные полки"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1391,8 +1422,8 @@ msgid "Log in with magic link"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
-msgstr "Каталог электронных книг Calibre Web"
+msgid "Calibre-Web ebook catalog"
+msgstr ""
 
 #: cps/templates/read.html:69
 msgid "Settings"
@@ -1430,6 +1461,22 @@ msgstr "Электронная почта"
 msgid "Your email address"
 msgstr "Ваш email-адрес"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr ""
@@ -1454,10 +1501,6 @@ msgstr "Попробуйте изменить критерии поиск"
 msgid "Results for:"
 msgstr "Результаты для:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1491,8 +1534,8 @@ msgid "Delete this Shelf"
 msgstr "Удалить эту книжную полку"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "Изменить имя книжной полки"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 783fbfb2..61ca4eb7 100644
Binary files a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index eb36736a..cc9f7a97 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
-# Chinese (Simplified, China) translations for Calibre-web.
-# Copyright (C) 2017 Calibre-web
-# This file is distributed under the same license as the Calibre-web
+# Chinese (Simplified, China) translations for Calibre-Web.
+# Copyright (C) 2017 Calibre-Web
+# This file is distributed under the same license as the Calibre-Web
 # project.
 # FIRST AUTHOR dalin <dalin.lin@gmail.com>, 2017.
 # # Translation template file..
@@ -13,9 +13,9 @@
 # Wang Vincent <susemm@163.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"Project-Id-Version:  Calibre-Web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: 2017-01-06 17:00+0000\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -35,520 +35,557 @@ msgstr "未安装"
 msgid "Excecution permissions missing"
 msgstr "可执行权限缺失"
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr "没有找到书籍ID %(book)d 的epub格式"
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
-msgstr "Calibre-web 测试邮件"
-
 #: cps/helper.py:80
+msgid "Calibre-Web test email"
+msgstr "Calibre-Web 测试邮件"
+
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr "无法找到适合邮件发送的格式"
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr "文件已替换"
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr "服务器已停止"
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请按确定并刷新页面"
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr "最近添加的书籍"
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr "最新书籍"
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr "最旧书籍"
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr "书籍 (A-Z)"
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr "书籍 (Z-A)"
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr "热门书籍(最多下载)"
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr "最高评分书籍"
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr "随机书籍"
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr "作者列表"
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr "丛书列表"
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr "可用语言"
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr "分类列表"
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr "更新完成"
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr "搜索"
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr "已读书籍"
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
-msgstr "发生一个未知错误。请稍后再试。"
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
+msgstr ""
+
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr "此用户名或邮箱已被使用。"
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr "请先配置您的kindle电子邮箱地址..."
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书已被添加到书架: %(sname)s"
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "已存在书架 '%(title)s'。"
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已被创建"
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr "创建书架"
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已被修改"
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "成功删除书架 %(name)s"
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr "找到已使用此邮箱的账号。"
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web配置已更新"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web配置已更新"
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB位置无效，请输入正确路径"
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr "已存在使用此邮箱或昵称的账号。"
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
-msgstr "邮箱设置已更新"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
+msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
-msgstr "测试邮件已成功发送到 %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr "发送测试邮件时发生错误: %(res)s"
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
-msgstr "E-Mail 设置已更新"
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
-msgstr "编辑邮箱设置"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
+msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "不能上传后缀为　\"%s\"　的文件到此服务器"
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须有一个后缀"
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "创建路径 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr "未知"
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "存储文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "删除文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -562,29 +599,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen 因为错误 %(error)s 失败。消息： %(message)s"
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
-msgstr "此邮件由calibre web发送"
+msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -592,170 +629,159 @@ msgstr ""
 msgid "User list"
 msgstr "用户列表"
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr "昵称"
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr ""
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr ""
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr ""
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr "管理"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr "下载"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr "上传"
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr "编辑"
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr "修改密码"
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
-msgstr "SMTP设置"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
+msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr "SMTP地址"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr "SMTP用户名"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr "SMTP密码"
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr "来自邮箱"
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr "修改SMTP设置"
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr "配置"
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr "Calibre DB目录"
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr "日志级别"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "每页书籍数"
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr "上传"
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr "开放注册"
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr "匿名浏览"
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr "远程登录"
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr "当前提交时间戳"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr "最新提交时间戳"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
-msgstr "重启 Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
+msgstr "重启 Calibre-Web"
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
-msgstr "停止 Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
+msgstr "停止 Calibre-Web"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
-msgstr "您确定要重启 Calibre-web 吗？"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "您确定要重启 Calibre-Web 吗？"
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "确定"
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr "后退"
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
-msgstr "您确定要关闭 Calibre-web 吗？"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "您确定要关闭 Calibre-Web 吗？"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -780,6 +806,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr "删除"
 
@@ -850,13 +877,13 @@ msgstr "获取元数据"
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "提交"
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr "您真的确认？"
 
 #: cps/templates/book_edit.html:160
@@ -905,8 +932,8 @@ msgid "Search error!"
 msgstr "搜索错误"
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
-msgstr "没有结果!请尝试别的关键字."
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr ""
 
 #: cps/templates/config_edit.html:12
 msgid "Library Configuration"
@@ -1170,7 +1197,7 @@ msgstr ""
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr "添加到书架"
 
@@ -1198,6 +1225,10 @@ msgstr ""
 msgid "SSL/TLS"
 msgstr ""
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr "SMTP密码"
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr "来自邮箱"
@@ -1210,11 +1241,11 @@ msgstr "保存设置"
 msgid "Save settings and send Test E-Mail"
 msgstr "保存设置并发送测试邮件"
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr "下一个"
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr "搜索"
@@ -1223,67 +1254,67 @@ msgstr "搜索"
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr "开始"
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr "热门书籍"
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "基于下载数的热门书籍"
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr "最高评分书籍"
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr "基于评分的热门书籍"
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr "新书"
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr "最新书籍"
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr "作者"
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr "书籍按作者排序"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr "书籍按分类排序"
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr "书籍按丛书排序"
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr "公开书架"
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr "您的书架"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1391,7 +1422,7 @@ msgid "Log in with magic link"
 msgstr "通过魔法链接登录"
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
+msgid "Calibre-Web ebook catalog"
 msgstr ""
 
 #: cps/templates/read.html:69
@@ -1430,6 +1461,22 @@ msgstr "邮箱地址"
 msgid "Your email address"
 msgstr "您的邮箱地址"
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr "使用您的另一个设备访问"
@@ -1454,10 +1501,6 @@ msgstr "请尝试别的关键字"
 msgid "Results for:"
 msgstr "结果:"
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1491,8 +1534,8 @@ msgid "Delete this Shelf"
 msgstr "删除此书架"
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
-msgstr "编辑书架名"
+msgid "Edit Shelf"
+msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
 msgid "Change order"
diff --git a/cps/ub.py b/cps/ub.py
index ccc85e0b..d2d6a25d 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -149,7 +149,7 @@ class UserBase:
         return '<User %r>' % self.nickname
 
 
-# Baseclass for Users in Calibre-web, settings which are depending on certain users are stored here. It is derived from
+# Baseclass for Users in Calibre-Web, settings which are depending on certain users are stored here. It is derived from
 # User Base (all access methods are declared there)
 class User(UserBase, Base):
     __tablename__ = 'user'
@@ -216,7 +216,7 @@ class Shelf(Base):
         return '<Shelf %r>' % self.name
 
 
-# Baseclass representing Relationship between books and Shelfs in Calibre-web in app.db (N:M)
+# Baseclass representing Relationship between books and Shelfs in Calibre-Web in app.db (N:M)
 class BookShelf(Base):
     __tablename__ = 'book_shelf_link'
 
@@ -259,6 +259,17 @@ class Downloads(Base):
     def __repr__(self):
         return '<Download %r' % self.book_id
 
+        
+# Baseclass representing allowed domains for registration
+class Registration(Base):
+    __tablename__ = 'registration'
+
+    id = Column(Integer, primary_key=True)
+    domain = Column(String)
+
+    def __repr__(self):
+        return u"<Registration('{0}')>".format(self.domain)      
+        
 
 # Baseclass for representing settings in app.db with email server settings and Calibre database settings
 # (application settings)
@@ -276,7 +287,7 @@ class Settings(Base):
     config_port = Column(Integer, default=DEFAULT_PORT)
     config_certfile = Column(String)
     config_keyfile = Column(String)
-    config_calibre_web_title = Column(String, default=u'Calibre-web')
+    config_calibre_web_title = Column(String, default=u'Calibre-Web')
     config_books_per_page = Column(Integer, default=60)
     config_random_books = Column(Integer, default=4)
     config_read_column = Column(Integer, default=0)
@@ -516,35 +527,18 @@ class Config:
 # everywhere to curent should work. Migration is done by checking if relevant coloums are existing, and than adding
 # rows with SQL commands
 def migrate_Database():
-    if not engine.dialect.has_table(engine.connect(), "book_read_link"):
-        ReadBook.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "bookmark"):
         Bookmark.__table__.create(bind=engine)
-
-    try:
-        session.query(exists().where(User.locale)).scalar()
-        session.commit()
-    except exc.OperationalError:  # Database is not compatible, some rows are missing
+    if not engine.dialect.has_table(engine.connect(), "registration"):
+        ReadBook.__table__.create(bind=engine)
         conn = engine.connect()
-        conn.execute("ALTER TABLE user ADD column locale String(2) DEFAULT 'en'")
-        conn.execute("ALTER TABLE user ADD column default_language String(3) DEFAULT 'all'")
-        session.commit()
-    try:
-        session.query(exists().where(Settings.config_calibre_dir)).scalar()
+        conn.execute("insert into registration (domain) values('%.%')")
         session.commit()
-    except exc.OperationalError:  # Database is not compatible, some rows are missing
+    # Handle table exists, but no content
+    cnt = session.query(Registration).count()
+    if not cnt:
         conn = engine.connect()
-        conn.execute("ALTER TABLE Settings ADD column `config_calibre_dir` String")
-        conn.execute("ALTER TABLE Settings ADD column `config_port` INTEGER DEFAULT 8083")
-        conn.execute("ALTER TABLE Settings ADD column `config_calibre_web_title` String DEFAULT 'Calibre-web'")
-        conn.execute("ALTER TABLE Settings ADD column `config_books_per_page` INTEGER DEFAULT 60")
-        conn.execute("ALTER TABLE Settings ADD column `config_random_books` INTEGER DEFAULT 4")
-        conn.execute("ALTER TABLE Settings ADD column `config_title_regex` String DEFAULT "
-            "'^(A|The|An|Der|Die|Das|Den|Ein|Eine|Einen|Dem|Des|Einem|Eines)\s+'")
-        conn.execute("ALTER TABLE Settings ADD column `config_log_level` SmallInteger DEFAULT " + str(logging.INFO))
-        conn.execute("ALTER TABLE Settings ADD column `config_uploading` SmallInteger DEFAULT 0")
-        conn.execute("ALTER TABLE Settings ADD column `config_anonbrowse` SmallInteger DEFAULT 0")
-        conn.execute("ALTER TABLE Settings ADD column `config_public_reg` SmallInteger DEFAULT 0")
+        conn.execute("insert into registration (domain) values('%.%')")
         session.commit()
     try:
         session.query(exists().where(Settings.config_use_google_drive)).scalar()
@@ -553,6 +547,7 @@ def migrate_Database():
         conn.execute("ALTER TABLE Settings ADD column `config_use_google_drive` INTEGER DEFAULT 0")
         conn.execute("ALTER TABLE Settings ADD column `config_google_drive_folder` String DEFAULT ''")
         conn.execute("ALTER TABLE Settings ADD column `config_google_drive_watch_changes_response` String DEFAULT ''")
+        session.commit()        
     try:
         session.query(exists().where(Settings.config_columns_to_ignore)).scalar()
     except exc.OperationalError:
@@ -561,14 +556,12 @@ def migrate_Database():
         session.commit()
     try:
         session.query(exists().where(Settings.config_default_role)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE Settings ADD column `config_default_role` SmallInteger DEFAULT 0")
         session.commit()
     try:
         session.query(exists().where(BookShelf.order)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE book_shelf_link ADD column 'order' INTEGER DEFAULT 1")
@@ -576,7 +569,6 @@ def migrate_Database():
     try:
         create = False
         session.query(exists().where(User.sidebar_view)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE user ADD column `sidebar_view` Integer DEFAULT 1")
@@ -606,6 +598,7 @@ def migrate_Database():
     except exc.OperationalError:
         conn = engine.connect()
         conn.execute("ALTER TABLE user ADD column `theme` INTEGER DEFAULT 0")
+        session.commit()
     if session.query(User).filter(User.role.op('&')(ROLE_ANONYMOUS) == ROLE_ANONYMOUS).first() is None:
         create_anonymous_user()
     try:
@@ -627,21 +620,18 @@ def migrate_Database():
         conn.execute("ALTER TABLE Settings ADD column `config_mature_content_tags` String DEFAULT ''")
     try:
         session.query(exists().where(Settings.config_default_show)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE Settings ADD column `config_default_show` SmallInteger DEFAULT 2047")
         session.commit()
     try:
         session.query(exists().where(Settings.config_logfile)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE Settings ADD column `config_logfile` String DEFAULT ''")
         session.commit()
     try:
         session.query(exists().where(Settings.config_certfile)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE Settings ADD column `config_certfile` String DEFAULT ''")
@@ -649,14 +639,12 @@ def migrate_Database():
         session.commit()
     try:
         session.query(exists().where(Settings.config_read_column)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE Settings ADD column `config_read_column` INTEGER DEFAULT 0")
         session.commit()
     try:
         session.query(exists().where(Settings.config_ebookconverter)).scalar()
-        session.commit()
     except exc.OperationalError:  # Database is not compatible, some rows are missing
         conn = engine.connect()
         conn.execute("ALTER TABLE Settings ADD column `config_ebookconverter` INTEGER DEFAULT 0")
diff --git a/cps/web.py b/cps/web.py
index 550ecfba..a90ef62d 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -2,9 +2,7 @@
 # -*- coding: utf-8 -*-
 try:
     from googleapiclient.errors import HttpError
-    # gdrive_support = True
 except ImportError:
-    # gdrive_support = False
     pass
 
 try:
@@ -87,6 +85,7 @@ except ImportError:
 
 import time
 import server
+import random
 
 current_milli_time = lambda: int(round(time.time() * 1000))
 
@@ -94,7 +93,8 @@ current_milli_time = lambda: int(round(time.time() * 1000))
 # Global variables
 gdrive_watch_callback_token = 'target=calibreweb-watch_files'
 
-ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx', 'fb2'])
+ALLOWED_EXTENSIONS = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx',
+                      'fb2'}
 
 
 def md5(fname):
@@ -186,8 +186,8 @@ db.setup_db()
 
 
 def is_gdrive_ready():
-    return os.path.exists(os.path.join(config.get_main_dir,'settings.yaml')) and \
-           os.path.exists(os.path.join(config.get_main_dir,'gdrive_credentials'))
+    return os.path.exists(os.path.join(config.get_main_dir, 'settings.yaml')) and \
+           os.path.exists(os.path.join(config.get_main_dir, 'gdrive_credentials'))
 
 
 @babel.localeselector
@@ -288,10 +288,10 @@ class Pagination(object):
     def has_next(self):
         return self.page < self.pages
 
-    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shown
-    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shown
-    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shown
-    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shown
+    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shwn
+    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shwn
+    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shwn
+    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shwn
     def iter_pages(self, left_edge=2, left_current=2,
                    right_current=4, right_edge=2):
         last = 0
@@ -322,7 +322,7 @@ def remote_login_required(f):
             return f(*args, **kwargs)
         if request.is_xhr:
             data = {'status': 'error', 'message': 'Forbidden'}
-            response = make_response(json.dumps(data, ensure_ascii=false))
+            response = make_response(json.dumps(data, ensure_ascii=False))
             response.headers["Content-Type"] = "application/json; charset=utf-8"
             return response, 403
         abort(403)
@@ -339,9 +339,10 @@ def url_for_other_page(page):
     args['page'] = page
     return url_for(request.endpoint, **args)
 
+
 # shortentitles to at longest nchar, shorten longer words if necessary
 @app.template_filter('shortentitle')
-def shortentitle_filter(s,nchar=20):
+def shortentitle_filter(s, nchar=20):
     text = s.split()
     res = ""  # result
     suml = 0  # overall length
@@ -472,7 +473,7 @@ def common_filters():
 
 
 # Creates for all stored languages a translated speaking name in the array for the UI
-def speaking_language(languages = None):
+def speaking_language(languages=None):
     if not languages:
         languages = db.session.query(db.Languages).all()
     for lang in languages:
@@ -894,6 +895,68 @@ def get_email_status_json():
     return response
 
 
+
+# checks if domain is in database (including wildcards)
+# example SELECT * FROM @TABLE WHERE  'abcdefg' LIKE Name;    
+# from https://code.luasoftware.com/tutorials/flask/execute-raw-sql-in-flask-sqlalchemy/
+def check_valid_domain(domain_text):
+    # result = session.query(Notification).from_statement(text(sql)).params(id=5).all()
+    #ToDo: check possible SQL injection
+    domain_text = domain_text.split('@',1)[-1].lower()
+    sql = "SELECT * FROM registration WHERE '%s' LIKE domain;" % domain_text
+    result = ub.session.query(ub.Registration).from_statement(text(sql)).all()
+    return len(result)
+
+''' POST /post
+{
+    name:  'username',  //name of field (column in db)
+    pk:    1            //primary key (record id)
+    value: 'superuser!' //new value
+}'''  
+@app.route("/ajax/editdomain", methods=['POST'])
+@login_required
+@admin_required
+def edit_domain():
+    vals = request.form.to_dict()
+    answer = ub.session.query(ub.Registration).filter(ub.Registration.id == vals['pk']).first()
+    # domain_name = request.args.get('domain')   
+    answer.domain = vals['value'].replace('*','%').replace('?','_').lower()
+    ub.session.commit()
+    return ""
+
+@app.route("/ajax/adddomain", methods=['POST'])
+@login_required
+@admin_required
+def add_domain():
+    domain_name = request.form.to_dict()['domainname'].replace('*','%').replace('?','_').lower()
+    check = ub.session.query(ub.Registration).filter(ub.Registration.domain == domain_name).first()
+    if not check:
+        new_domain = ub.Registration(domain=domain_name)
+        ub.session.add(new_domain)
+        ub.session.commit()
+    return ""
+
+@app.route("/ajax/deletedomain", methods=['POST'])
+@login_required
+@admin_required
+def delete_domain():
+    domain_id = request.form.to_dict()['domainid'].replace('*','%').replace('?','_').lower()
+    ub.session.query(ub.Registration).filter(ub.Registration.id == domain_id).delete()
+    ub.session.commit()
+    return ""
+
+@app.route("/ajax/domainlist")
+@login_required
+@admin_required
+def list_domain():
+    answer = ub.session.query(ub.Registration).all()
+    json_dumps = json.dumps([{"domain":r.domain.replace('%','*').replace('_','?'),"id":r.id} for r in answer])
+    js=json.dumps(json_dumps.replace('"', "'")).lstrip('"').strip('"')
+    response = make_response(js.replace("'",'"'))
+    response.headers["Content-Type"] = "application/json; charset=utf-8"
+    return response
+
+    
 @app.route("/get_authors_json", methods=['GET', 'POST'])
 @login_required_if_no_ano
 def get_authors_json():
@@ -1997,27 +2060,35 @@ def register():
 
     if request.method == "POST":
         to_save = request.form.to_dict()
-        if not to_save["nickname"] or not to_save["email"] or not to_save["password"]:
+        if not to_save["nickname"] or not to_save["email"]:
             flash(_(u"Please fill out all fields!"), category="error")
             return render_title_template('register.html', title=_(u"register"), page="register")
 
         existing_user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == to_save["nickname"].lower()).first()
-        existing_email = ub.session.query(ub.User).filter(ub.User.email == to_save["email"]).first()
+        existing_email = ub.session.query(ub.User).filter(ub.User.email == to_save["email"].lower()).first()
         if not existing_user and not existing_email:
             content = ub.User()
-            content.password = generate_password_hash(to_save["password"])
-            content.nickname = to_save["nickname"]
-            content.email = to_save["email"]
-            content.role = config.config_default_role
-            content.sidebar_view = config.config_default_show
-            try:
-                ub.session.add(content)
-                ub.session.commit()
-            except Exception:
-                ub.session.rollback()
-                flash(_(u"An unknown error occured. Please try again later."), category="error")
+            # content.password = generate_password_hash(to_save["password"])
+            if check_valid_domain(to_save["email"]):
+                content.nickname = to_save["nickname"]
+                content.email = to_save["email"]
+                password = helper.generate_random_password()
+                content.password = generate_password_hash(password) 
+                content.role = config.config_default_role
+                content.sidebar_view = config.config_default_show
+                try:
+                    ub.session.add(content)
+                    ub.session.commit()
+                    helper.send_registration_mail(to_save["email"],to_save["nickname"], password)
+                except Exception:
+                    ub.session.rollback()
+                    flash(_(u"An unknown error occurred. Please try again later."), category="error")
+                    return render_title_template('register.html', title=_(u"register"), page="register")
+            else:
+                flash(_(u"Your email is not allowed to register"), category="error")
+                app.logger.info('Registering failed for user "' + to_save['nickname'] + '" EMailadress: ' + to_save["email"])
                 return render_title_template('register.html', title=_(u"register"), page="register")
-            flash("Your account has been created. Please login.", category="success")
+            flash(_(u"Confirmation email was send to your email account."), category="success")
             return redirect(url_for('login'))
         else:
             flash(_(u"This username or email address is already in use."), category="error")
@@ -2135,7 +2206,7 @@ def token_verified():
         data['status'] = 'success'
         flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
 
-    response = make_response(json.dumps(data, ensure_ascii=false))
+    response = make_response(json.dumps(data, ensure_ascii=False))
     response.headers["Content-Type"] = "application/json; charset=utf-8"
 
     return response
@@ -2462,6 +2533,10 @@ def profile():
         if "kindle_mail" in to_save and to_save["kindle_mail"] != content.kindle_mail:
             content.kindle_mail = to_save["kindle_mail"]
         if to_save["email"] and to_save["email"] != content.email:
+            if config.config.config_public_reg and not check_valid_domain(to_save["email"]):        
+                flash(_(u"Email is not from valid domain"), category="error")
+                return render_title_template("user_edit.html", content=content, downloads=downloads,
+                                     title=_(u"%(name)s's profile", name=current_user.nickname))            
             content.email = to_save["email"]
         if "show_random" in to_save and to_save["show_random"] == "on":
             content.random_books = 1
@@ -2607,7 +2682,7 @@ def view_configuration():
         if "show_mature_content" in to_save:
             content.config_default_show = content.config_default_show + ub.MATURE_CONTENT
         ub.session.commit()
-        flash(_(u"Calibre-web configuration updated"), category="success")
+        flash(_(u"Calibre-Web configuration updated"), category="success")
         config.loadSettings()
         if reboot_required:
             # db.engine.dispose() # ToDo verify correct
@@ -2635,6 +2710,7 @@ def configuration_helper(origin):
     gdriveError=None
     db_change = False
     success = False
+    filedata = None
     if gdriveutils.gdrive_support == False:
         gdriveError = _('Import of optional Google Drive requirements missing')
     else:
@@ -2645,7 +2721,6 @@ def configuration_helper(origin):
                 filedata=json.load(settings)
             if not 'web' in filedata:
                 gdriveError = _('client_secrets.json is not configured for web application')
-                filedata = None
     if request.method == "POST":
         to_save = request.form.to_dict()
         content = ub.session.query(ub.Settings).first()  # type: ub.Settings
@@ -2769,7 +2844,7 @@ def configuration_helper(origin):
                     db.session.close()
                     db.engine.dispose()
             ub.session.commit()
-            flash(_(u"Calibre-web configuration updated"), category="success")
+            flash(_(u"Calibre-Web configuration updated"), category="success")
             config.loadSettings()
             app.logger.setLevel(config.config_log_level)
             logging.getLogger("book_formats").setLevel(config.config_log_level)
@@ -2794,10 +2869,10 @@ def configuration_helper(origin):
             app.logger.info('Reboot required, restarting')
         if origin:
             success = True
-    if is_gdrive_ready() and gdriveutils.gdrive_support == True:
+    if is_gdrive_ready() and gdriveutils.gdrive_support == True and config.config_use_google_drive == True:
         gdrivefolders=gdriveutils.listRootFolders()
     else:
-        gdrivefolders=None
+        gdrivefolders=list()
     return render_title_template("config_edit.html", origin=origin, success=success, content=config,
                                  show_authenticate_google_drive=not is_gdrive_ready(), gdrive=gdriveutils.gdrive_support,
                                  gdriveError=gdriveError, gdrivefolders=gdrivefolders,
@@ -2819,7 +2894,12 @@ def new_user():
                                          title=_(u"Add new user"))
         content.password = generate_password_hash(to_save["password"])
         content.nickname = to_save["nickname"]
-        content.email = to_save["email"]
+        if config.config_public_reg and not check_valid_domain(to_save["email"]):
+            flash(_(u"Email is not from valid domain"), category="error")
+            return render_title_template("user_edit.html", new_user=1, content=content, translations=translations,
+                                         title=_(u"Add new user"))
+        else:
+            content.email = to_save["email"]
         content.default_language = to_save["default_language"]
         content.mature_content = "show_mature_content" in to_save
         content.theme = int(to_save["theme"])
@@ -2890,22 +2970,23 @@ def edit_mailsettings():
         content.mail_use_ssl = int(to_save["mail_use_ssl"])
         try:
             ub.session.commit()
-            flash(_(u"Mail settings updated"), category="success")
+            flash(_(u"Mail server settings updated"), category="success")
         except Exception as e:
             flash(e, category="error")
         if "test" in to_save and to_save["test"]:
             if current_user.kindle_mail:
                 result = helper.send_test_mail(current_user.kindle_mail, current_user.nickname)
                 if result is None:
-                    flash(_(u"Test E-Mail successfully send to %(kindlemail)s", kindlemail=current_user.kindle_mail),
+                    flash(_(u"Test e-mail successfully send to %(kindlemail)s", kindlemail=current_user.kindle_mail),
                           category="success")
                 else:
-                    flash(_(u"There was an error sending the Test E-Mail: %(res)s", res=result), category="error")
+                    flash(_(u"There was an error sending the Test e-mail: %(res)s", res=result), category="error")
             else:
                 flash(_(u"Please configure your kindle email address first..."), category="error")
         else:
-            flash(_(u"E-Mail settings updated"), category="success")
-    return render_title_template("email_edit.html", content=content, title=_(u"Edit mail settings"), page="mailset")
+            flash(_(u"Mail server settings updated"), category="success")
+    return render_title_template("email_edit.html", content=content, title=_(u"Edit e-mail server settings"),
+                                 page="mailset")
 
 
 @app.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
@@ -2917,9 +2998,9 @@ def edit_user(user_id):
     languages = speaking_language()
     translations = babel.list_translations() + [LC('en')]
     for book in content.downloads:
-        downloadBook = db.session.query(db.Books).filter(db.Books.id == book.book_id).first()
-        if downloadBook:
-            downloads.append(db.session.query(db.Books).filter(db.Books.id == book.book_id).first())
+        downloadbook = db.session.query(db.Books).filter(db.Books.id == book.book_id).first()
+        if downloadbook:
+            downloads.append(downloadbook)
         else:
             ub.delete_download(book.book_id)
             # ub.session.query(ub.Downloads).filter(book.book_id == ub.Downloads.book_id).delete()
@@ -3047,6 +3128,27 @@ def edit_user(user_id):
                                 nick=content.nickname), page="edituser")
 
 
+@app.route("/admin/resetpassword/<int:user_id>")
+@login_required
+@admin_required
+def reset_password(user_id):
+    if not config.config_public_reg:
+        abort(404)
+    if current_user is not None and current_user.is_authenticated:
+        existing_user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
+        password = helper.generate_random_password()
+        existing_user.password = generate_password_hash(password)
+        try:
+            ub.session.commit()
+            helper.send_registration_mail(existing_user.email, existing_user.nickname, password, True)
+            flash(_(u"Password for user %s reset" % existing_user.nickname), category="success")
+        except Exception:
+            ub.session.rollback()
+            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+    return redirect(url_for('admin'))
+
+
+
 @app.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
 @login_required_if_no_ano
 @edit_required
@@ -3297,7 +3399,8 @@ def edit_book(book_id):
                 else:
                     input_tags = to_save[cc_string].split(',')
                     input_tags = list(map(lambda it: it.strip(), input_tags))
-                    modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session, 'custom')
+                    modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session,
+                                           'custom')
             db.session.commit()
             if config.config_use_google_drive:
                 gdriveutils.updateGdriveCalibreFromLocal()
@@ -3339,9 +3442,7 @@ def upload():
                 if file_ext not in ALLOWED_EXTENSIONS:
                     flash(
                         _('File extension "%s" is not allowed to be uploaded to this server' %
-                        file_ext),
-                        category="error"
-                    )
+                            file_ext), category="error")
                     return redirect(url_for('index'))
             else:
                 flash(_('File to be uploaded must have an extension'), category="error")
diff --git a/cps/worker.py b/cps/worker.py
index 3575fe17..ecdf5e34 100644
--- a/cps/worker.py
+++ b/cps/worker.py
@@ -326,7 +326,8 @@ class WorkerThread(threading.Thread):
         addLock.release()
 
 
-    def add_email(self, subject, filepath, attachment, settings, recipient, user_name, typ):
+    def add_email(self, subject, filepath, attachment, settings, recipient, user_name, typ,
+                  text=_(u'This email has been sent via calibre web.')):
         # if more than 20 entries in the list, clean the list
         addLock = threading.Lock()
         addLock.acquire()
@@ -335,7 +336,7 @@ class WorkerThread(threading.Thread):
         # progress, runtime, and status = 0
         self.queue.append({'subject':subject, 'attachment':attachment, 'filepath':filepath,
                            'settings':settings, 'recipent':recipient, 'starttime': 0,
-                           'status': STAT_WAITING, 'typ': TASK_EMAIL})
+                           'status': STAT_WAITING, 'typ': TASK_EMAIL, 'text':text})
         self.UIqueue.append({'user': user_name, 'formStarttime': '', 'progress': " 0 %", 'type': typ,
                              'runtime': '0 s', 'status': _('Waiting'),'id': self.id })
         self.id += 1
@@ -369,7 +370,7 @@ class WorkerThread(threading.Thread):
         msg['Subject'] = self.queue[self.current]['subject']
         msg['Message-Id'] = make_msgid('calibre-web')
         msg['Date'] = formatdate(localtime=True)
-        text = _(u'This email has been sent via calibre web.')
+        text = self.queue[self.current]['text']
         msg.attach(MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8'))
         if obj['attachment']:
             result = get_attachment(obj['filepath'], obj['attachment'])
diff --git a/messages.pot b/messages.pot
index 9d2ed362..fcbd3ea3 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-08-18 12:11+0200\n"
+"POT-Creation-Date: 2018-08-27 13:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,518 +26,555 @@ msgstr ""
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:54
+#: cps/helper.py:55
 #, python-format
 msgid "epub format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:70
+#: cps/helper.py:71
 #, python-format
 msgid "Convert: %s"
 msgstr ""
 
-#: cps/helper.py:79
-msgid "Calibre-web test email"
+#: cps/helper.py:80
+msgid "Calibre-Web test email"
 msgstr ""
 
-#: cps/helper.py:80
+#: cps/helper.py:81
 msgid "Test E-Mail"
 msgstr ""
 
-#: cps/helper.py:102 cps/helper.py:112
+#: cps/helper.py:103 cps/helper.py:113
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 
-#: cps/helper.py:114 cps/templates/detail.html:44 cps/worker.py:219
+#: cps/helper.py:115 cps/templates/detail.html:44 cps/worker.py:219
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:116
 #, python-format
 msgid "E-Mail: %s"
 msgstr ""
 
-#: cps/helper.py:117
+#: cps/helper.py:118
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:213
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:222
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:244 cps/helper.py:253
+#: cps/helper.py:245 cps/helper.py:254
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:271
+#: cps/helper.py:272
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/web.py:1026
+#: cps/web.py:1059
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:1027
+#: cps/web.py:1060
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/web.py:1028
+#: cps/web.py:1061
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/web.py:1029
+#: cps/web.py:1062
 msgid "Files are replaced"
 msgstr ""
 
-#: cps/web.py:1030
+#: cps/web.py:1063
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/web.py:1031
+#: cps/web.py:1064
 msgid "Server is stopped"
 msgstr ""
 
-#: cps/web.py:1032
+#: cps/web.py:1065
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/web.py:1052
+#: cps/web.py:1085
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1062
+#: cps/web.py:1095
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1074
+#: cps/web.py:1107
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1086
+#: cps/web.py:1119
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1097
+#: cps/web.py:1130
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1159
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/web.py:1139
+#: cps/web.py:1172
 msgid "Best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:32 cps/web.py:1151
+#: cps/templates/index.xml:36 cps/web.py:1184
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:1166
+#: cps/web.py:1199
 msgid "Author list"
 msgstr ""
 
-#: cps/web.py:1178 cps/web.py:1241 cps/web.py:1401 cps/web.py:1961
+#: cps/web.py:1211 cps/web.py:1274 cps/web.py:1428 cps/web.py:1980
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
-#: cps/templates/index.xml:64 cps/web.py:1225
+#: cps/templates/index.xml:73 cps/web.py:1258
 msgid "Series list"
 msgstr ""
 
-#: cps/web.py:1239
+#: cps/web.py:1272
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:1272
+#: cps/web.py:1299
 msgid "Available languages"
 msgstr ""
 
-#: cps/web.py:1289
+#: cps/web.py:1316
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/index.xml:58 cps/web.py:1300
+#: cps/templates/index.xml:66 cps/web.py:1327
 msgid "Category list"
 msgstr ""
 
-#: cps/web.py:1314
+#: cps/web.py:1341
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:71 cps/web.py:1451
+#: cps/templates/layout.html:71 cps/web.py:1478
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1482
+#: cps/web.py:1509
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:1588
+#: cps/web.py:1614
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1690
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1667
+#: cps/web.py:1693
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1685
+#: cps/web.py:1711
 msgid "Update done"
 msgstr ""
 
-#: cps/web.py:1741 cps/web.py:1782
+#: cps/web.py:1767 cps/web.py:1804
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1779
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1758
+#: cps/web.py:1784
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1776
+#: cps/web.py:1798
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1778
+#: cps/web.py:1800
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1833 cps/web.py:1849
+#: cps/web.py:1859 cps/web.py:1868
 msgid "search"
 msgstr ""
 
-#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:146 cps/web.py:1916
+#: cps/templates/index.xml:44 cps/templates/index.xml:48
+#: cps/templates/layout.html:146 cps/web.py:1935
 msgid "Read Books"
 msgstr ""
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:148 cps/web.py:1919
+#: cps/templates/index.xml:52 cps/templates/index.xml:56
+#: cps/templates/layout.html:148 cps/web.py:1938
 msgid "Unread Books"
 msgstr ""
 
-#: cps/web.py:1971 cps/web.py:1973 cps/web.py:1975 cps/web.py:1987
+#: cps/web.py:1990 cps/web.py:1992 cps/web.py:1994 cps/web.py:2006
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:2044 cps/web.py:2817
+#: cps/web.py:2063 cps/web.py:2897
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:2045 cps/web.py:2062 cps/web.py:2067 cps/web.py:2069
+#: cps/web.py:2064 cps/web.py:2086 cps/web.py:2090 cps/web.py:2095
+#: cps/web.py:2097
 msgid "register"
 msgstr ""
 
-#: cps/web.py:2061
-msgid "An unknown error occured. Please try again later."
+#: cps/web.py:2085
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/web.py:2088
+msgid "Your email is not allowed to register"
+msgstr ""
+
+#: cps/web.py:2091
+msgid "Confirmation email was send to your email account."
 msgstr ""
 
-#: cps/web.py:2066
+#: cps/web.py:2094
 msgid "This username or email address is already in use."
 msgstr ""
 
-#: cps/web.py:2083 cps/web.py:2179
+#: cps/web.py:2111 cps/web.py:2207
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:2088
+#: cps/web.py:2116
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:2094 cps/web.py:2115
+#: cps/web.py:2122 cps/web.py:2143
 msgid "login"
 msgstr ""
 
-#: cps/web.py:2127 cps/web.py:2158
+#: cps/web.py:2155 cps/web.py:2186
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2135 cps/web.py:2166
+#: cps/web.py:2163 cps/web.py:2194
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2143
+#: cps/web.py:2171
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2193
+#: cps/web.py:2221
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:2197
+#: cps/web.py:2225
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2201
+#: cps/web.py:2229
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:2203 cps/web.py:2905
+#: cps/web.py:2231 cps/web.py:2985
 msgid "Please configure your kindle email address first..."
 msgstr ""
 
-#: cps/web.py:2247
+#: cps/web.py:2275
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2285
+#: cps/web.py:2286
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/web.py:2291
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2296
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/web.py:2314
+#, python-format
+msgid "Books are already part of the shelf: %s"
+msgstr ""
+
+#: cps/web.py:2328
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2330
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/web.py:2367
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2291
+#: cps/web.py:2373
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2311 cps/web.py:2335
+#: cps/web.py:2393 cps/web.py:2417
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:2316
+#: cps/web.py:2398
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:2318 cps/web.py:2346
+#: cps/web.py:2400 cps/web.py:2428
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:2319 cps/web.py:2321
+#: cps/web.py:2401 cps/web.py:2403
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:2344
+#: cps/web.py:2426
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2347 cps/web.py:2349
+#: cps/web.py:2429 cps/web.py:2431
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:2370
+#: cps/web.py:2452
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2474
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2395
+#: cps/web.py:2477
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2426
+#: cps/web.py:2508
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2498
+#: cps/web.py:2574
 msgid "Found an existing account for this email address."
 msgstr ""
 
-#: cps/web.py:2500 cps/web.py:2503
+#: cps/web.py:2576 cps/web.py:2579
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:2501
+#: cps/web.py:2577
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:2513
+#: cps/web.py:2589
+msgid "Limit allowed domains for registration"
+msgstr ""
+
+#: cps/web.py:2598
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2612
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:2604 cps/web.py:2766
-msgid "Calibre-web configuration updated"
+#: cps/web.py:2690 cps/web.py:2852
+msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/templates/admin.html:83 cps/web.py:2617
+#: cps/templates/admin.html:90 cps/web.py:2703
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2633
+#: cps/web.py:2720
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2636
+#: cps/web.py:2723
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2641 cps/web.py:2669
+#: cps/web.py:2728 cps/web.py:2755
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:82 cps/web.py:2672 cps/web.py:2698 cps/web.py:2710
-#: cps/web.py:2753 cps/web.py:2774 cps/web.py:2781 cps/web.py:2798
+#: cps/templates/admin.html:89 cps/web.py:2758 cps/web.py:2784 cps/web.py:2796
+#: cps/web.py:2839 cps/web.py:2860 cps/web.py:2867 cps/web.py:2884
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2781
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2707
+#: cps/web.py:2793
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2750
+#: cps/web.py:2836
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2778
+#: cps/web.py:2864
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:2819 cps/web.py:2875
+#: cps/templates/admin.html:31 cps/web.py:2899 cps/web.py:2955
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:2865
+#: cps/web.py:2945
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:2869
+#: cps/web.py:2949
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 
-#: cps/web.py:2893
-msgid "Mail settings updated"
+#: cps/web.py:2973 cps/web.py:2987
+msgid "Mail server settings updated"
 msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:2980
 #, python-format
-msgid "Test E-Mail successfully send to %(kindlemail)s"
+msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2903
+#: cps/web.py:2983
 #, python-format
-msgid "There was an error sending the Test E-Mail: %(res)s"
-msgstr ""
-
-#: cps/web.py:2907
-msgid "E-Mail settings updated"
+msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:2908
-msgid "Edit mail settings"
+#: cps/web.py:2988
+msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:3013
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:3047
+#: cps/web.py:3122
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:3050
+#: cps/web.py:3125
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:3052
+#: cps/web.py:3127
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:3069
+#: cps/web.py:3144
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3084 cps/web.py:3316 cps/web.py:3321 cps/web.py:3478
+#: cps/web.py:3159 cps/web.py:3393 cps/web.py:3398 cps/web.py:3553
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:3095 cps/web.py:3346
+#: cps/web.py:3172 cps/web.py:3423
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:3098 cps/web.py:3352
+#: cps/web.py:3175 cps/web.py:3427
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:3110 cps/web.py:3372
+#: cps/web.py:3187 cps/web.py:3447
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3115
+#: cps/web.py:3192
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3131
+#: cps/web.py:3208
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3147 cps/web.py:3151
+#: cps/web.py:3223 cps/web.py:3227
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3249
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3325
+#: cps/web.py:3402
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3377
+#: cps/web.py:3452
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3382
+#: cps/web.py:3457
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3464
+#: cps/web.py:3539
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/worker.py:212 cps/worker.py:357
+#: cps/worker.py:212 cps/worker.py:365
 msgid "Started"
 msgstr ""
 
@@ -551,29 +588,29 @@ msgstr ""
 msgid "Convertertool %(converter)s not found"
 msgstr ""
 
-#: cps/worker.py:248
+#: cps/worker.py:256
 #, python-format
 msgid "Ebook-converter failed: %s"
 msgstr ""
 
-#: cps/worker.py:258
+#: cps/worker.py:266
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:291 cps/worker.py:346 cps/worker.py:409
+#: cps/worker.py:299 cps/worker.py:354 cps/worker.py:417
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:314 cps/worker.py:332
+#: cps/worker.py:322 cps/worker.py:340
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:364
+#: cps/worker.py:372
 msgid "This email has been sent via calibre web."
 msgstr ""
 
-#: cps/worker.py:435
+#: cps/worker.py:443
 msgid "Failed"
 msgstr ""
 
@@ -581,170 +618,159 @@ msgstr ""
 msgid "User list"
 msgstr ""
 
-#: cps/templates/admin.html:8
+#: cps/templates/admin.html:7
 msgid "Nickname"
 msgstr ""
 
-#: cps/templates/admin.html:9
+#: cps/templates/admin.html:8
 msgid "Email"
 msgstr ""
 
-#: cps/templates/admin.html:10
+#: cps/templates/admin.html:9
 msgid "Kindle"
 msgstr ""
 
-#: cps/templates/admin.html:11
+#: cps/templates/admin.html:10
 msgid "DLS"
 msgstr ""
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:74
+#: cps/templates/admin.html:11 cps/templates/layout.html:74
 msgid "Admin"
 msgstr ""
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:22
+#: cps/templates/admin.html:12 cps/templates/detail.html:22
 #: cps/templates/detail.html:31
 msgid "Download"
 msgstr ""
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:64
+#: cps/templates/admin.html:13 cps/templates/layout.html:64
 msgid "Upload"
 msgstr ""
 
-#: cps/templates/admin.html:15
+#: cps/templates/admin.html:14
 msgid "Edit"
 msgstr ""
 
-#: cps/templates/admin.html:16
-msgid "Passwd"
-msgstr ""
-
-#: cps/templates/admin.html:35
-msgid "SMTP mail settings"
+#: cps/templates/admin.html:32
+msgid "SMTP e-mail server settings"
 msgstr ""
 
-#: cps/templates/admin.html:38 cps/templates/email_edit.html:7
+#: cps/templates/admin.html:35 cps/templates/email_edit.html:7
 msgid "SMTP hostname"
 msgstr ""
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:36
 msgid "SMTP port"
 msgstr ""
 
-#: cps/templates/admin.html:40
+#: cps/templates/admin.html:37
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/admin.html:41 cps/templates/email_edit.html:23
+#: cps/templates/admin.html:38 cps/templates/email_edit.html:23
 msgid "SMTP login"
 msgstr ""
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:27
-msgid "SMTP password"
-msgstr ""
-
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:39
 msgid "From mail"
 msgstr ""
 
-#: cps/templates/admin.html:55
+#: cps/templates/admin.html:48
 msgid "Change SMTP settings"
 msgstr ""
 
-#: cps/templates/admin.html:57
-msgid "Edit allowed domains"
+#: cps/templates/admin.html:50
+msgid "Change allowed domains"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:53
 msgid "Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:63
+#: cps/templates/admin.html:56
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:64 cps/templates/config_edit.html:106
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:106
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:64
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:66 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:70 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr ""
 
-#: cps/templates/admin.html:67
+#: cps/templates/admin.html:74
 msgid "Uploading"
 msgstr ""
 
-#: cps/templates/admin.html:68
+#: cps/templates/admin.html:78
 msgid "Public registration"
 msgstr ""
 
-#: cps/templates/admin.html:69
-msgid "Anonymous browsing"
-msgstr ""
-
-#: cps/templates/admin.html:70 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:82 cps/templates/remote_login.html:4
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:92
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:93
 msgid "Current commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:94
 msgid "Newest commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:96
 msgid "Reconnect to Calibre DB"
 msgstr ""
 
-#: cps/templates/admin.html:89
-msgid "Restart Calibre-web"
+#: cps/templates/admin.html:97
+msgid "Restart Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:90
-msgid "Stop Calibre-web"
+#: cps/templates/admin.html:98
+msgid "Stop Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:99
 msgid "Check for update"
 msgstr ""
 
-#: cps/templates/admin.html:92
+#: cps/templates/admin.html:100
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:101
-msgid "Do you really want to restart Calibre-web?"
+#: cps/templates/admin.html:109
+msgid "Do you really want to restart Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:106 cps/templates/admin.html:120
-#: cps/templates/admin.html:141 cps/templates/shelf.html:59
+#: cps/templates/admin.html:114 cps/templates/admin.html:128
+#: cps/templates/admin.html:149 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr ""
 
-#: cps/templates/admin.html:107 cps/templates/admin.html:121
+#: cps/templates/admin.html:115 cps/templates/admin.html:129
 #: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166
 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164
-#: cps/templates/email_edit.html:36 cps/templates/shelf.html:60
+#: cps/templates/email_edit.html:36 cps/templates/register_domains.html:24
+#: cps/templates/register_domains.html:38 cps/templates/shelf.html:60
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:147
 msgid "Back"
 msgstr ""
 
-#: cps/templates/admin.html:119
-msgid "Do you really want to stop Calibre-web?"
+#: cps/templates/admin.html:127
+msgid "Do you really want to stop Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:140
 msgid "Updating, please do not reload page"
 msgstr ""
 
@@ -769,6 +795,7 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165
+#: cps/templates/register_domains.html:37
 msgid "Delete"
 msgstr ""
 
@@ -837,13 +864,13 @@ msgstr ""
 
 #: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
-#: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:145
+#: cps/templates/register_domains.html:23 cps/templates/search_form.html:153
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr ""
 
 #: cps/templates/book_edit.html:157
-msgid "Are really you sure?"
+msgid "Are you really sure?"
 msgstr ""
 
 #: cps/templates/book_edit.html:160
@@ -892,7 +919,7 @@ msgid "Search error!"
 msgstr ""
 
 #: cps/templates/book_edit.html:242
-msgid "No Result! Please try anonther keyword."
+msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
 #: cps/templates/config_edit.html:12
@@ -1157,7 +1184,7 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:189 cps/templates/search.html:16
 msgid "Add to shelf"
 msgstr ""
 
@@ -1185,6 +1212,10 @@ msgstr ""
 msgid "SSL/TLS"
 msgstr ""
 
+#: cps/templates/email_edit.html:27
+msgid "SMTP password"
+msgstr ""
+
 #: cps/templates/email_edit.html:31
 msgid "From e-mail"
 msgstr ""
@@ -1197,11 +1228,11 @@ msgstr ""
 msgid "Save settings and send Test E-Mail"
 msgstr ""
 
-#: cps/templates/feed.xml:20 cps/templates/layout.html:205
+#: cps/templates/feed.xml:21 cps/templates/layout.html:205
 msgid "Next"
 msgstr ""
 
-#: cps/templates/feed.xml:29 cps/templates/index.xml:7
+#: cps/templates/feed.xml:30 cps/templates/index.xml:8
 #: cps/templates/layout.html:43 cps/templates/layout.html:44
 msgid "Search"
 msgstr ""
@@ -1210,67 +1241,67 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/templates/index.xml:5
+#: cps/templates/index.xml:6
 msgid "Start"
 msgstr ""
 
-#: cps/templates/index.xml:14 cps/templates/layout.html:139
+#: cps/templates/index.xml:15 cps/templates/layout.html:139
 msgid "Hot Books"
 msgstr ""
 
-#: cps/templates/index.xml:17
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Downloads."
 msgstr ""
 
-#: cps/templates/index.xml:20 cps/templates/layout.html:142
+#: cps/templates/index.xml:22 cps/templates/layout.html:142
 msgid "Best rated Books"
 msgstr ""
 
-#: cps/templates/index.xml:23
+#: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
 msgstr ""
 
-#: cps/templates/index.xml:26
+#: cps/templates/index.xml:29
 msgid "New Books"
 msgstr ""
 
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:33
 msgid "The latest Books"
 msgstr ""
 
-#: cps/templates/index.xml:35
+#: cps/templates/index.xml:40
 msgid "Show Random Books"
 msgstr ""
 
-#: cps/templates/index.xml:52 cps/templates/layout.html:160
+#: cps/templates/index.xml:59 cps/templates/layout.html:160
 msgid "Authors"
 msgstr ""
 
-#: cps/templates/index.xml:55
+#: cps/templates/index.xml:63
 msgid "Books ordered by Author"
 msgstr ""
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:70
 msgid "Books ordered by category"
 msgstr ""
 
-#: cps/templates/index.xml:67
+#: cps/templates/index.xml:77
 msgid "Books ordered by series"
 msgstr ""
 
-#: cps/templates/index.xml:70 cps/templates/layout.html:166
+#: cps/templates/index.xml:80 cps/templates/layout.html:166
 msgid "Public Shelves"
 msgstr ""
 
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:84
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:77 cps/templates/layout.html:170
+#: cps/templates/index.xml:88 cps/templates/layout.html:170
 msgid "Your Shelves"
 msgstr ""
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1378,7 +1409,7 @@ msgid "Log in with magic link"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre Web ebook catalog"
+msgid "Calibre-Web ebook catalog"
 msgstr ""
 
 #: cps/templates/read.html:69
@@ -1417,6 +1448,22 @@ msgstr ""
 msgid "Your email address"
 msgstr ""
 
+#: cps/templates/register_domains.html:8
+msgid "List allowed domains for registering"
+msgstr ""
+
+#: cps/templates/register_domains.html:12
+msgid "Enter domainname"
+msgstr ""
+
+#: cps/templates/register_domains.html:20
+msgid "Add Domain"
+msgstr ""
+
+#: cps/templates/register_domains.html:36
+msgid "Do you really want to delete this domain rule?"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
 msgid "Using your another device, visit"
 msgstr ""
@@ -1441,10 +1488,6 @@ msgstr ""
 msgid "Results for:"
 msgstr ""
 
-#: cps/templates/search.html:12
-msgid "Search result to shelf"
-msgstr ""
-
 #: cps/templates/search_form.html:19
 msgid "Publishing date from"
 msgstr ""
@@ -1478,7 +1521,7 @@ msgid "Delete this Shelf"
 msgstr ""
 
 #: cps/templates/shelf.html:8
-msgid "Edit Shelf name"
+msgid "Edit Shelf"
 msgstr ""
 
 #: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
diff --git a/readme.md b/readme.md
index 8158d04e..8835053c 100755
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
 # About
 
-Calibre Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing [Calibre](https://calibre-ebook.com) database.
+Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing [Calibre](https://calibre-ebook.com) database.
 
 *This software is a fork of [library](https://github.com/mutschler/calibreserver) and licensed under the GPL v3 License.*
 
@@ -98,7 +98,7 @@ The Drive API should now be setup and ready to use, so we need to integrate it i
 8. Google Drive should now be connected and be used to get images and download Epubs. The metadata.db is stored in the calibre library location
 
 ### Optional
-If your calibre web is using https, it is possible to add a "watch" to the drive. This will inform us if the metadata.db file is updated and allow us to update our calibre library accordingly.
+If your Calibre-Web is using https, it is possible to add a "watch" to the drive. This will inform us if the metadata.db file is updated and allow us to update our calibre library accordingly.
 Additionally the public adress your server uses (e.g.https://example.com) has to be verified in the Google developer console. After this is done, please wait a few minutes.
 
 9. Open config page
@@ -123,7 +123,7 @@ Pre-built Docker images based on Alpine Linux are available in these Docker Hub
 
 Reverse proxy configuration examples for apache and nginx to use Calibre-Web:
 
-nginx configuration for a local server listening on port 8080, mapping calibre web to /calibre:
+nginx configuration for a local server listening on port 8080, mapping Calibre-Web to /calibre:
 
 ```
 http {
@@ -148,7 +148,7 @@ http {
 proxy_redirect http://$host/ https://$host:12345/;
 ```
 
-Apache 2.4 configuration for a local server listening on port 443, mapping calibre web to /calibre-web:
+Apache 2.4 configuration for a local server listening on port 443, mapping Calibre-Web to /calibre-web:
 
 The following modules have to be activated: headers, proxy, rewrite.
 ```