diff --git a/cps/admin.py b/cps/admin.py
index 54742345..8e4f7df2 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -431,15 +431,15 @@ def delete_restriction(type):
 @admin_required
 def list_restriction(type):
     if type == 0:   # Tags as template
-        restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) }
+        restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
                     for i,x in enumerate(config.list_denied_tags()) if x != '' ]
-        allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) }
+        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
                  for i,x in enumerate(config.list_allowed_tags()) if x != '']
         json_dumps = restrict + allow
     elif type == 1:  # CustomC as template
-        restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) }
+        restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
                     for i,x in enumerate(config.list_denied_column_values()) if x != '' ]
-        allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) }
+        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
                  for i,x in enumerate(config.list_allowed_column_values()) if x != '']
         json_dumps = restrict + allow
     elif type == 2:  # Tags per user
@@ -448,9 +448,9 @@ def list_restriction(type):
             usr = ub.session.query(ub.User).filter(ub.User.id == usr_id).first()
         else:
             usr = current_user
-        restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) }
+        restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
                     for i,x in enumerate(usr.list_denied_tags()) if x != '' ]
-        allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) }
+        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
                  for i,x in enumerate(usr.list_allowed_tags()) if x != '']
         json_dumps = restrict + allow
     elif type == 3:  # CustomC per user
@@ -459,9 +459,9 @@ def list_restriction(type):
             usr = ub.session.query(ub.User).filter(ub.User.id==usr_id).first()
         else:
             usr = current_user
-        restrict = [{'Element': x, 'type':_('deny'), 'id': 'd'+str(i) }
+        restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
                     for i,x in enumerate(usr.list_denied_column_values()) if x != '' ]
-        allow = [{'Element': x, 'type':_('allow'), 'id': 'a'+str(i) }
+        allow = [{'Element': x, 'type':_('Allow'), 'id': 'a'+str(i) }
                  for i,x in enumerate(usr.list_allowed_column_values()) if x != '']
         json_dumps = restrict + allow
     else:
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index e37090a1..ed712980 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -127,7 +127,7 @@ def generate_auth_token(user_id):
         warning = _('PLease access calibre-web from non localhost to get valid api_endpoint for kobo device')
         return render_title_template(
             "generate_kobo_auth_url.html",
-            title=_(u"Kobo Set-up"),
+            title=_(u"Kobo Setup"),
             warning = warning
         )
     else:
@@ -147,7 +147,7 @@ def generate_auth_token(user_id):
             ub.session.commit()
         return render_title_template(
             "generate_kobo_auth_url.html",
-            title=_(u"Kobo Set-up"),
+            title=_(u"Kobo Setup"),
             kobo_auth_url=url_for(
                 "kobo.TopLevelEndpoint", auth_token=auth_token.auth_token, _external=True
             ),
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index a7770c59..5b2ad78c 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -6,16 +6,16 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col">
-      <h2>{{_('User list')}}</h2>
+      <h2>{{_('Users')}}</h2>
       <table class="table table-striped" id="table_user">
         <tr>
-            <th>{{_('Nickname')}}</th>
-            <th>{{_('E-mail')}}</th>
-            <th>{{_('Kindle')}}</th>
-            <th>{{_('DLS')}}</th>
+            <th>{{_('Username')}}</th>
+            <th>{{_('E-mail Address')}}</th>
+            <th>{{_('Send to Kindle E-mail Address')}}</th>
+            <th>{{_('Downloads')}}</th>
             <th class="hidden-xs">{{_('Admin')}}</th>
             <th class="hidden-xs">{{_('Download')}}</th>
-            <th class="hidden-xs">{{_('View Ebooks')}}</th>
+            <th class="hidden-xs">{{_('View eBooks')}}</th>
             <th class="hidden-xs">{{_('Upload')}}</th>
             <th class="hidden-xs">{{_('Edit')}}</th>
         </tr>
@@ -35,20 +35,20 @@
           {% endif %}
         {% endfor %}
       </table>
-      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add new user')}}</a></div>
+      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a></div>
     </div>
   </div>
 
   <div class="row">
     <div class="col">
-      <h2>{{_('SMTP e-mail server settings')}}</h2>
+      <h2>{{_('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 class="hidden-xs">{{_('From mail')}}</th>
+          <th>{{_('SMTP Hostname')}}</th>
+          <th>{{_('SMTP Port')}}</th>
+          <th>{{_('Encryption')}}</th>
+          <th>{{_('SMTP Login')}}</th>
+          <th class="hidden-xs">{{_('From E-mail')}}</th>
         </tr>
         <tr>
           <td>{{email.mail_server}}</td>
@@ -67,11 +67,11 @@
       <h2>{{_('Configuration')}}</h2>
       <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">{{_('Calibre Database Directory')}}</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">{{_('Log Level')}}</div>
             <div class="col-xs-6 col-sm-6">{{config.get_log_level()}}</div>
         </div>
         <div class="row">
@@ -81,27 +81,27 @@
       </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-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-7">{{_('Uploads')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_uploading) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Anonymous Browsing')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_anonbrowse) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Public Registration')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_public_reg) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Magic Link Remote Login')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_remote_login) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Reverse proxy login')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Reverse Proxy Login')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_allow_reverse_proxy_header_login) }}</div>
         </div>
         {% if config.config_allow_reverse_proxy_header_login %}
@@ -111,18 +111,18 @@
         </div>
         {% endif %}
       </div>
-      <div class="btn btn-default"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Basic Configuration')}}</a></div>
-      <div class="btn btn-default"><a id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('UI Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Edit Basic Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('Edit UI Configuration')}}</a></div>
     </div>
   </div>
 
   <div class="row">
     <div class="col">
       <h2>{{_('Administration')}}</h2>
-      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logfiles')}}</a></div>
-      <div class="btn btn-default" id="restart_database">{{_('Reconnect to Calibre DB')}}</div>
-      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-Web')}}</div>
-      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-Web')}}</div>
+      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
+      <div class="btn btn-default" id="restart_database">{{_('Reconnect Calibre Database')}}</div>
+      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
+      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
     </div>
   </div>
 
@@ -145,7 +145,7 @@
       </table>
 
       <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
-      <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</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>
   </div>
@@ -158,13 +158,13 @@
     <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>{{_('Are you sure you want to restart?')}}</p>
           <div id="spinner" class="spinner"  style="display:none;">
                 <img id="img-spinner" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
           </div>
           <p></p>
-        <button type="button" class="btn btn-default" id="restart" >{{_('Ok')}}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <button type="button" class="btn btn-default" id="restart" >{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -176,9 +176,9 @@
       <div class="modal-header bg-info">
       </div>
       <div class="modal-body text-center">
-        <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>
+        <p>{{_('Are you sure you want to shutdown?')}}</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">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -188,7 +188,7 @@
     <!-- Modal content-->
     <div class="modal-content">
       <div class="modal-header bg-info text-center">
-      <span>{{_('Updating, please do not reload page')}}</span>
+      <span>{{_('Updating, please do not reload this page')}}</span>
       </div>
       <div class="modal-body text-center">
           <div id="spinner2" class="spinner2"  style="display:none;">
@@ -197,7 +197,7 @@
           <p></p>
          <div id="Updatecontent"></div>
           <p></p>
-        <button type="button" class="btn btn-default hidden" id="updateFinished" data-dismiss="modal">{{_('Ok')}}</button>
+        <button type="button" class="btn btn-default hidden" id="updateFinished" data-dismiss="modal">{{_('OK')}}</button>
       </div>
     </div>
   </div>
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 78b427eb..d3619060 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -70,7 +70,7 @@
       <input type="text" class="form-control typeahead" name="series" id="series" value="{% if book.series %}{{book.series[0].name}}{% endif %}">
     </div>
     <div class="form-group">
-      <label for="series_index">{{_('Series id')}}</label>
+      <label for="series_index">{{_('Series ID')}}</label>
       <input type="number" step="0.01" min="0" class="form-control" name="series_index" id="series_index" value="{{book.series_index}}">
     </div>
     <div class="form-group">
@@ -78,16 +78,16 @@
       <input type="number"  name="rating" id="rating" class="rating input-lg" data-clearable="" value="{% if book.ratings %}{{(book.ratings[0].rating / 2)|int}}{% endif %}">
     </div>
     <div class="form-group">
-      <label for="cover_url">{{_('Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)')}}</label>
+      <label for="cover_url">{{_('Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)')}}</label>
       <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
     </div>
     <div class="form-group" aria-label="Upload cover from local drive">
-        <label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from local drive') }}</label>
+        <label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from Local Disk') }}</label>
         <div class="upload-cover-input-text" id="upload-cover"></div>
         <input id="btn-upload-cover" name="btn-upload-cover" type="file" accept=".jpg, .jpeg, .png, .webp">
     </div>
     <div class="form-group">
-      <label for="pubdate">{{_('Publishing date')}}</label>
+      <label for="pubdate">{{_('Published Date')}}</label>
       <div style="position: relative">
         <input type="date" class="form-control" name="pubdate" id="pubdate" value="{% if book.pubdate %}{{book.pubdate|formatdateinput}}{% endif %}">
         <input type="text" class="form-control fake-input hidden" id="fake_pubdate" value="{% if book.pubdate %}{{book.pubdate|formatdate}}{% endif %}">
@@ -155,7 +155,7 @@
       {% if g.user.role_upload() or g.user.role_admin()%}
         {% if g.allow_upload %}
           <div role="group" aria-label="Upload new book format">
-            <label class="btn btn-primary btn-file" for="btn-upload-format">{{ _('Upload format') }}</label>
+            <label class="btn btn-primary btn-file" for="btn-upload-format">{{ _('Upload Format') }}</label>
             <div class="upload-format-input-text" id="upload-format"></div>
             <input id="btn-upload-format" name="btn-upload-format" type="file">
           </div>
@@ -164,12 +164,12 @@
 
     <div class="checkbox">
       <label>
-        <input name="detail_view" type="checkbox" checked> {{_('view book after edit')}}
+        <input name="detail_view" type="checkbox" checked> {{_('View Book on Save')}}
       </label>
     </div>
-    <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Get metadata')}}</a>
-    <button type="submit" id="submit" class="btn btn-default">{{_('Submit')}}</button>
-    <a href="{{ url_for('web.show_book', book_id=book.id) }}" class="btn btn-default">{{_('Back')}}</a>
+    <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Fetch Metadata')}}</a>
+    <button type="submit" id="submit" class="btn btn-default">{{_('Save')}}</button>
+    <a href="{{ url_for('web.show_book', book_id=book.id) }}" class="btn btn-default">{{_('Cancel')}}</a>
   </div>
 </form>
 
@@ -185,13 +185,13 @@
           <span>{{_('Are you really sure?')}}</span>
       </div>
         <div class="modal-body text-center">
-          <span>{{_('Book will be deleted from Calibre database')}}</span>
-          <span>{{_('and from hard disk')}}</span>
+          <span>{{_('This book will be permanently erased from database')}}</span>
+          <span>{{_('and hard disk')}}</span>
         </div>
 
       <div class="modal-footer">
         <a href="{{ url_for('editbook.delete_book', book_id=book.id) }}" class="btn btn-danger">{{_('Delete')}}</a>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -203,13 +203,13 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="metaModalLabel">{{_('Get metadata')}}</h4>
+        <h4 class="modal-title" id="metaModalLabel">{{_('Fetch Metadata')}}</h4>
         <form class="padded-bottom" id="meta-search">
           <div class="input-group">
             <label class="sr-only" for="keyword">{{_('Keyword')}}</label>
             <input type="text" class="form-control" id="keyword" name="keyword" placeholder="{{_(" Search keyword ")}}">
             <span class="input-group-btn">
-              <button type="submit" class="btn btn-primary" id="do-search">{{_("Go!")}}</button>
+              <button type="submit" class="btn btn-primary" id="do-search">{{_("Search")}}</button>
             </span>
           </div>
         </form>
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index 7fcf44a2..184f4320 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 {% block body %}
-<div class="discover" xmlns:text-indent="http://www.w3.org/1999/xhtml">
+<div class="discover">
   <h2>{{title}}</h2>
   <form role="form" method="POST" autocomplete="off">
 <div class="panel-group">
@@ -16,7 +16,7 @@
     <div id="collapseOne" class="panel-collapse collapse in">
       <div class="panel-body">
     <div class="form-group required">
-      <label for="config_calibre_dir">{{_('Location of Calibre database')}}</label>
+      <label for="config_calibre_dir">{{_('Location of Calibre Database')}}</label>
       <input type="text" class="form-control" name="config_calibre_dir" id="config_calibre_dir" value="{% if config.config_calibre_dir != None %}{{ config.config_calibre_dir }}{% endif %}" autocomplete="off">
     </div>
     {% if feature_support['gdrive']  %}
@@ -96,7 +96,7 @@
           <input type="text" class="form-control" name="config_keyfile" id="config_keyfile" value="{% if config.config_keyfile != None %}{{ config.config_keyfile }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_updatechannel">{{_('Update channel')}}</label>
+          <label for="config_updatechannel">{{_('Update Channel')}}</label>
             <select name="config_updatechannel" id="config_updatechannel" class="form-control">
                     <option value="0" {% if config.config_updatechannel == 0 %}selected{% endif %}>{{_('Stable')}}</option>
                     <!--option value="1" {% if config.config_updatechannel == 1 %}selected{% endif %}>{{_('Stable (Automatic)')}}</option-->
@@ -155,19 +155,19 @@
       <div class="panel-body">
     <div class="form-group">
         <input type="checkbox" id="config_uploading" name="config_uploading" {% if config.config_uploading %}checked{% endif %}>
-        <label for="config_uploading">{{_('Enable uploading')}}</label>
+        <label for="config_uploading">{{_('Enable Uploads')}}</label>
     </div>
     <div class="form-group">
         <input type="checkbox" id="config_anonbrowse" name="config_anonbrowse" {% if config.config_anonbrowse %}checked{% endif %}>
-        <label for="config_anonbrowse">{{_('Enable anonymous browsing')}}</label>
+        <label for="config_anonbrowse">{{_('Enable Anonymous Browsing')}}</label>
     </div>
     <div class="form-group">
         <input type="checkbox" id="config_public_reg" name="config_public_reg" {% if config.config_public_reg %}checked{% endif %}>
-        <label for="config_public_reg">{{_('Enable public registration')}}</label>
+        <label for="config_public_reg">{{_('Enable Public Registration')}}</label>
     </div>
     <div class="form-group">
       <input type="checkbox" id="config_remote_login" name="config_remote_login" {% if config.config_remote_login %}checked{% endif %}>
-      <label for="config_remote_login">{{_('Enable remote login ("magic link")')}}</label>
+      <label for="config_remote_login">{{_('Enable Magic Link Remote Login')}}</label>
     </div>
     {% if feature_support['kobo'] %}
     <div class="form-group">
@@ -185,7 +185,7 @@
     <div class="form-group">
       <input type="checkbox" id="config_use_goodreads" name="config_use_goodreads" data-control="goodreads-settings" {% if config.config_use_goodreads %}checked{% endif %}>
       <label for="config_use_goodreads">{{_('Use Goodreads')}}</label>
-      <a href="https://www.goodreads.com/api/keys" target="_blank" style="margin-left: 5px">{{_('Obtain an API Key')}}</a>
+      <a href="https://www.goodreads.com/api/keys" target="_blank" style="margin-left: 5px">{{_('Create an API Key')}}</a>
     </div>
     <div data-related="goodreads-settings">
       <div class="form-group">
@@ -202,7 +202,7 @@
       <div class="form-group">
         <label for="config_login_type">{{_('Login type')}}</label>
         <select name="config_login_type" id="config_login_type" class="form-control" data-control="login-settings">
-           <option value="0" {% if config.config_login_type == 0 %}selected{% endif %}>{{_('Use standard Authentication')}}</option>
+           <option value="0" {% if config.config_login_type == 0 %}selected{% endif %}>{{_('Use Standard Authentication')}}</option>
            {% if feature_support['ldap'] %}
            <option value="1" {% if config.config_login_type == 1 %}selected{% endif %}>{{_('Use LDAP Authentication')}}</option>
            {% endif %}
@@ -222,24 +222,24 @@
           <input type="text" class="form-control" id="config_ldap_port" name="config_ldap_port" value="{% if config.config_ldap_port != None %}{{ config.config_ldap_port }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_schema">{{_('LDAP schema (ldap or ldaps)')}}</label>
+          <label for="config_ldap_schema">{{_('LDAP Schema (LDAP or LPAPS)')}}</label>
           <input type="text" class="form-control" id="config_ldap_schema" name="config_ldap_schema" value="{% if config.config_ldap_schema != None %}{{ config.config_ldap_schema }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_serv_username">{{_('LDAP Admin username')}}</label>
+          <label for="config_ldap_serv_username">{{_('LDAP Administrator Username')}}</label>
           <input type="text" class="form-control" id="config_ldap_serv_username" name="config_ldap_serv_username" value="{% if config.config_ldap_serv_username != None %}{{ config.config_ldap_serv_username }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_serv_password">{{_('LDAP Admin password')}}</label>
+          <label for="config_ldap_serv_password">{{_('LDAP Administrator Password')}}</label>
           <input type="password" class="form-control" id="config_ldap_serv_password" name="config_ldap_serv_password" value="{% if config.config_ldap_serv_password != None %}{{ config.config_ldap_serv_password }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
           <input type="checkbox" id="config_ldap_use_ssl" name="config_ldap_use_ssl" {% if config.config_ldap_use_ssl %}checked{% endif %}>
-          <label for="config_ldap_use_ssl">{{_('LDAP Server use SSL')}}</label>
+          <label for="config_ldap_use_ssl">{{_('LDAP Server Enable SSL')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" id="config_ldap_use_tls" name="config_ldap_use_tls" {% if config.config_ldap_use_tls %}checked{% endif %}>
-          <label for="config_ldap_use_tls">{{_('LDAP Server use TLS')}}</label>
+          <label for="config_ldap_use_tls">{{_('LDAP Server Enable TLS')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" id="config_ldap_require_cert" name="config_ldap_require_cert" data-control="ldap-cert-settings" {% if config.config_ldap_require_cert %}checked{% endif %}>
@@ -256,7 +256,7 @@
           <input type="text" class="form-control" id="config_ldap_dn" name="config_ldap_dn" value="{% if config.config_ldap_dn != None %}{{ config.config_ldap_dn }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_user_object">{{_('LDAP User object filter')}}</label>
+          <label for="config_ldap_user_object">{{_('LDAP User Object Filter')}}</label>
           <input type="text" class="form-control" id="config_ldap_user_object" name="config_ldap_user_object" value="{% if config.config_ldap_user_object != None %}{{ config.config_ldap_user_object }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
@@ -309,7 +309,7 @@
       <div class="panel-body">
           <div class="form-group">
               <div><input type="radio" name="config_ebookconverter" id="converter0" value="0" {% if config.config_ebookconverter == 0 %}checked{% endif %}>
-              <label for="converter0">{{_('No converter')}}</label></div>
+              <label for="converter0">{{_('No Converter')}}</label></div>
               <div><input type="radio" name="config_ebookconverter" id="converter1" value="1" {% if config.config_ebookconverter == 1 %}checked{% endif %}>
               <label for="converter1">{{_('Use Kindlegen')}}</label></div>
               <div><input type="radio" name="config_ebookconverter" id="converter2" value="2" {% if config.config_ebookconverter == 2 %}checked{% endif %}>
@@ -340,10 +340,10 @@
 
     <div class="col-sm-12">
     {% if not show_login_button %}
-    <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" name="submit" class="btn btn-default">{{_('Save')}}</button>
     {% endif %}
     {% if show_back_button %}
-      <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Back')}}</a>
+      <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Cancel')}}</a>
     {% endif %}
     {% if show_login_button %}
       <a href="{{ url_for('web.login') }}" name="login" class="btn btn-default">{{_('Login')}}</a>
diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html
index 6d547377..4cade736 100644
--- a/cps/templates/config_view_edit.html
+++ b/cps/templates/config_view_edit.html
@@ -24,15 +24,15 @@
           <input type="text" class="form-control" name="config_calibre_web_title" id="config_calibre_web_title" value="{% if conf.config_calibre_web_title != None %}{{ conf.config_calibre_web_title }}{% endif %}" autocomplete="off" required>
         </div>
         <div class="form-group">
-          <label for="config_books_per_page">{{_('Books per page')}}</label>
+          <label for="config_books_per_page">{{_('Books per Page')}}</label>
           <input type="number" min="1" max="200" class="form-control" name="config_books_per_page" id="config_books_per_page" value="{% if conf.config_books_per_page != None %}{{ conf.config_books_per_page }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_random_books">{{_('No. of random books to show')}}</label>
+          <label for="config_random_books">{{_('No. of Random Books to Display')}}</label>
           <input type="number" min="1" max="30" class="form-control" name="config_random_books" id="config_random_books" value="{% if conf.config_random_books != None %}{{ conf.config_random_books }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_authors_max">{{_('No. of authors to show before hiding (0=disable hiding)')}}</label>
+          <label for="config_authors_max">{{_('No. of Authors to Display Before Hiding (0=Disable Hiding)')}}</label>
           <input type="number" min="0" max="999" class="form-control" name="config_authors_max" id="config_authors_max" value="{% if conf.config_authors_max != None %}{{ conf.config_authors_max }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
@@ -43,11 +43,11 @@
             </select>
         </div>
         <div class="form-group">
-          <label for="config_columns_to_ignore">{{_('Regular expression for ignoring columns')}}</label>
+          <label for="config_columns_to_ignore">{{_('Regular Expression for Ignoring Columns')}}</label>
           <input type="text" class="form-control" name="config_columns_to_ignore" id="config_columns_to_ignore" value="{% if conf.config_columns_to_ignore != None %}{{ conf.config_columns_to_ignore }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_read_column">{{_('Link read/unread status to Calibre column')}}</label>
+          <label for="config_read_column">{{_('Link Read/Unread Status to Calibre Column')}}</label>
               <select name="config_read_column" id="config_read_column" class="form-control">
                 <option value="0" {% if conf.config_read_column == 0 %}selected{% endif %}></option>
                 {%  for readColumn in readColumns %}
@@ -56,7 +56,7 @@
               </select>
         </div>
         <div class="form-group">
-          <label for="config_restricted_column">{{_('View restriction based on Calibre column')}}</label>
+          <label for="config_restricted_column">{{_('View Restrictions based on Calibre column')}}</label>
               <select name="config_restricted_column" id="config_restricted_column" class="form-control">
                 <option value="0" {% if conf.config_restricted_column == 0 %}selected{% endif %}>{{ _('None') }}</option>
                 {%  for restrictColumn in restrictColumns %}
@@ -65,7 +65,7 @@
               </select>
         </div>
         <div class="form-group">
-          <label for="config_title_regex">{{_('Regular expression for title sorting')}}</label>
+          <label for="config_title_regex">{{_('Regular Expression for Title Sorting')}}</label>
           <input type="text" class="form-control" name="config_title_regex" id="config_title_regex" value="{% if conf.config_title_regex != None %}{{ conf.config_title_regex }}{% endif %}" autocomplete="off">
         </div>
         </div>
@@ -77,7 +77,7 @@
       <h4 class="panel-title">
         <a class="accordion-toggle" data-toggle="collapse" href="#collapsesix">
           <span class="glyphicon glyphicon-plus"></span>
-          {{_('Default settings for new users')}}
+          {{_('Default Settings for New Users')}}
         </a>
       </h4>
     </div>
@@ -85,7 +85,7 @@
       <div class="panel-body">
         <div class="form-group">
           <input type="checkbox" name="admin_role" id="admin_role" {% if conf.role_admin() %}checked{% endif %}>
-          <label for="admin_role">{{_('Admin user')}}</label>
+          <label for="admin_role">{{_('Admin User')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" name="download_role" id="download_role" {% if conf.role_download() %}checked{% endif %}>
@@ -93,7 +93,7 @@
         </div>
         <div class="form-group">
           <input type="checkbox" name="viewer_role" id="viewer_role" {% if conf.role_viewer() %}checked{% endif %}>
-          <label for="viewer_role">{{_('Allow book viewer')}}</label>
+          <label for="viewer_role">{{_('Allow eBook Viewer')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" name="upload_role" id="upload_role" {% if conf.role_upload() %}checked{% endif %}>
@@ -105,7 +105,7 @@
         </div>
         <div class="form-group">
           <input type="checkbox" name="delete_role" id="delete_role" {% if conf.role_delete_books() %}checked{% endif %}>
-          <label for="delete_role">{{_('Allow Delete books')}}</label>
+          <label for="delete_role">{{_('Allow Delete Books')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" name="passwd_role" id="passwd_role" {% if conf.role_passwd() %}checked{% endif %}>
@@ -123,7 +123,7 @@
       <h4 class="panel-title">
         <a class="accordion-toggle" data-toggle="collapse" href="#collapseseven">
           <span class="glyphicon glyphicon-plus"></span>
-          {{_('Default visibilities for new users')}}
+          {{_('Default Visibilities for New Users')}}
         </a>
       </h4>
     </div>
@@ -139,16 +139,16 @@
         {% endfor %}
         <div class="form-group">
             <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if conf.show_detail_random() %}checked{% endif %}>
-            <label for="Show_detail_random">{{_('Show random books in detail view')}}</label>
+            <label for="Show_detail_random">{{_('Show Random Books in Detail View')}}</label>
         </div>
-        <a href="#" id="get_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/denied Tags')}}</a>
-        <a href="#" id="get_column_values" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/denied custom column values')}}</a>
+        <a href="#" id="get_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied Tags')}}</a>
+        <a href="#" id="get_column_values" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied custom column values')}}</a>
       </div>
     </div>
   </div>
     <div class="col-sm-12">
-    <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
-    <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Back')}}</a>
+    <button type="submit" name="submit" class="btn btn-default">{{_('Save')}}</button>
+    <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Cancel')}}</a>
     </div>
   </form>
 </div>
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b76a8afa..d84dbe61 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -56,7 +56,7 @@
           {% if reader_list and g.user.role_viewer() %}
               <div class="btn-group" role="group">
                 <button id="read-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <span class="glyphicon glyphicon-eye-open"></span> {{_('Read in browser')}}
+                  <span class="glyphicon glyphicon-eye-open"></span> {{_('Read in Browser')}}
                   <span class="caret"></span>
                 </button>
                     <ul class="dropdown-menu" aria-labelledby="read-in-browser">
@@ -69,7 +69,7 @@
             {% if audioentries|length > 0 %}
               <div class="btn-group" role="group">
                 <button id="listen-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <span class="glyphicon glyphicon-music"></span> {{_('Listen in browser')}}
+                  <span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}}
                   <span class="caret"></span>
                 </button>
                     <ul class="dropdown-menu" aria-labelledby="read-in-browser">
@@ -120,7 +120,7 @@
       {% if entry.languages.__len__() > 0 %}
        <div class="languages">
        <p>
-      <span class="label label-default">{{_('language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %}</span>
+      <span class="label label-default">{{_('Language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %}</span>
       </p>
       </div>
       {% endif %}
@@ -162,7 +162,7 @@
 
       {% if entry.pubdate[:10] != '0101-01-01' %}
       <div class="publishing-date">
-        <p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p>
+        <p>{{_('Published')}}: {{entry.pubdate|formatdate}} </p>
       </div>
       {% endif %}
       {% if cc|length > 0 %}
@@ -283,7 +283,7 @@
       {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
-          <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit metadata')}}</a>
+          <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
         </div>
       </div>
       {% endif %}
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 5ac1dad8..2ac9d463 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -8,11 +8,11 @@
   <h1>{{title}}</h1>
   <form role="form" method="POST">
     <div class="form-group">
-      <label for="mail_server">{{_('SMTP hostname')}}</label>
+      <label for="mail_server">{{_('SMTP Hostname')}}</label>
       <input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}">
     </div>
     <div class="form-group">
-      <label for="mail_port">{{_('SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)')}}</label>
+      <label for="mail_port">{{_('SMTP Port')}}</label>
       <input type="text" class="form-control" name="mail_port" id="mail_port" value="{{content.mail_port}}">
     </div>
     <div class="form-group">
@@ -24,23 +24,23 @@
         </select>
     </div>
     <div class="form-group">
-      <label for="mail_login">{{_('SMTP login')}}</label>
+      <label for="mail_login">{{_('SMTP Login')}}</label>
       <input type="text" class="form-control" name="mail_login" id="mail_login" value="{{content.mail_login}}">
     </div>
     <div class="form-group">
-      <label for="mail_password">{{_('SMTP password')}}</label>
+      <label for="mail_password">{{_('SMTP Password')}}</label>
       <input type="password" class="form-control" name="mail_password" id="mail_password" value="{{content.mail_password}}">
     </div>
     <div class="form-group">
-      <label for="mail_from">{{_('From e-mail')}}</label>
+      <label for="mail_from">{{_('From E-mail')}}</label>
       <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}">
     </div>
-    <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save settings')}}</button>
-    <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save settings and send Test E-Mail')}}</button>
-    <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Back')}}</a>
+    <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
+    <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save and Send Test E-mail')}}</button>
+    <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Cancel')}}</a>
   </form>
     {% if g.allow_registration %}
-    <h2>{{_('Allowed domains for registering')}}</h2>
+    <h2>{{_('Allowed Domains (Whitelist)')}}</h2>
     <form id="domain_add_allow" action="{{ url_for('admin.add_domain',allow=1)}}" method="POST">
     <div class="form-group required">
       <label for="domainname_allow">{{_('Add Domain')}}</label>
@@ -57,7 +57,7 @@
     </tr>
     </thead>
   </table>
-  <h2>{{_('Denied domains for registering')}}</h2>
+  <h2>{{_('Denied Domains (Blacklist)')}}</h2>
     <table class="table table-no-bordered" id="domain-deny-table" data-url="{{url_for('admin.list_domain', allow=0)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline">
       <thead>
         <tr>
@@ -87,9 +87,9 @@
       <div class="modal-header bg-danger">
       </div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to delete this domain rule?')}}</p>
+        <p>{{_('Are you sure you want to delete this domain?')}}</p>
         <button type="button" class="btn btn-danger" id="btndeletedomain" >{{_('Delete')}}</button>
-        <button type="button" class="btn btn-default" id="btncancel" data-dismiss="modal">{{_('Back')}}</button>
+        <button type="button" class="btn btn-default" id="btncancel" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -104,4 +104,3 @@
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
 {% endif %}
 {% endblock %}
-
diff --git a/cps/templates/generate_kobo_auth_url.html b/cps/templates/generate_kobo_auth_url.html
index fea9aecb..bfb79a0d 100644
--- a/cps/templates/generate_kobo_auth_url.html
+++ b/cps/templates/generate_kobo_auth_url.html
@@ -5,7 +5,7 @@
     {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}</a>
   </p>
   <p>
-    {% if not warning %}{{_('api_endpoint=')}}{{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
+    {% if not warning %}'api_endpoint='{{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
   </p>
   <p>
     {{_('Please note that every visit to this current page invalidates any previously generated Authentication url for this user.')}}</a>
diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 1f09a79d..e1e10388 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -20,6 +20,7 @@
   <div class="container-fluid">
   <div class="row">
     <div class="col">
+        <h1  class="text-center">{{instance}}</h1>
         <h1  class="text-center">{{ error_code }}</h1>
         <h3>{{ error_name }}</h3>
     </div>
@@ -34,14 +35,14 @@
   {% if issue %}
     <div class="row">
     <div class="col errorlink">Please report this issue with all related information:
-        <a href="https://github.com/janeczku/calibre-web/issues/new">{{_('Create issue')}}</a>
+        <a href="https://github.com/janeczku/calibre-web/issues/new">{{_('Create Issue')}}</a>
     </div>
       </div>
     {% endif %}
 
   <div class="row">
     <div class="col errorlink">
-        <a href="{{url_for('web.index')}}" title="{{ _('Back to home') }}">{{_('Back to home')}}</a>
+        <a href="{{url_for('web.index')}}" title="{{ _('Return to Home') }}">{{_('Return to Home')}}</a>
     </div>
   </div>
 
diff --git a/cps/templates/index.xml b/cps/templates/index.xml
index 08c8f4ec..c99388a3 100644
--- a/cps/templates/index.xml
+++ b/cps/templates/index.xml
@@ -21,7 +21,7 @@
     <content type="text">{{_('Popular publications from this catalog based on Downloads.')}}</content>
   </entry>
   <entry>
-    <title>{{_('Best rated Books')}}</title>
+    <title>{{_('Top Rated Books')}}</title>
     <link href="{{url_for('opds.feed_best_rated')}}" type="application/atom+xml;profile=opds-catalog"/>
     <id>{{url_for('opds.feed_best_rated')}}</id>
     <updated>{{ current_time }}</updated>
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 07a9b5b6..88e0a6eb 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -31,7 +31,7 @@
       <div class="container-fluid">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">{{_('Toggle navigation')}}</span>
+            <span class="sr-only">{{_('Toggle Navigation')}}</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -42,9 +42,9 @@
           <form class="navbar-form navbar-left" role="search" action="{{url_for('web.search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
-              <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search')}}">
+              <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search Library')}}">
               <span class="input-group-btn">
-                <button type="submit" id="query_submit" class="btn btn-default">{{_('Go!')}}</button>
+                <button type="submit" id="query_submit" class="btn btn-default">{{_('Search')}}</button>
               </span>
             </div>
           </form>
@@ -52,7 +52,7 @@
         <div class="navbar-collapse collapse">
           {% if g.user.is_authenticated or g.allow_anonymous %}
           <ul class="nav navbar-nav ">
-            <li><a href="{{url_for('web.advanced_search')}}" id="advanced_search"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm">{{_('Advanced Search')}}</span></a></li>
+            <li><a href="{{url_for('web.advanced_search')}}" id="advanced_search"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
@@ -70,14 +70,14 @@
                 {% endif %}
               {% endif %}
               {% if not g.user.is_anonymous %}
-                <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span><span class="hidden-sm">{{_('Tasks')}}</span></a></li>
+                <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
-                <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span><span class="hidden-sm">{{_('Admin')}}</span></a></li>
+                <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span> <span class="hidden-sm">{{_('Admin')}}</span></a></li>
               {% endif %}
-              <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span><span class="hidden-sm">{{g.user.nickname}}</span></a></li>
+              <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{g.user.nickname}}</span></a></li>
               {% if not g.user.is_anonymous %}
-              <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span><span class="hidden-sm">{{_('Logout')}}</span></a></li>
+              <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span> <span class="hidden-sm">{{_('Logout')}}</span></a></li>
               {% endif %}
             {% endif %}
             {% if g.allow_registration and not g.user.is_authenticated %}
@@ -114,7 +114,7 @@
       <div id="loader" hidden="true">
         <center>
           <h3>{{_('Uploading...')}}</h3>
-          <span>{{_("please don't refresh the page")}}</span>.
+          <span>{{_("Please do not refresh the page")}}</span>.
         </center>
       </div>
     {%endif%}
@@ -132,19 +132,18 @@
                     <li id="nav_{{element['id']}}" {% if page == element['page'] %}class="active"{% endif %}><a href="{{url_for(element['link'], data=element['page'], sort='new')}}"><span class="glyphicon {{element['glyph']}}"></span>{{_(element['text'])}}</a></li>
                 {% endif %}
               {% endfor %}
-
               {% if g.user.is_authenticated or g.allow_anonymous %}
                 <li class="nav-head hidden-xs public-shelves">{{_('Public Shelves')}}</li>
                 {% for shelf in g.public_shelfes %}
-                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
+                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span> {{shelf.name|shortentitle(40)}}</a></li>
                 {% endfor %}
                 <li class="nav-head hidden-xs your-shelves">{{_('Your Shelves')}}</li>
                 {% for shelf in g.user.shelf %}
-                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
+                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span> {{shelf.name|shortentitle(40)}}</a></li>
                 {% endfor %}
               {% if not g.user.is_anonymous %}
                 <li id="nav_createshelf" class="create-shelf"><a href="{{url_for('shelf.create_shelf')}}">{{_('Create a Shelf')}}</a></li>
-                <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('about.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('about.stats')}}"><span class="glyphicon glyphicon-info-sign"></span> {{_('About')}}</a></li>
               {% endif %}
               {% endif %}
 
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 8113c759..279ec28f 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -35,7 +35,7 @@
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#play" class="sm2-inline-button sm2-icon-play-pause">Play / pause</a>
+    <a href="#play" class="sm2-inline-button sm2-icon-play-pause">Play / Pause</a>
    </div>
   </div>
 
@@ -43,7 +43,7 @@
 
    <div class="sm2-playlist">
     <div class="sm2-playlist-target">
-     <noscript><p>JavaScript is required.</p></noscript>
+     <noscript><p>JavaScript Required.</p></noscript>
     </div>
    </div>
 
@@ -65,31 +65,31 @@
   <div class="sm2-inline-element sm2-button-element sm2-volume">
    <div class="sm2-button-bd">
     <span class="sm2-inline-button sm2-volume-control volume-shade"></span>
-    <a href="#volume" class="sm2-inline-button sm2-volume-control">volume</a>
+    <a href="#volume" class="sm2-inline-button sm2-volume-control">Volume</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#prev" title="Previous" class="sm2-inline-button sm2-icon-previous">&lt; previous</a>
+    <a href="#prev" title="Previous" class="sm2-inline-button sm2-icon-previous">&lt; Previous</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#next" title="Next" class="sm2-inline-button sm2-icon-next">&gt; next</a>
+    <a href="#next" title="Next" class="sm2-inline-button sm2-icon-next">&gt; Next</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#repeat" title="Repeat playlist" class="sm2-inline-button sm2-icon-repeat">&infin; repeat</a>
+    <a href="#repeat" title="Repeat playlist" class="sm2-inline-button sm2-icon-repeat">&infin; Repeat</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element sm2-menu">
    <div class="sm2-button-bd">
-    <a href="#menu" class="sm2-inline-button sm2-icon-menu">menu</a>
+    <a href="#menu" class="sm2-inline-button sm2-icon-menu">Menu</a>
    </div>
   </div>
 
diff --git a/cps/templates/login.html b/cps/templates/login.html
index 4a259287..23d59f2e 100644
--- a/cps/templates/login.html
+++ b/cps/templates/login.html
@@ -14,15 +14,15 @@
     </div>
     <div class="checkbox">
       <label>
-        <input type="checkbox" name="remember_me" checked> {{_('Remember me')}}
+        <input type="checkbox" name="remember_me" checked> {{_('Remember Me')}}
       </label>
     </div>
-    <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" name="submit" class="btn btn-default">{{_('Login')}}</button>
     {% if config.config_login_type == 0 and mail%}
-    <button type="submit" name="forgot" value="forgot" class="btn btn-default">{{_('Forgot password')}}</button>
+    <button type="submit" name="forgot" value="forgot" class="btn btn-default">{{_('Forgot Password?')}}</button>
     {% endif %}
     {% if config.config_remote_login %}
-    <a href="{{url_for('web.remote_login')}}" class="pull-right">{{_('Log in with magic link')}}</a>
+    <a href="{{url_for('web.remote_login')}}" class="pull-right">{{_('Log in with Magic Link')}}</a>
     {% endif %}
     {% if config.config_login_type == 2 %}
     <a href="{{url_for('oauth.github_login')}}" class="pull-right">
diff --git a/cps/templates/logviewer.html b/cps/templates/logviewer.html
index be14fa8c..e74ec27e 100644
--- a/cps/templates/logviewer.html
+++ b/cps/templates/logviewer.html
@@ -3,13 +3,13 @@
    <div id="log_group" class="inputs">
      {% if log_enable %}
       <div><input type="radio" name="log_radio" id="log1" value="0" checked>
-      <label for="log1">{{_('Show Calibre-Web log: ')}}</label>{{logfiles[0]}}</div>
+      <label for="log1">{{_('Show Calibre-Web Log: ')}}</label>{{logfiles[0]}}</div>
      {% else %}
-     <div><label for="log1">{{_('Calibre-Web log: ')}}</label> {{_("Stream output, can't be displayed")}}</div>
+     <div><label for="log1">{{_('Calibre-Web Log: ')}}</label> {{_("Stream output, can't be displayed")}}</div>
      {% endif %}
      {% if accesslog_enable %}
       <div><input type="radio" name="log_radio" id="log0" value="1" {% if not log_enable %}checked{% endif %}>
-      <label for="log0">{{_('Show access log: ')}}</label>{{logfiles[1]}}</div>
+      <label for="log0">{{_('Show Access Log: ')}}</label>{{logfiles[1]}}</div>
      {% endif %}
    </div>
    <div id="renderer" class="log"></div>
diff --git a/cps/templates/osd.xml b/cps/templates/osd.xml
index 5c35b764..b1077890 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/read.html b/cps/templates/read.html
index b3caec49..a4361fa0 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>ePubJS Reader</title>
+        <title>ePub Reader</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/cps/templates/register.html b/cps/templates/register.html
index 90ba8f8e..0e218ec2 100644
--- a/cps/templates/register.html
+++ b/cps/templates/register.html
@@ -1,14 +1,14 @@
 {% extends "layout.html" %}
 {% block body %}
 <div class="well col-sm-6 col-sm-offset-2">
-  <h2 style="margin-top: 0">{{_('Register a new account')}}</h2>
+  <h2 style="margin-top: 0">{{_('Register New Account')}}</h2>
   <form method="POST" role="form">
     <div class="form-group required">
       <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">
-      <label for="email">{{_('E-mail address')}}</label>
+      <label for="email">{{_('E-mail Address')}}</label>
       <input type="email" class="form-control" id="email" name="email" placeholder="{{_('Your email address')}}" required>
     </div>
     <button type="submit" id="submit" class="btn btn-primary">{{_('Register')}}</button>
diff --git a/cps/templates/remote_login.html b/cps/templates/remote_login.html
index a688ce62..ce755afd 100644
--- a/cps/templates/remote_login.html
+++ b/cps/templates/remote_login.html
@@ -1,15 +1,16 @@
 {% extends "layout.html" %}
 {% block body %}
 <div class="well">
-  <h2 style="margin-top: 0">{{_('Remote login')}}</h2>
+  <h2 style="margin-top: 0">{{_('Magic Link - Authorise New Device')}}</h2>
   <p>
-    {{_('Use your other device, login and visit ')}} <a href="{{verify_url}}">{{verify_url}}</a>.
-  </p>
+    {{_('On another device, login and visit:')}}
+  <h4><a href="{{verify_url}}">{{verify_url}}</a></b>
+  </h4>
   <p>
-    {{_('Once you do so, you will automatically get logged in on this device.')}}
+    {{_('Once verified, you will automatically be logged in on this device.')}}
   </p>
   <p>
-    {{_('The link will expire after 10 minutes.')}}
+    {{_('This verification link will expire in 10 minutes.')}}
   </p>
 </div>
 {% endblock %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index dfa42799..eb6e83d0 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -2,8 +2,8 @@
 {% block body %}
 <div class="discover">
     {% if entries|length < 1 %}
-      <h2>{{_('No Results for:')}} {{searchterm}}</h2>
-      <p>{{_('Please try a different search')}}</p>
+      <h2>{{_('No Results Found')}} {{searchterm}}</h2>
+      <p>{{_('Search Term:')}} {{searchterm}}</p>
     {% else %}
       <h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2>
       {% if g.user.is_authenticated %}
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index a5851475..e53a1cc6 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -16,14 +16,14 @@
     </div>
     <div class="row">
         <div class="form-group col-sm-6">
-          <label for="Publishstart">{{_('Publishing date from')}}</label>
+          <label for="Publishstart">{{_('Published Date From')}}</label>
           <div style="position: relative">
             <input type="date" class="form-control" name="Publishstart" id="Publishstart" value="">
             <input type="text" class="form-control fake-input hidden" id="fake_Publishstart" value="">
           </div>
         </div>
         <div class="form-group col-sm-6">
-          <label for="Publishend">{{_('Publishing date to')}}</label>
+          <label for="Publishend">{{_('Published Date To')}}</label>
           <div style="position: relative">
             <input type="date" class="form-control" name="Publishend" id="Publishend" value="">
             <input type="text" class="form-control fake-input hidden" id="fake_Publishend" value="">
@@ -114,11 +114,11 @@
     </div>
     <div class="row">
         <div class="form-group col-sm-6">
-          <label for="ratinghigh">{{_('Rating bigger than')}}</label>
+          <label for="ratinghigh">{{_('Rating Above')}}</label>
           <input type="number"  name="ratinghigh" id="ratinghigh" class="rating input-lg" data-clearable="" >
         </div>
         <div class="form-group col-sm-6">
-          <label for="ratinglow">{{_('Rating less than')}}</label>
+          <label for="ratinglow">{{_('Rating Below')}}</label>
           <input type="number"  name="ratinglow" id="ratinglow" class="rating input-lg" data-clearable="" >
         </div>
     </div>
@@ -167,7 +167,7 @@
       {% endfor %}
     {% endif %}
 
-    <button type="submit" id="adv_submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" id="adv_submit" class="btn btn-default">{{_('Search')}}</button>
   </form>
 </div>
 {% endblock %}
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 7f3c03cf..f37661ce 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -64,13 +64,13 @@
   <div class="modal-dialog modal-sm">
     <div class="modal-content">
       <div class="modal-header bg-danger text-center">
-      <span>{{_('Do you really want to delete the shelf?')}}</span>
+      <span>{{_('Are you sure you want to delete this shelf?')}}</span>
       </div>
       <div class="modal-body text-center">
-        <span>{{_('Shelf will be lost for everybody and forever!')}}</span>
+        <span>{{_('Shelf will be deleted for all users')}}</span>
           <p></p>
-        <a id="confirm" href="{{ url_for('shelf.delete_shelf', shelf_id=shelf.id) }}" class="btn btn-danger">{{_('Ok')}}</a>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <a id="confirm" href="{{ url_for('shelf.delete_shelf', shelf_id=shelf.id) }}" class="btn btn-danger">{{_('OK')}}</a>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
diff --git a/cps/templates/shelf_edit.html b/cps/templates/shelf_edit.html
index d7f32dc4..934efe2b 100644
--- a/cps/templates/shelf_edit.html
+++ b/cps/templates/shelf_edit.html
@@ -10,13 +10,13 @@
     {% if g.user.role_edit_shelfs() %}
       <div class="checkbox">
         <label>
-          <input type="checkbox" name="is_public" {% if shelf.is_public == 1 %}checked{% endif %}> {{_('should the shelf be public?')}}
+          <input type="checkbox" name="is_public" {% if shelf.is_public == 1 %}checked{% endif %}> {{_('Share with Everyone')}}
         </label>
       </div>
     {% endif %}
-    <button type="submit" class="btn btn-default" id="submit">{{_('Submit')}}</button>
+    <button type="submit" class="btn btn-default" id="submit">{{_('Save')}}</button>
     {% if shelf.id != None %}
-      <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" class="btn btn-default">{{_('Back')}}</a>
+      <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" class="btn btn-default">{{_('Cancel')}}</a>
     {% endif %}
   </form>
 </div>
diff --git a/cps/templates/shelf_order.html b/cps/templates/shelf_order.html
index 0094fb31..84fb0208 100644
--- a/cps/templates/shelf_order.html
+++ b/cps/templates/shelf_order.html
@@ -2,7 +2,7 @@
 {% block body %}
   <div class="col-sm-8 col-lg-8 col-xs-12">
     <h2>{{title}}</h2>
-    <div>{{_('Drag \'n drop to rearrange order')}}</div>
+    <div>{{_('Drag to Rearrange Order')}}</div>
       <div id="sortTrue" class="list-group">
         {% for entry in entries %}
           <div id="{{entry['id']}}" class="list-group-item">
@@ -37,6 +37,3 @@
 <script src="{{ url_for('static', filename='js/libs/Sortable.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/shelforder.js') }}"></script>
 {% endblock %}
-
-
-
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index 1c4692e4..0457e4b9 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -1,10 +1,10 @@
 {% extends "layout.html" %}
 {% block body %}
-  <h3>{{_('About')}}</h3>
+  <h3>{{_('About')}} {{instance}}</h3>
 <p>{{instance}} powered by
 <a href="https://github.com/janeczku/calibre-web" title="Calibre-Web">Calibre-Web</a>.
 </p>
-  <h3>{{_('Calibre library statistics')}}</h3>
+  <h3>{{_('Library Statistics')}}</h3>
 <table id="stats" class="table">
   <tbody>
     <tr>
@@ -25,11 +25,11 @@
     </tr>
   </tbody>
 </table>
-  <h3>{{_('Linked libraries')}}</h3>
+  <h3>{{_('Linked Libraries')}}</h3>
 <table id="libs" class="table">
   <thead>
     <tr>
-      <th>{{_('Program library')}}</th>
+      <th>{{_('Program Library')}}</th>
       <th>{{_('Installed Version')}}</th>
     </tr>
   </thead>
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 2f2c37c5..4a755c82 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block body %}
 <div class="discover">
-    <h2>{{_('Tasks list')}}</h2>
+    <h2>{{_('Tasks')}}</h2>
     <table class="table table-no-bordered" id="table" data-url="{{  url_for('web.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc">
       <thead>
         <tr>
@@ -14,8 +14,8 @@
             <th data-halign="right" data-align="right" data-field="taskMessage" data-sortable="true">{{_('Task')}}</th>
             <th data-halign="right" data-align="right" data-field="status" data-sortable="true">{{_('Status')}}</th>
             <th data-halign="right" data-align="right" data-field="progress" data-sortable="true" data-sorter="elementSorter">{{_('Progress')}}</th>
-            <th data-halign="right" data-align="right" data-field="runtime" data-sortable="true" data-sort-name="rt">{{_('Runtime')}}</th>
-            <th data-halign="right" data-align="right" data-field="starttime" data-sortable="true" data-sort-name="id">{{_('Starttime')}}</th>
+            <th data-halign="right" data-align="right" data-field="runtime" data-sortable="true" data-sort-name="rt">{{_('Run Time')}}</th>
+            <th data-halign="right" data-align="right" data-field="starttime" data-sortable="true" data-sort-name="id">{{_('Start Time')}}</th>
             <th data-field="id" data-visible="false"></th>
             <th data-field="rt" data-visible="false"></th>
         </tr>
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 00763ff2..2b1640c3 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -10,7 +10,7 @@
     </div>
     {% endif %}
     <div class="form-group">
-      <label for="email">{{_('E-mail address')}}</label>
+      <label for="email">{{_('E-mail Address')}}</label>
       <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() %}
@@ -23,7 +23,7 @@
         </div>
     {% endif %}
     <div class="form-group">
-      <label for="kindle_mail">{{_('Kindle E-Mail')}}</label>
+      <label for="kindle_mail">{{_('Send to Kindle E-mail Address')}}</label>
       <input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
     </div>
     {% if not content.role_anonymous() %}
@@ -38,9 +38,9 @@
     {% endif %}
 
     <div class="form-group">
-      <label for="default_language">{{_('Show books with language')}}</label>
+      <label for="default_language">{{_('Language of Books')}}</label>
         <select name="default_language" id="default_language" class="form-control">
-            <option value="all" {% if new_user == 1 %}selected{% endif %}>{{ _('Show all') }}</option>
+            <option value="all" {% if new_user == 1 %}selected{% endif %}>{{ _('Show All') }}</option>
             {%  for language in languages %}
             <option value="{{ language.lang_code }}" {% if content.default_language == language.lang_code %}selected{% endif %}>{{ language.name }}</option>
             {% endfor %}
@@ -77,7 +77,7 @@
 
       <div class="form-group">
           <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
-          <label for="Show_detail_random">{{_('Show random books in detail view')}}</label>
+          <label for="Show_detail_random">{{_('Show Random Books')}}</label>
       </div>
       {% if ( g.user and g.user.role_admin() and not new_user ) %}
       <a href="#" id="get_user_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/denied Tags')}}</a>
@@ -89,7 +89,7 @@
     {% if not content.role_anonymous() %}
     <div class="form-group">
       <input type="checkbox" name="admin_role" id="admin_role" {% if content.role_admin() %}checked{% endif %}>
-      <label for="admin_role">{{_('Admin user')}}</label>
+      <label for="admin_role">{{_('Admin User')}}</label>
     </div>
     {% endif %}
     <div class="form-group">
@@ -98,7 +98,7 @@
     </div>
     <div class="form-group">
       <input type="checkbox" name="viewer_role" id="viewer_role" {% if content.role_viewer() %}checked{% endif %}>
-      <label for="viewer_role">{{_('Allow book viewer')}}</label>
+      <label for="viewer_role">{{_('Allow eBook Viewer')}}</label>
     </div>
     <div class="form-group">
       <input type="checkbox" name="upload_role" id="upload_role" {% if content.role_upload() %}checked{% endif %}>
@@ -110,7 +110,7 @@
     </div>
     <div class="form-group">
       <input type="checkbox" name="delete_role" id="delete_role" {% if content.role_delete_books() %}checked{% endif %}>
-      <label for="delete_role">{{_('Allow Delete books')}}</label>
+      <label for="delete_role">{{_('Allow Delete Books')}}</label>
     </div>
       {% if not content.role_anonymous() %}
         <div class="form-group">
@@ -126,15 +126,15 @@
     {% if g.user and g.user.role_admin() and not profile and not new_user and not content.role_anonymous() %}
       <div class="checkbox">
         <label>
-          <input type="checkbox" id="delete" name="delete"> {{_('Delete this user')}}
+          <input type="checkbox" id="delete" name="delete"> {{_('Delete User')}}
         </label>
       </div>
     {% endif %}
     </div>
       <div class="col-sm-12">
-    <button type="submit" id="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" id="submit" class="btn btn-default">{{_('Save')}}</button>
     {% if not profile %}
-      <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Back')}}</a>
+      <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Cancel')}}</a>
     {% endif %}
     </div>
   </form>
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 700e9c8d..b294dcef 100644
Binary files a/cps/translations/cs/LC_MESSAGES/messages.mo and b/cps/translations/cs/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 43e60d62..732da97b 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2020-01-08 11:37+0000\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
@@ -25,177 +25,186 @@ msgstr "nainstalováno"
 msgid "not installed"
 msgstr "není nainstalováno"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statistika"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Server restartován, znovu načtěte stránku"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Vypínám server, zavřete okno"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Stránka správce"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Změnit nastavení e-mailového serveru"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Zkušební e-mail úspěšně odeslán na %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Při odesílání zkušebního e-mailu došlo k chybě: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr "Toto uživatelské jméno je již použito"
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Došlo k neznámé chybě."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizace dokončena, klepněte na tlačítko OK a znovu načtěte stránku"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Všeobecná chyba"
 
@@ -388,42 +397,50 @@ msgstr "Soubor %(file)s nenalezen na Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Čekám"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Spuštěno"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-mail: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Převést:"
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Nahrát:"
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Neznámá úloha:"
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -552,16 +569,20 @@ msgstr "Police %(title)s změněna"
 msgid "Edit a shelf"
 msgstr "Upravit polici"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Police: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
@@ -579,19 +600,19 @@ msgid "Hot Books"
 msgstr "Žhavé knihy"
 
 #: cps/ub.py:60
-msgid "Show hot books"
-msgstr "Zobrazit žhavé knihy"
+msgid "Show Hot Books"
+msgstr ""
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
-msgstr "Nejlépe hodnocené knihy"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
+msgstr ""
 
 #: cps/ub.py:65
-msgid "Show best rated books"
-msgstr "Zobrazit nejlépe hodnocené knihy"
+msgid "Show Top Rated Books"
+msgstr ""
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -600,7 +621,7 @@ msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -616,7 +637,7 @@ msgstr "Objevte"
 msgid "Show random books"
 msgstr "Zobrazit náhodné knihy"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -625,7 +646,7 @@ msgid "Show category selection"
 msgstr "Zobrazit výběr kategorie"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Série"
 
@@ -641,7 +662,7 @@ msgstr "Autoři"
 msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -650,6 +671,7 @@ msgid "Show publisher selection"
 msgstr "Zobrazit výběr vydavatele"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -702,216 +724,201 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klepnutím na tlačítko níže aktualizujte na nejnovější stabilní verzi."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Nedávno přidané knihy"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Nejlépe hodnocené knihy"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Náhodné knihy"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Knihy"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
-msgstr "Žhavé knihy (nejstahovanější)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
+msgstr ""
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "Chyba při otevíraní eKnihy. Soubor neexistuje nebo neni přístupný:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr ""
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Seznam vydavatelů"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Seznam sérií"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Dostupné jazyky"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Seznam kategorií"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
-msgstr "Hodnocení  >= %(rating)s"
+msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "hledat"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Při odesílání této knihy došlo k chybě: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "registrovat"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Toto uživatelské jméno nebo e-mailová adresa jsou již používány."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Nelze se přihlásit. LDAP server neodpovídá, kontaktujte svého správce"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na váši emailovou adresu"
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "přihlásit se"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Token nenalezen"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Token vypršel"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Úspěch! Vraťte se prosím do zařízení"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "Chyba při otevíraní eKnihy. Soubor neexistuje nebo neni přístupný:"
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Číst knihu"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Chyba při otevírání eKnihy. Soubor neexistuje nebo není přístupný"
 
@@ -926,23 +933,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen selhal chybou %(error)s. Zpráva: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Seznam uživatelů"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Přezdívka"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "E-mail"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "Staženo"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -956,8 +966,8 @@ msgid "Download"
 msgstr "Stahovat"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
-msgstr "Prohlížet"
+msgid "View eBooks"
+msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
 msgid "Upload"
@@ -967,28 +977,32 @@ msgstr "Nahrávat"
 msgid "Edit"
 msgstr "Upravovat"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Nastavení e-mailového serveru SMTP"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP hostitel"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP přihlášení"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Z e-mailu"
 
 #: cps/templates/admin.html:61
@@ -1000,63 +1014,71 @@ msgid "Configuration"
 msgstr "Konfigurace"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Calibre DB adresář"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Úroveň logu"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Knihy na stránku"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Nahrávání"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Anonymní prohlížení"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Veřejná registrace"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Vzdálené přihlášení"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr "Reverzní proxy přihlášení"
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr "Název záhlaví reverzního prixy"
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Správa"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Zobrazit log"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Znovupřipojení ke Calibre DB"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Restartovat Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Zastavit Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1076,7 +1098,7 @@ msgid "Current version"
 msgstr "Současná verze"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Zkontrolovat aktualizace"
 
 #: cps/templates/admin.html:149
@@ -1084,30 +1106,29 @@ msgid "Perform Update"
 msgstr "Provést aktualizaci"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat Calibre-Web?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
-msgstr "Ok"
+msgid "OK"
+msgstr "OK"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Zpět"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Opravdu chcete zastavit Calibre-Web?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Probíhá aktualizace, prosím nenačítejte stránku znovu"
 
 #: cps/templates/author.html:15
@@ -1143,7 +1164,8 @@ msgid "Delete formats:"
 msgstr "Smazat formáty:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Smazat"
 
@@ -1186,23 +1208,23 @@ msgid "Tags"
 msgstr "Štítky"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "ID série"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Hodnocení"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Adresa URL obalu (jpg, obal je stažen a uložen v databázi, pole je potom opět prázdné)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Nahrát obal z místní jednotky"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Datum vydání"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1211,7 +1233,8 @@ msgstr "Datum vydání"
 msgid "Publisher"
 msgstr "Vydavatel"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Jazyk"
 
@@ -1224,34 +1247,33 @@ msgid "No"
 msgstr "Ne"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Nahrát formát"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "zobrazit knihu po úpravě"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Odeslat"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Jste si opravdu jisti?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Kniha bude smazána z Calibre databáze"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "a z hard disku"
 
 #: cps/templates/book_edit.html:209
@@ -1262,10 +1284,6 @@ msgstr "Klíčové slovo"
 msgid " Search keyword "
 msgstr "Hledat klíčové slovo"
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Go!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Klepnutím na obal načtěte metadata do formuláře"
@@ -1274,8 +1292,9 @@ msgstr "Klepnutím na obal načtěte metadata do formuláře"
 msgid "Loading..."
 msgstr "Načítání..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Zavřít"
 
@@ -1296,8 +1315,8 @@ msgid "Library Configuration"
 msgstr "Konfigurace knihovny"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
-msgstr "Umístění Calibre databáze"
+msgid "Location of Calibre Database"
+msgstr ""
 
 #: cps/templates/config_edit.html:25
 msgid "Use Google Drive?"
@@ -1348,7 +1367,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Umístění souboru s klíčem SSL (ponechte prázdné pro servery jiné než SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Aktualizovat kanál"
 
 #: cps/templates/config_edit.html:101
@@ -1371,10 +1390,6 @@ msgstr "Noční (Automaticky)"
 msgid "Logfile Configuration"
 msgstr "Konfigurace log souboru"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Log Level"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Umístění a jméno log souboru (calibre-web.log pro žádnou položku)"
@@ -1392,255 +1407,271 @@ msgid "Feature Configuration"
 msgstr "Konfigurace funkcí"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Povolit nahrávání"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Povolit anonymní prohlížení"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Povolit veřejnou registraci"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Povolit vzdálené přihlášení (\\\"magic link\\\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "Použít Goodreads"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Získat API klíč"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Goodreads API Klíč"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Typ přihlášení"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Použít standartní ověření"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Použít ověření LDAP"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Použít OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Název hostitele serveru LDAP nebo IP adresa"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "LDAP Server Port"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "LDAP schéma (ldap nebo ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr "Uživatelské jméno správce LDAP"
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr "Heslo správce LDAP"
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "LDAP Server používá SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "LDAP Server používá TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "Certifikát serveru LDAP"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "Cesta certifikátu LDAP SSL"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Rozlišující název LDAP (DN)"
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr "Filtr objektu uživatele LDAP"
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Server LDAP je OpenLDAP?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Obtain %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Klient Id"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Klient Tajemství"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Povolit reverzní ověření proxy"
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr "Název záhlaví reverzního proxy"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Externí binární soubory"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Žádný převaděč"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Použít Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Použít calibre převaděč eknih"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Nastavení převaděče eknih"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Cesta k převaděči"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Umístění Unrar binarních souborů"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Přihlásit"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Prohlížet konfiguraci"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Název"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Počet náhodných knih k zobrazení"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Počet autorů k zobrazení před skrytím (0 = zakázat skrytí)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Motiv"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Standartní motiv"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! Tmavý motiv"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Regulární výraz pro ignorování sloupců"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Propojit stav čtení/nepřečtení do sloupce Calibre"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Regulární výraz pro řazení názvů"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Štítky pro obsah pro dospělé"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Žádné"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Regulární výraz pro řazení názvů"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Výchozí nastavení pro nového uživatele"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Uživatel admin"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Povolit stahování"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Povolit prohlížeč knih"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Povolit nahrávání"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Povolit úpravy"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
 msgstr "Povolit mazání knih"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Povolit změnu hesla"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Povolit úpravy veřejných polic"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Výchozí zobrazení pro nové uživatele"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Zobrazit náhodné knihy v podrobném zobrazení"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Zobrazit obsah pro dospělé"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Číst v prohližeči"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Poslechnout v prohlížeči"
 
 #: cps/templates/detail.html:117
@@ -1651,9 +1682,9 @@ msgstr "Kniha"
 msgid "of"
 msgstr "z"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "jazyk"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1676,21 +1707,9 @@ msgid "Add to shelf"
 msgstr "Přidat do police"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Upravit metadata"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP port (obvykle 25 pro prostý SMTP a 465 pro SSL a 587 pro STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Šifrování"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Žádné"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1700,23 +1719,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "SMTP heslo"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Z e-mailu"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Uložit nastavení"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Uložit nastavení a odeslat zkušební e-mail"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Povolené domény pro registraci"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1732,29 +1743,33 @@ msgid "Enter domainname"
 msgstr "Zadejte jméno domény"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr "Zakázané domény pro registraci"
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Opravdu chcete odstranit toto pravidlo domény?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Další"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Vytvořit problém"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Zpět domů"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Objevte (Náhodné knihy)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Seřadit podle serií"
@@ -1779,7 +1794,11 @@ msgstr "Nedávno přidané knihy"
 msgid "The latest Books"
 msgstr "Nejnovější knihy"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Náhodné knihy"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Zobrazit náhodné knihy"
 
@@ -1807,7 +1826,7 @@ msgstr "Knihy seřazené podle jazyků"
 msgid "Books ordered by file formats"
 msgstr "Knihy seřazené podle soboru formátů"
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Veřejné police"
 
@@ -1815,7 +1834,7 @@ msgstr "Veřejné police"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Knihy uspořádané do veřejných polic, viditelné všem"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Vaše police"
 
@@ -1827,10 +1846,19 @@ msgstr "Vlastní police uživatele, viditelné pouze pro aktuálního uživatele
 msgid "Home"
 msgstr "Domů"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Zpět"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Přepnout navigaci"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
@@ -1852,70 +1880,65 @@ msgstr "Odhlásit se"
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Nahrávání..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
+msgid "Please do not refresh the page"
 msgstr "prosím neobnovujte stránku"
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Procházet"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Vytvořit polici"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "O Calibre-Web"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Předchozí"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Podrobnosti o knize"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Chyba"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Uživatelské jméno"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Heslo"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Zapamatovat si"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr "Zapomenuté heslo"
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Přihlásit se pomocí magického odkazu"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr "Zobrazit Calibre-Web log: "
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr "Calibre-Web log: "
 
 #: cps/templates/logviewer.html:8
@@ -1923,11 +1946,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
 msgstr "Zobrazit log přístupu: "
 
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
+msgstr ""
+
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web katalog eknih"
 
 #: cps/templates/read.html:74
@@ -2039,51 +2086,51 @@ msgid "Basic txt Reader"
 msgstr "Základní txt čtečka"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Založit nový účet"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Zvolte uživatelské jméno"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "E-mailová adresa"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Použijte své druhé zařízení, přihlaste se a navštivte"
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Jakmile tak učiníte, budete automaticky přihlášeni na tomto zařízení."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Odkaz vyprší za 10 minut"
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
+msgid "No Results Found"
 msgstr "Žádné výsledky pro:"
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Zkuste prosím jiné vyhledávání"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Výsledky pro:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Datum vydání od"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Datum vydání do"
 
 #: cps/templates/search_form.html:43
@@ -2107,11 +2154,11 @@ msgid "Exclude Extensions"
 msgstr "Vynechat přípony"
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Hodnoceni více než"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Hodnocení méně než"
 
 #: cps/templates/shelf.html:10
@@ -2127,23 +2174,23 @@ msgid "Change order"
 msgstr "Změnit řazení"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
-msgstr "Opravdu chcete odstranit polici?"
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "Police budou ztracena pro všechny a navždy!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "měla by být police veřejná?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Přetažením uspořádáte pořadí"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Statistika knihovny Calibre"
 
 #: cps/templates/stats.html:12
@@ -2163,21 +2210,17 @@ msgid "Series in this Library"
 msgstr "Sérií v této knihovně"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Propojené knihovny"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Knihovna programu"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Nainstalovaná verze"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Seznam úkolů"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Uživatel"
@@ -2195,11 +2238,11 @@ msgid "Progress"
 msgstr "Průběh"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Doba spuštění"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Čas spuštění"
 
 #: cps/templates/tasks.html:24
@@ -2214,16 +2257,12 @@ msgstr "Skrýt všechny úkoly"
 msgid "Reset user Password"
 msgstr "Resetovat uživatelské heslo"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Kindle e-mail"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Zobrazit knihy s jazykem"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Zobrazit vše"
 
 #: cps/templates/user_edit.html:52
@@ -2238,1370 +2277,110 @@ msgstr "Připojit"
 msgid "Unlink"
 msgstr "Odpojit"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
-msgstr "Odstranit tohoto uživatele"
-
-#: cps/templates/user_edit.html:138
-msgid "Recent Downloads"
-msgstr "Nedávná stahování"
-
-#~ msgid "Excecution permissions missing"
-#~ msgstr "Chybí oprávnění k provedení"
-
-#~ msgid "Error excecuting UnRar"
-#~ msgstr "Chyba při provádění UnRar"
-
-#~ msgid "Unrar binary file not found"
-#~ msgstr "UnRar binární soubor nenalezen"
-
-#~ msgid "Newest Books"
-#~ msgstr "Nejnovější knihy"
-
-#~ msgid "Oldest Books"
-#~ msgstr "Nejstarší knihy"
-
-#~ msgid "Books (A-Z)"
-#~ msgstr "Knihy (A-Z)"
-
-#~ msgid "Books (Z-A)"
-#~ msgstr "Knihy (Z-A)"
-
-#~ msgid "successfully deleted shelf %(name)s"
-#~ msgstr "police %(name)s úspěšně smazána"
-
-#~ msgid "Import of optional Google Drive requirements missing"
-#~ msgstr "Chybí import volitelných požadavků Google Drive"
-
-#~ msgid "client_secrets.json is missing or not readable"
-#~ msgstr "client_secrets.json chybí nebo je nečitelný"
-
-#~ msgid "client_secrets.json is not configured for web application"
-#~ msgstr "client_secrets.json není nakonfigurován pro webovou aplikaci"
-
-#~ msgid "Keyfile location is not valid, please enter correct path"
-#~ msgstr "Umístění souboru s klíčem není platné, zadejte prosím správnou cestu"
-
-#~ msgid "Certfile location is not valid, please enter correct path"
-#~ msgstr "Umístění souboru certifikátu je neplatné, zadejte prosím správnou cestu"
-
-#~ msgid "Logfile location is not valid, please enter correct path"
-#~ msgstr "Umístění log souboru není platné, zadejte prosím správnou cestu"
-
-#~ msgid "DB location is not valid, please enter correct path"
-#~ msgstr "Umístění databáze je neplatné, zadejte prosím správnou cestu"
-
-#~ msgid "Failed to create path for cover %(path)s (Permission denied)."
-#~ msgstr "Nepodařilo se vytvořit cestu pro obal %(path)s (Oprávnění odepřeno)."
-
-#~ msgid "Failed to store cover-file %(cover)s."
-#~ msgstr "Uložení obalu %(cover)s se nezdařilo."
-
-#~ msgid "Cover-file is not a valid image file"
-#~ msgstr "Soubor obalu není platným souborem obrázku"
-
-#~ msgid "unknown"
-#~ msgstr "neznámý"
-
-#~ msgid "File %(title)s"
-#~ msgstr "Soubor %(title)s"
-
-#~ msgid "Use"
-#~ msgstr "Použít"
-
-#~ msgid "Show sorted books"
-#~ msgstr "Zobrazit seřazené knihy"
-
-#~ msgid "New Books"
-#~ msgstr "Nové knihy"
-
-#~ msgid "Sorted Books"
-#~ msgstr "Seřazené knihy"
-
-#~ msgid "Sort By"
-#~ msgstr "Seřadit podle"
-
-#~ msgid "Newest"
-#~ msgstr "Nejnovější"
-
-#~ msgid "Oldest"
-#~ msgstr "Nejstarší"
-
-#~ msgid "Ascending"
-#~ msgstr "Vzestupně"
-
-#~ msgid "Descending"
-#~ msgstr "Sestupně"
-
-#~ msgid "PDF.js viewer"
-#~ msgstr "Prohlížeč PDF.js"
-
-#~ msgid "Preparing document for printing..."
-#~ msgstr "Příprava dokumentu pro tisk..."
-
-#~ msgid "Using your another device, visit"
-#~ msgstr "Pomocí jiného zařízení navštivte"
-
-#~ msgid "and log in"
-#~ msgstr "a přihlašte se"
-
-#~ msgid "Afar"
-#~ msgstr "Afar"
-
-#~ msgid "Abkhazian"
-#~ msgstr "Abkhazian"
-
-#~ msgid "Achinese"
-#~ msgstr "Achinese"
-
-#~ msgid "Acoli"
-#~ msgstr "Acoli"
-
-#~ msgid "Adangme"
-#~ msgstr "Adangme"
-
-#~ msgid "Adyghe"
-#~ msgstr "Adyghe"
-
-#~ msgid "Afrihili"
-#~ msgstr "Afrihili"
-
-#~ msgid "Afrikaans"
-#~ msgstr "Afrikaans"
-
-#~ msgid "Ainu (Japan)"
-#~ msgstr "Ainu (Giappone)"
-
-#~ msgid "Akan"
-#~ msgstr "Akan"
-
-#~ msgid "Akkadian"
-#~ msgstr "Accadico"
-
-#~ msgid "Aleut"
-#~ msgstr "Aleut"
-
-#~ msgid "Altai; Southern"
-#~ msgstr "Altai meridionale"
-
-#~ msgid "Amharic"
-#~ msgstr "Amarico"
-
-#~ msgid "English; Old (ca. 450-1100)"
-#~ msgstr "Inglese antico (ca. 450-1100)"
-
-#~ msgid "Angika"
-#~ msgstr "Angika"
-
-#~ msgid "Arabic"
-#~ msgstr "Arabo"
-
-#~ msgid "Aramaic; Official (700-300 BCE)"
-#~ msgstr "Aramaico ufficiale (700-300 p.e.v.)"
-
-#~ msgid "Aragonese"
-#~ msgstr "Aragonese"
-
-#~ msgid "Mapudungun"
-#~ msgstr "Mapudungun"
-
-#~ msgid "Arapaho"
-#~ msgstr "Arapaho"
-
-#~ msgid "Arawak"
-#~ msgstr "Arawak"
-
-#~ msgid "Assamese"
-#~ msgstr "Assamese"
-
-#~ msgid "Asturian"
-#~ msgstr "Asturiano"
-
-#~ msgid "Avaric"
-#~ msgstr "Avarico"
-
-#~ msgid "Avestan"
-#~ msgstr "Avestano"
-
-#~ msgid "Awadhi"
-#~ msgstr "Awadhi"
-
-#~ msgid "Aymara"
-#~ msgstr "Aymara"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbaijano"
-
-#~ msgid "Bashkir"
-#~ msgstr "Bashkir"
-
-#~ msgid "Baluchi"
-#~ msgstr "Baluchi"
-
-#~ msgid "Bambara"
-#~ msgstr "Bambara"
-
-#~ msgid "Balinese"
-#~ msgstr "Balinese"
-
-#~ msgid "Basa (Cameroon)"
-#~ msgstr "Basa (Cameru)"
-
-#~ msgid "Beja"
-#~ msgstr "Beja"
-
-#~ msgid "Belarusian"
-#~ msgstr "Bielorusso"
-
-#~ msgid "Bemba (Zambia)"
-#~ msgstr "Bemba (Zambia)"
-
-#~ msgid "Bengali"
-#~ msgstr "Bengalese"
-
-#~ msgid "Bhojpuri"
-#~ msgstr "Bhojpuri"
-
-#~ msgid "Bikol"
-#~ msgstr "Bikol"
-
-#~ msgid "Bini"
-#~ msgstr "Bini"
-
-#~ msgid "Bislama"
-#~ msgstr "Bislama"
-
-#~ msgid "Siksika"
-#~ msgstr "Siksika"
-
-#~ msgid "Tibetan"
-#~ msgstr "Tibetano"
-
-#~ msgid "Bosnian"
-#~ msgstr "Bosniaco"
-
-#~ msgid "Braj"
-#~ msgstr "Braj"
-
-#~ msgid "Breton"
-#~ msgstr "Bretone"
-
-#~ msgid "Buriat"
-#~ msgstr "Buriat"
-
-#~ msgid "Buginese"
-#~ msgstr "Buginese"
-
-#~ msgid "Bulgarian"
-#~ msgstr "Bulgaro"
-
-#~ msgid "Bilin"
-#~ msgstr "Bilin"
-
-#~ msgid "Caddo"
-#~ msgstr "Caddo"
-
-#~ msgid "Carib; Galibi"
-#~ msgstr "Carib (Galibi)"
-
-#~ msgid "Catalan"
-#~ msgstr "Catalano"
-
-#~ msgid "Cebuano"
-#~ msgstr "Cebuano"
-
-#~ msgid "Czech"
-#~ msgstr "Ceco"
-
-#~ msgid "Chamorro"
-#~ msgstr "Chamorro"
-
-#~ msgid "Chibcha"
-#~ msgstr "Chibcha"
-
-#~ msgid "Chechen"
-#~ msgstr "Chechen"
-
-#~ msgid "Chagatai"
-#~ msgstr "Ciagataico"
-
-#~ msgid "Chuukese"
-#~ msgstr "Chuukese"
-
-#~ msgid "Mari (Russia)"
-#~ msgstr "Mari (Russia)"
-
-#~ msgid "Chinook jargon"
-#~ msgstr "Chinook jargon"
-
-#~ msgid "Choctaw"
-#~ msgstr "Choctaw"
-
-#~ msgid "Chipewyan"
-#~ msgstr "Chipewyan"
-
-#~ msgid "Cherokee"
-#~ msgstr "Cherokee"
-
-#~ msgid "Slavonic; Old"
-#~ msgstr "Slavo antico"
-
-#~ msgid "Chuvash"
-#~ msgstr "Chuvash"
-
-#~ msgid "Cheyenne"
-#~ msgstr "Cheyenne"
-
-#~ msgid "Coptic"
-#~ msgstr "Copto"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
 
-#~ msgid "Cornish"
-#~ msgstr "Cornish"
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
 
-#~ msgid "Corsican"
-#~ msgstr "Corso"
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
 
-#~ msgid "Cree"
-#~ msgstr "Cree"
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
 
-#~ msgid "Turkish; Crimean"
-#~ msgstr "Turco; Crimeo"
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
+msgstr "Odstranit tohoto uživatele"
 
-#~ msgid "Kashubian"
-#~ msgstr "Kashubian"
+#: cps/templates/user_edit.html:144
+msgid "Recent Downloads"
+msgstr "Nedávná stahování"
 
-#~ msgid "Welsh"
-#~ msgstr "Gallese"
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
 
-#~ msgid "Dakota"
-#~ msgstr "Dakota"
-
-#~ msgid "Danish"
-#~ msgstr "Danese"
-
-#~ msgid "Dargwa"
-#~ msgstr "Dargwa"
-
-#~ msgid "Delaware"
-#~ msgstr "Delaware"
-
-#~ msgid "Slave (Athapascan)"
-#~ msgstr "Slave (Athapascan)"
-
-#~ msgid "German"
-#~ msgstr "Tedesco"
-
-#~ msgid "Dogrib"
-#~ msgstr "Dogrib"
-
-#~ msgid "Dinka"
-#~ msgstr "Dinca"
-
-#~ msgid "Dhivehi"
-#~ msgstr "Dhivehi"
-
-#~ msgid "Dogri (macrolanguage)"
-#~ msgstr "Dogri (macrolingua)"
-
-#~ msgid "Sorbian; Lower"
-#~ msgstr "Lusaziano inferiore"
-
-#~ msgid "Duala"
-#~ msgstr "Duala"
-
-#~ msgid "Dutch; Middle (ca. 1050-1350)"
-#~ msgstr "Olandese medio (ca. 1050-1350)"
-
-#~ msgid "Dyula"
-#~ msgstr "Diula"
-
-#~ msgid "Dzongkha"
-#~ msgstr "Dzongkha"
-
-#~ msgid "Efik"
-#~ msgstr "Efik"
-
-#~ msgid "Egyptian (Ancient)"
-#~ msgstr "Egiziano antico"
-
-#~ msgid "Ekajuk"
-#~ msgstr "Ekajuk"
-
-#~ msgid "Greek; Modern (1453-)"
-#~ msgstr "Greco moderno (1453-)"
-
-#~ msgid "Elamite"
-#~ msgstr "Elamitico"
-
-#~ msgid "English"
-#~ msgstr "Inglese"
-
-#~ msgid "English; Middle (1100-1500)"
-#~ msgstr "Inglese medio (1100-1500)"
-
-#~ msgid "Esperanto"
-#~ msgstr "Esperanto"
-
-#~ msgid "Estonian"
-#~ msgstr "Estone"
-
-#~ msgid "Basque"
-#~ msgstr "Basco"
-
-#~ msgid "Ewe"
-#~ msgstr "Ewe"
-
-#~ msgid "Ewondo"
-#~ msgstr "Ewondo"
-
-#~ msgid "Fang (Equatorial Guinea)"
-#~ msgstr "Fang (Guinea equatoriale)"
-
-#~ msgid "Faroese"
-#~ msgstr "Faroese"
-
-#~ msgid "Persian"
-#~ msgstr "Persiano"
-
-#~ msgid "Fanti"
-#~ msgstr "Fanti"
-
-#~ msgid "Fijian"
-#~ msgstr "Figiano"
-
-#~ msgid "Filipino"
-#~ msgstr "Filippino"
-
-#~ msgid "Finnish"
-#~ msgstr "Finlandese"
-
-#~ msgid "Fon"
-#~ msgstr "Fon"
-
-#~ msgid "French"
-#~ msgstr "Francese"
-
-#~ msgid "French; Middle (ca. 1400-1600)"
-#~ msgstr "Francese medio (ca. 1400-1600)"
-
-#~ msgid "French; Old (842-ca. 1400)"
-#~ msgstr "Francese antico (842-ca. 1400)"
-
-#~ msgid "Frisian; Northern"
-#~ msgstr "Frisone settentrionale"
-
-#~ msgid "Frisian; Eastern"
-#~ msgstr "Frisone orientale"
-
-#~ msgid "Frisian; Western"
-#~ msgstr "Frisone occidentale"
-
-#~ msgid "Fulah"
-#~ msgstr "Fulah"
-
-#~ msgid "Friulian"
-#~ msgstr "Friulano"
-
-#~ msgid "Ga"
-#~ msgstr "Ga"
-
-#~ msgid "Gayo"
-#~ msgstr "Gayo"
-
-#~ msgid "Gbaya (Central African Republic)"
-#~ msgstr "Gbaya (Repubblica centro africana)"
-
-#~ msgid "Geez"
-#~ msgstr "Geez"
-
-#~ msgid "Gilbertese"
-#~ msgstr "Gilbertese"
-
-#~ msgid "Gaelic; Scottish"
-#~ msgstr "Gaelico (Scozzese)"
-
-#~ msgid "Irish"
-#~ msgstr "Gaelico"
-
-#~ msgid "Galician"
-#~ msgstr "Galiziano"
-
-#~ msgid "Manx"
-#~ msgstr "Manx"
-
-#~ msgid "German; Middle High (ca. 1050-1500)"
-#~ msgstr "Tedesco medio alto (ca. 1050-1500)"
-
-#~ msgid "German; Old High (ca. 750-1050)"
-#~ msgstr "Tedesco antico alto (ca. 750-1050)"
-
-#~ msgid "Gondi"
-#~ msgstr "Gondi"
-
-#~ msgid "Gorontalo"
-#~ msgstr "Gorontalo"
-
-#~ msgid "Gothic"
-#~ msgstr "Gotico"
-
-#~ msgid "Grebo"
-#~ msgstr "Grebo"
-
-#~ msgid "Greek; Ancient (to 1453)"
-#~ msgstr "Greco antico (fino al 1453)"
-
-#~ msgid "Guarani"
-#~ msgstr "Guarani"
-
-#~ msgid "German; Swiss"
-#~ msgstr "Tedesco (Svizzera)"
-
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
-
-#~ msgid "Gwichʼin"
-#~ msgstr "Gwichʼin"
-
-#~ msgid "Haida"
-#~ msgstr "Haida"
-
-#~ msgid "Creole; Haitian"
-#~ msgstr "Creolo (Haitiano)"
-
-#~ msgid "Hausa"
-#~ msgstr "Hausa"
-
-#~ msgid "Hawaiian"
-#~ msgstr "Hawaiian"
-
-#~ msgid "Hebrew"
-#~ msgstr "Ebraico"
-
-#~ msgid "Herero"
-#~ msgstr "Herero"
-
-#~ msgid "Hiligaynon"
-#~ msgstr "Hiligayna"
-
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
-
-#~ msgid "Hittite"
-#~ msgstr "Hittite"
-
-#~ msgid "Hmong"
-#~ msgstr "Hmong"
-
-#~ msgid "Hiri Motu"
-#~ msgstr "Hiri motu"
-
-#~ msgid "Croatian"
-#~ msgstr "Croato"
-
-#~ msgid "Sorbian; Upper"
-#~ msgstr "Lusaziano superiore"
-
-#~ msgid "Hungarian"
-#~ msgstr "Ungherese"
-
-#~ msgid "Hupa"
-#~ msgstr "Hupa"
-
-#~ msgid "Armenian"
-#~ msgstr "Armenian"
-
-#~ msgid "Iban"
-#~ msgstr "Iban"
-
-#~ msgid "Igbo"
-#~ msgstr "Igbo"
-
-#~ msgid "Ido"
-#~ msgstr "Ido"
-
-#~ msgid "Yi; Sichuan"
-#~ msgstr "Yi; Sichuan"
-
-#~ msgid "Inuktitut"
-#~ msgstr "Inuktitut"
-
-#~ msgid "Interlingue"
-#~ msgstr "Interlingua"
-
-#~ msgid "Iloko"
-#~ msgstr "Ilocano"
-
-#~ msgid "Interlingua (International Auxiliary Language Association)"
-#~ msgstr "Interlingua (International Auxiliary Language Association)"
-
-#~ msgid "Indonesian"
-#~ msgstr "Indonesiano"
-
-#~ msgid "Ingush"
-#~ msgstr "Ingush"
-
-#~ msgid "Inupiaq"
-#~ msgstr "Inupiaq"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandese"
-
-#~ msgid "Italian"
-#~ msgstr "Italiano"
-
-#~ msgid "Javanese"
-#~ msgstr "Javanese"
-
-#~ msgid "Lojban"
-#~ msgstr "Lojban"
-
-#~ msgid "Japanese"
-#~ msgstr "Giapponese"
-
-#~ msgid "Judeo-Persian"
-#~ msgstr "Giudeo-persiano"
-
-#~ msgid "Judeo-Arabic"
-#~ msgstr "Giudeo-arabo"
-
-#~ msgid "Kara-Kalpak"
-#~ msgstr "Kara-Kalpak"
-
-#~ msgid "Kabyle"
-#~ msgstr "Kabyle"
-
-#~ msgid "Kachin"
-#~ msgstr "Kachin"
-
-#~ msgid "Kalaallisut"
-#~ msgstr "Kalaallisut"
-
-#~ msgid "Kamba (Kenya)"
-#~ msgstr "Kamba (Kenya)"
-
-#~ msgid "Kannada"
-#~ msgstr "Kannada"
-
-#~ msgid "Kashmiri"
-#~ msgstr "Kashmiri"
-
-#~ msgid "Georgian"
-#~ msgstr "Georgiano"
-
-#~ msgid "Kanuri"
-#~ msgstr "Kanuri"
-
-#~ msgid "Kawi"
-#~ msgstr "Kawi"
-
-#~ msgid "Kazakh"
-#~ msgstr "Kazako"
-
-#~ msgid "Kabardian"
-#~ msgstr "Kabardia"
-
-#~ msgid "Khasi"
-#~ msgstr "Khasi"
-
-#~ msgid "Khmer; Central"
-#~ msgstr "Khmer centrale"
-
-#~ msgid "Khotanese"
-#~ msgstr "Khotanese"
-
-#~ msgid "Kikuyu"
-#~ msgstr "Kikuyu"
-
-#~ msgid "Kinyarwanda"
-#~ msgstr "Kinyarwanda"
-
-#~ msgid "Kirghiz"
-#~ msgstr "Kirghiso"
-
-#~ msgid "Kimbundu"
-#~ msgstr "Kimbundu"
-
-#~ msgid "Konkani (macrolanguage)"
-#~ msgstr "Konkani (macrolinguaggio)"
-
-#~ msgid "Komi"
-#~ msgstr "Komi"
-
-#~ msgid "Kongo"
-#~ msgstr "Kongo"
-
-#~ msgid "Korean"
-#~ msgstr "Coreano"
-
-#~ msgid "Kosraean"
-#~ msgstr "Kosraean"
-
-#~ msgid "Kpelle"
-#~ msgstr "Kpelle"
-
-#~ msgid "Karachay-Balkar"
-#~ msgstr "Karachay-Balkar"
-
-#~ msgid "Karelian"
-#~ msgstr "Karelian"
-
-#~ msgid "Kurukh"
-#~ msgstr "Kurukh"
-
-#~ msgid "Kuanyama"
-#~ msgstr "Kuanyama"
-
-#~ msgid "Kumyk"
-#~ msgstr "Kumyk"
-
-#~ msgid "Kurdish"
-#~ msgstr "Curdo"
-
-#~ msgid "Kutenai"
-#~ msgstr "Kutenai"
-
-#~ msgid "Ladino"
-#~ msgstr "Ladino"
-
-#~ msgid "Lahnda"
-#~ msgstr "Lahnda"
-
-#~ msgid "Lamba"
-#~ msgstr "Lamba"
-
-#~ msgid "Lao"
-#~ msgstr "Lao"
-
-#~ msgid "Latin"
-#~ msgstr "Latino"
-
-#~ msgid "Latvian"
-#~ msgstr "Lettone"
-
-#~ msgid "Lezghian"
-#~ msgstr "Lezghian"
-
-#~ msgid "Limburgan"
-#~ msgstr "Limburgan"
-
-#~ msgid "Lingala"
-#~ msgstr "Lingala"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Lituano"
-
-#~ msgid "Mongo"
-#~ msgstr "Mongo"
-
-#~ msgid "Lozi"
-#~ msgstr "Lozi"
-
-#~ msgid "Luxembourgish"
-#~ msgstr "Lussemburghese"
-
-#~ msgid "Luba-Lulua"
-#~ msgstr "Luba-lulua"
-
-#~ msgid "Luba-Katanga"
-#~ msgstr "Luba-katanga"
-
-#~ msgid "Ganda"
-#~ msgstr "Ganda"
-
-#~ msgid "Luiseno"
-#~ msgstr "Luiseno"
-
-#~ msgid "Lunda"
-#~ msgstr "Lunda"
-
-#~ msgid "Luo (Kenya and Tanzania)"
-#~ msgstr "Luo (Kenya e Tanzania)"
-
-#~ msgid "Lushai"
-#~ msgstr "Lushai"
-
-#~ msgid "Madurese"
-#~ msgstr "Madurese"
-
-#~ msgid "Magahi"
-#~ msgstr "Magahi"
-
-#~ msgid "Marshallese"
-#~ msgstr "Marshallese"
-
-#~ msgid "Maithili"
-#~ msgstr "Maithili"
-
-#~ msgid "Makasar"
-#~ msgstr "Makasar"
-
-#~ msgid "Malayalam"
-#~ msgstr "Malayalam"
-
-#~ msgid "Mandingo"
-#~ msgstr "Mandingo"
-
-#~ msgid "Marathi"
-#~ msgstr "Marathi"
-
-#~ msgid "Masai"
-#~ msgstr "Masai"
-
-#~ msgid "Moksha"
-#~ msgstr "Moksha"
-
-#~ msgid "Mandar"
-#~ msgstr "Mandar"
-
-#~ msgid "Mende (Sierra Leone)"
-#~ msgstr "Mende (Sierra Leone)"
-
-#~ msgid "Irish; Middle (900-1200)"
-#~ msgstr "Irlandese medio (900-1200)"
-
-#~ msgid "Mi'kmaq"
-#~ msgstr "Mi'kmaq"
-
-#~ msgid "Minangkabau"
-#~ msgstr "Minangkabau"
-
-#~ msgid "Uncoded languages"
-#~ msgstr "Lingue non codificate"
-
-#~ msgid "Macedonian"
-#~ msgstr "Macedone"
-
-#~ msgid "Malagasy"
-#~ msgstr "Malagasy"
-
-#~ msgid "Maltese"
-#~ msgstr "Maltese"
-
-#~ msgid "Manchu"
-#~ msgstr "Manchu"
-
-#~ msgid "Manipuri"
-#~ msgstr "Manipuri"
-
-#~ msgid "Mohawk"
-#~ msgstr "Mohawk"
-
-#~ msgid "Mongolian"
-#~ msgstr "Mongolo"
-
-#~ msgid "Mossi"
-#~ msgstr "Mossi"
-
-#~ msgid "Maori"
-#~ msgstr "Maori"
-
-#~ msgid "Malay (macrolanguage)"
-#~ msgstr "Malay (macrolingua)"
-
-#~ msgid "Multiple languages"
-#~ msgstr "Lingue multiple"
-
-#~ msgid "Creek"
-#~ msgstr "Creek"
-
-#~ msgid "Mirandese"
-#~ msgstr "Mirandese"
-
-#~ msgid "Marwari"
-#~ msgstr "Marwari"
-
-#~ msgid "Burmese"
-#~ msgstr "Burmese"
-
-#~ msgid "Erzya"
-#~ msgstr "Erzya"
-
-#~ msgid "Neapolitan"
-#~ msgstr "Napoletano"
-
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-
-#~ msgid "Navajo"
-#~ msgstr "Navajo"
-
-#~ msgid "Ndebele; South"
-#~ msgstr "Ndebele del Sud"
-
-#~ msgid "Ndebele; North"
-#~ msgstr "Ndebele del Nord"
-
-#~ msgid "Ndonga"
-#~ msgstr "Ndonga"
-
-#~ msgid "German; Low"
-#~ msgstr "Tedesco; Volgare"
-
-#~ msgid "Nepali"
-#~ msgstr "Nepali"
-
-#~ msgid "Bhasa; Nepal"
-#~ msgstr "Bhasa; Nepal"
-
-#~ msgid "Nias"
-#~ msgstr "Nias"
-
-#~ msgid "Niuean"
-#~ msgstr "Niuean"
-
-#~ msgid "Dutch"
-#~ msgstr "Olandese"
-
-#~ msgid "Norwegian Nynorsk"
-#~ msgstr "Norvegese nynorsk"
-
-#~ msgid "Norwegian Bokmål"
-#~ msgstr "Norvegese bokmål"
-
-#~ msgid "Nogai"
-#~ msgstr "Nogai"
-
-#~ msgid "Norse; Old"
-#~ msgstr "Norse antico"
-
-#~ msgid "Norwegian"
-#~ msgstr "Norvegese"
-
-#~ msgid "N'Ko"
-#~ msgstr "N'Ko"
-
-#~ msgid "Sotho; Northern"
-#~ msgstr "Sotho settentrionale"
-
-#~ msgid "Newari; Old"
-#~ msgstr "Newari antico"
-
-#~ msgid "Nyanja"
-#~ msgstr "Nyanja"
-
-#~ msgid "Nyamwezi"
-#~ msgstr "Nyamwezi"
-
-#~ msgid "Nyankole"
-#~ msgstr "Nyankole"
-
-#~ msgid "Nyoro"
-#~ msgstr "Nyoro"
-
-#~ msgid "Nzima"
-#~ msgstr "Nzima"
-
-#~ msgid "Occitan (post 1500)"
-#~ msgstr "Occitan (post 1500)"
-
-#~ msgid "Ojibwa"
-#~ msgstr "Ojibwa"
-
-#~ msgid "Oriya"
-#~ msgstr "Oriya"
-
-#~ msgid "Oromo"
-#~ msgstr "Oromo"
-
-#~ msgid "Osage"
-#~ msgstr "Osage"
-
-#~ msgid "Ossetian"
-#~ msgstr "Ossetian"
-
-#~ msgid "Turkish; Ottoman (1500-1928)"
-#~ msgstr "Turco ottomano (1500-1928)"
-
-#~ msgid "Pangasinan"
-#~ msgstr "Pangasinan"
-
-#~ msgid "Pahlavi"
-#~ msgstr "Pahlavi"
-
-#~ msgid "Pampanga"
-#~ msgstr "Pampanga"
-
-#~ msgid "Panjabi"
-#~ msgstr "Panjabi"
-
-#~ msgid "Papiamento"
-#~ msgstr "Papiamento"
-
-#~ msgid "Palauan"
-#~ msgstr "Palauan"
-
-#~ msgid "Persian; Old (ca. 600-400 B.C.)"
-#~ msgstr "Persiano antico (ca. 600-400 A.C.)"
-
-#~ msgid "Phoenician"
-#~ msgstr "Fenicio"
-
-#~ msgid "Pali"
-#~ msgstr "Pali"
-
-#~ msgid "Polish"
-#~ msgstr "Polacco"
-
-#~ msgid "Pohnpeian"
-#~ msgstr "Pohnpeian"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portoghese"
-
-#~ msgid "Provençal; Old (to 1500)"
-#~ msgstr "Provençal antico (fino al 1500)"
-
-#~ msgid "Pushto"
-#~ msgstr "Pushto"
-
-#~ msgid "Quechua"
-#~ msgstr "Quechua"
-
-#~ msgid "Rajasthani"
-#~ msgstr "Rajasthani"
-
-#~ msgid "Rapanui"
-#~ msgstr "Rapanui"
-
-#~ msgid "Maori; Cook Islands"
-#~ msgstr "Maori (Isole Cook)"
-
-#~ msgid "Romansh"
-#~ msgstr "Romansh"
-
-#~ msgid "Romany"
-#~ msgstr "Romany"
-
-#~ msgid "Romanian"
-#~ msgstr "Rumeno"
-
-#~ msgid "Rundi"
-#~ msgstr "Rundi"
-
-#~ msgid "Romanian; Macedo-"
-#~ msgstr "Romanian; Macedo-"
-
-#~ msgid "Russian"
-#~ msgstr "Russo"
-
-#~ msgid "Sandawe"
-#~ msgstr "Sandawe"
-
-#~ msgid "Sango"
-#~ msgstr "Sango"
-
-#~ msgid "Yakut"
-#~ msgstr "Yakut"
-
-#~ msgid "Aramaic; Samaritan"
-#~ msgstr "Aramaico samaritano"
-
-#~ msgid "Sanskrit"
-#~ msgstr "Sanscrito"
-
-#~ msgid "Sasak"
-#~ msgstr "Sasak"
-
-#~ msgid "Santali"
-#~ msgstr "Santali"
-
-#~ msgid "Sicilian"
-#~ msgstr "Siciliano"
-
-#~ msgid "Scots"
-#~ msgstr "Scots"
-
-#~ msgid "Selkup"
-#~ msgstr "Selkup"
-
-#~ msgid "Irish; Old (to 900)"
-#~ msgstr "Irlandese antico (fino al 900)"
-
-#~ msgid "Shan"
-#~ msgstr "Shan"
-
-#~ msgid "Sidamo"
-#~ msgstr "Sidamo"
-
-#~ msgid "Sinhala"
-#~ msgstr "Sinhala"
-
-#~ msgid "Slovak"
-#~ msgstr "Slovacco"
-
-#~ msgid "Slovenian"
-#~ msgstr "Sloveno"
-
-#~ msgid "Sami; Southern"
-#~ msgstr "Sami meridionale"
-
-#~ msgid "Sami; Northern"
-#~ msgstr "Sami settentrionale"
-
-#~ msgid "Lule Sami"
-#~ msgstr "Lule Sami"
-
-#~ msgid "Sami; Inari"
-#~ msgstr "Sami; Inari"
-
-#~ msgid "Samoan"
-#~ msgstr "Samoano"
-
-#~ msgid "Sami; Skolt"
-#~ msgstr "Sami; Skolt"
-
-#~ msgid "Shona"
-#~ msgstr "Shona"
-
-#~ msgid "Sindhi"
-#~ msgstr "Sindhi"
-
-#~ msgid "Soninke"
-#~ msgstr "Soninke"
-
-#~ msgid "Sogdian"
-#~ msgstr "Sogdian"
-
-#~ msgid "Somali"
-#~ msgstr "Somali"
-
-#~ msgid "Sotho; Southern"
-#~ msgstr "Sotho meridionale"
-
-#~ msgid "Spanish"
-#~ msgstr "Spagnolo"
-
-#~ msgid "Albanian"
-#~ msgstr "Albanese"
-
-#~ msgid "Sardinian"
-#~ msgstr "Sardo"
-
-#~ msgid "Sranan Tongo"
-#~ msgstr "Sranan Tongo"
-
-#~ msgid "Serbian"
-#~ msgstr "Serbo"
-
-#~ msgid "Serer"
-#~ msgstr "Serer"
-
-#~ msgid "Swati"
-#~ msgstr "Swati"
-
-#~ msgid "Sukuma"
-#~ msgstr "Sukuma"
-
-#~ msgid "Sundanese"
-#~ msgstr "Sundanese"
-
-#~ msgid "Susu"
-#~ msgstr "Susu"
-
-#~ msgid "Sumerian"
-#~ msgstr "Sumero"
-
-#~ msgid "Swahili (macrolanguage)"
-#~ msgstr "Swahili (macro-lingua)"
-
-#~ msgid "Swedish"
-#~ msgstr "Svedese"
-
-#~ msgid "Syriac; Classical"
-#~ msgstr "Siriaco classico"
-
-#~ msgid "Syriac"
-#~ msgstr "Siriaco"
-
-#~ msgid "Tahitian"
-#~ msgstr "Tahitian"
-
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
-
-#~ msgid "Tatar"
-#~ msgstr "Tatarico"
-
-#~ msgid "Telugu"
-#~ msgstr "Telugu"
-
-#~ msgid "Timne"
-#~ msgstr "Temne"
-
-#~ msgid "Tereno"
-#~ msgstr "Tereno"
-
-#~ msgid "Tetum"
-#~ msgstr "Tetum"
-
-#~ msgid "Tajik"
-#~ msgstr "Tajik"
-
-#~ msgid "Tagalog"
-#~ msgstr "Tagalog"
-
-#~ msgid "Thai"
-#~ msgstr "Thailandese"
-
-#~ msgid "Tigre"
-#~ msgstr "Tigre"
-
-#~ msgid "Tigrinya"
-#~ msgstr "Tigrinya"
-
-#~ msgid "Tiv"
-#~ msgstr "Tiv"
-
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
-
-#~ msgid "Klingon"
-#~ msgstr "Klingon"
-
-#~ msgid "Tlingit"
-#~ msgstr "Tlingit"
-
-#~ msgid "Tamashek"
-#~ msgstr "Tamashek"
-
-#~ msgid "Tonga (Nyasa)"
-#~ msgstr "Tonga (Nyasa)"
-
-#~ msgid "Tonga (Tonga Islands)"
-#~ msgstr "Tonga (Isole Tonga)"
-
-#~ msgid "Tok Pisin"
-#~ msgstr "Tok pisin"
-
-#~ msgid "Tsimshian"
-#~ msgstr "Tsimshian"
-
-#~ msgid "Tswana"
-#~ msgstr "Tswana"
-
-#~ msgid "Tsonga"
-#~ msgstr "Tsonga"
-
-#~ msgid "Turkmen"
-#~ msgstr "Turkmeno"
-
-#~ msgid "Tumbuka"
-#~ msgstr "Tumbuka"
-
-#~ msgid "Turkish"
-#~ msgstr "Turco"
-
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
-
-#~ msgid "Twi"
-#~ msgstr "Twi"
-
-#~ msgid "Tuvinian"
-#~ msgstr "Tuvinian"
-
-#~ msgid "Udmurt"
-#~ msgstr "Udmurt"
-
-#~ msgid "Ugaritic"
-#~ msgstr "Ugaritico"
-
-#~ msgid "Uighur"
-#~ msgstr "Uighuro"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ucraino"
-
-#~ msgid "Umbundu"
-#~ msgstr "Umbundu"
-
-#~ msgid "Undetermined"
-#~ msgstr "Non determinato"
-
-#~ msgid "Urdu"
-#~ msgstr "Urdu"
-
-#~ msgid "Uzbek"
-#~ msgstr "Usbeco"
-
-#~ msgid "Vai"
-#~ msgstr "Vai"
-
-#~ msgid "Venda"
-#~ msgstr "Venda"
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
 
-#~ msgid "Vietnamese"
-#~ msgstr "Vietnamita"
+#~ msgid "allow"
+#~ msgstr ""
 
-#~ msgid "Volapük"
-#~ msgstr "Volapük"
+#~ msgid "Show hot books"
+#~ msgstr "Zobrazit žhavé knihy"
 
-#~ msgid "Votic"
-#~ msgstr "Votic"
+#~ msgid "Best rated Books"
+#~ msgstr "Nejlépe hodnocené knihy"
 
-#~ msgid "Wolaytta"
-#~ msgstr "Wolaytta"
+#~ msgid "Show best rated books"
+#~ msgstr "Zobrazit nejlépe hodnocené knihy"
 
-#~ msgid "Waray (Philippines)"
-#~ msgstr "Waray (Filippine)"
+#~ msgid "Best rated books"
+#~ msgstr "Nejlépe hodnocené knihy"
 
-#~ msgid "Washo"
-#~ msgstr "Washo"
+#~ msgid "Hot Books (most downloaded)"
+#~ msgstr "Žhavé knihy (nejstahovanější)"
 
-#~ msgid "Walloon"
-#~ msgstr "Walloon"
+#~ msgid "Publisher list"
+#~ msgstr "Seznam vydavatelů"
 
-#~ msgid "Wolof"
-#~ msgstr "Wolof"
+#~ msgid "Series list"
+#~ msgstr "Seznam sérií"
 
-#~ msgid "Kalmyk"
-#~ msgstr "Kalmyk"
+#~ msgid "Available languages"
+#~ msgstr "Dostupné jazyky"
 
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
+#~ msgid "Category list"
+#~ msgstr "Seznam kategorií"
 
-#~ msgid "Yao"
-#~ msgstr "Yao"
+#~ msgid "View Ebooks"
+#~ msgstr "Prohlížet"
 
-#~ msgid "Yapese"
-#~ msgstr "Yapese"
+#~ msgid "Series id"
+#~ msgstr "ID série"
 
-#~ msgid "Yiddish"
-#~ msgstr "Yiddish"
+#~ msgid "Submit"
+#~ msgstr "Odeslat"
 
-#~ msgid "Yoruba"
-#~ msgstr "Yoruba"
+#~ msgid "Go!"
+#~ msgstr "Go!"
 
-#~ msgid "Zapotec"
-#~ msgstr "Zapoteco"
+#~ msgid "Location of Calibre database"
+#~ msgstr "Umístění Calibre databáze"
 
-#~ msgid "Blissymbols"
-#~ msgstr "Blissymbols"
+#~ msgid "language"
+#~ msgstr "jazyk"
 
-#~ msgid "Zenaga"
-#~ msgstr "Zenaga"
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP port (obvykle 25 pro prostý SMTP a 465 pro SSL a 587 pro STARTTLS)"
 
-#~ msgid "Zhuang"
-#~ msgstr "Zhuang"
+#~ msgid "From e-mail"
+#~ msgstr "Z e-mailu"
 
-#~ msgid "Chinese"
-#~ msgstr "Cinese"
+#~ msgid "Save settings"
+#~ msgstr "Uložit nastavení"
 
-#~ msgid "Zulu"
-#~ msgstr "Zulu"
+#~ msgid "api_endpoint="
+#~ msgstr ""
 
-#~ msgid "Zuni"
-#~ msgstr "Zuni"
+#~ msgid "E-mail address"
+#~ msgstr "E-mailová adresa"
 
-#~ msgid "No linguistic content"
-#~ msgstr "Nessun contenuto linguistico"
+#~ msgid "Please try a different search"
+#~ msgstr "Zkuste prosím jiné vyhledávání"
 
-#~ msgid "Zaza"
-#~ msgstr "Zaza"
+#~ msgid "Do you really want to delete the shelf?"
+#~ msgstr "Opravdu chcete odstranit polici?"
 
-#~ msgid "Show Calibre-Web log"
-#~ msgstr "Zobrazit Calibre-Web log"
+#~ msgid "Tasks list"
+#~ msgstr "Seznam úkolů"
 
-#~ msgid "Show access log"
-#~ msgstr "Zobrazit log přístupu"
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Kindle e-mail"
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 638d4208..fbf6b8ca 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 9320b9b0..3b9e8fd0 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
-"PO-Revision-Date: 2020-01-18 12:52+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
+"PO-Revision-Date: 2020-02-23 17:07+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
@@ -26,177 +26,186 @@ msgstr "Installiert"
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet, Seite bitte neu laden"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr "Verbieten"
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr "Erlauben"
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Einstellungen des E-Mail-Servers bearbeiten"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Es trat ein Fehler beim Versenden der Test-E-Mail auf: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Benutzer kann nicht gelöscht werden, es wäre kein Admin Benutzer übrig"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
@@ -389,42 +398,50 @@ msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-Mail: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Konvertiere: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Upload: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Unbekannte Aufgabe: "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -553,16 +570,20 @@ msgstr "Bücherregal %(title)s verändert"
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fehler beim Öffnen des Bücherregals. Bücherregal exisitert nicht oder ist nicht zugänglich"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
@@ -580,19 +601,19 @@ msgid "Hot Books"
 msgstr "Beliebte Bücher"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Zeige beliebte Bücher"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
-msgstr "Zeige am besten bewertete Bücher"
+msgid "Show Top Rated Books"
+msgstr ""
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -601,7 +622,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -617,7 +638,7 @@ msgstr "Entdecke"
 msgid "Show random books"
 msgstr "Zeige zufällige Bücher"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -626,7 +647,7 @@ msgid "Show category selection"
 msgstr "Zeige Kategorienauswahl"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Serien"
 
@@ -642,7 +663,7 @@ msgstr "Autoren"
 msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Verleger"
 
@@ -651,6 +672,7 @@ msgid "Show publisher selection"
 msgstr "Zeige Verlegerauswahl"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -703,218 +725,203 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicke auf den Button unten, um auf die letzte stabile Version zu aktualisieren."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Kürzlich hinzugefügte Bücher"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Am besten bewertete Bücher"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Bücher"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Verlegerliste"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Serienliste"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Verfügbare Sprachen"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Kategorienliste"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Suche"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "Suche"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, 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:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Eine Bestätigungs-E-Mail wurde an deinen E-Mail Account versendet."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Login nicht erfolgreich, LDAP Server nicht erreichbar, bitte Administrator kontaktieren"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
-msgstr "Das Token ist abgelaufen"
+msgstr "Token ist abgelaufen"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "Fehler beim Öffnen des eBooks. Datei existiert nicht oder ist nicht zugänglich:"
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
-msgstr "Fehler beim Öffnen des eBooks. Datei existiert nicht oder ist nicht zugänglich."
+msgstr ""
 
 #: cps/worker.py:335
 #, python-format
@@ -927,24 +934,27 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen-Aufruf mit Fehler %(error)s. Text: %(message)s fehlgeschlagen"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Benutzerliste"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Benutzername"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "E-Mail"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
-msgstr "DLS"
+msgid "Downloads"
+msgstr "Downloads"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
 msgid "Admin"
@@ -957,8 +967,8 @@ msgid "Download"
 msgstr "Download"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
-msgstr "EBooks ansehen"
+msgid "View eBooks"
+msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
 msgid "Upload"
@@ -968,28 +978,32 @@ msgstr "Upload"
 msgid "Edit"
 msgstr "Editieren"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Einstellungen des SMTP-Servers"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP-Hostname"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
-msgstr "SMTP-Port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
+msgstr "SMTP Port"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
-msgstr "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
+msgstr "Verschlüsselung"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP-Login"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Absenderadresse"
 
 #: cps/templates/admin.html:61
@@ -1001,64 +1015,72 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Ordner der Calibre-DB"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Loglevel"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Bücher pro Seite"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Lade hoch"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Anonymes Durchsuchen"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Öffentliche Registrierung"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
-msgstr "Remotelogin"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
+msgstr ""
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr "Reverse Proxy Login"
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr "Reverse Proxy Header Name"
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Administration"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
-msgstr "Logdateien ansehen"
+msgid "View Logs"
+msgstr ""
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Calibre-DB neu verbinden"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
-msgstr "Calibre-Web neustarten"
+msgid "Restart"
+msgstr ""
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
-msgstr "Calibre-Web anhalten"
+msgid "Shutdown"
+msgstr "Calibre-Web beenden"
 
 #: cps/templates/admin.html:131
 msgid "Update"
@@ -1077,38 +1099,37 @@ msgid "Current version"
 msgstr "Aktuelle Version"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
-msgstr "Suche nach Update"
+msgid "Check for Update"
+msgstr ""
 
 #: cps/templates/admin.html:149
 msgid "Perform Update"
 msgstr "Update durchführen"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Zurück"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr "Abbruch"
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Calibre-Web wirklich anhalten?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Updatevorgang, Seite bitte nicht neu laden"
 
 #: cps/templates/author.html:15
@@ -1144,7 +1165,8 @@ msgid "Delete formats:"
 msgstr "Lösche Formate:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1187,23 +1209,23 @@ msgid "Tags"
 msgstr "Tags"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Serien-ID"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Bewertung"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Cover-URL (jpg, Cover wird heruntergeladen und in der Datenbank gespeichert, Feld erscheint anschließend wieder leer)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
-msgstr "Cover von lokalem Laufwerk hinzufügen"
+msgid "Upload Cover from Local Disk"
+msgstr ""
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Herausgabedatum"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1212,7 +1234,8 @@ msgstr "Herausgabedatum"
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Sprache"
 
@@ -1225,35 +1248,34 @@ msgid "No"
 msgstr "Nein"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Format hochladen"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "Buch nach Bearbeitung ansehen"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Abschicken"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr "Speichern"
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Sicher?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Das Buch wird aus der Calibre-Datenbank"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
-msgstr "und von der Festplatte gelöscht"
+msgid "and hard disk"
+msgstr ""
 
 #: cps/templates/book_edit.html:209
 msgid "Keyword"
@@ -1263,10 +1285,6 @@ msgstr "Suchbegriff"
 msgid " Search keyword "
 msgstr " Suchbegriff "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Los!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Klicke auf das Bild, um die Metadaten zu übertragen"
@@ -1275,8 +1293,9 @@ msgstr "Klicke auf das Bild, um die Metadaten zu übertragen"
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Schließen"
 
@@ -1297,8 +1316,8 @@ msgid "Library Configuration"
 msgstr "Bibliothekskonfiguration"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
-msgstr "Speicherort der Calibre-Datenbank"
+msgid "Location of Calibre Database"
+msgstr ""
 
 #: cps/templates/config_edit.html:25
 msgid "Use Google Drive?"
@@ -1338,7 +1357,7 @@ msgstr "Server-Konfiguration"
 
 #: cps/templates/config_edit.html:87
 msgid "Server Port"
-msgstr "Server-Port"
+msgstr "Server Port"
 
 #: cps/templates/config_edit.html:91
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
@@ -1349,8 +1368,8 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Speicherort der SSL-Keydatei (leerlassen, falls kein SSL-Server)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
-msgstr "Update-Kanal"
+msgid "Update Channel"
+msgstr "Update Kanal"
 
 #: cps/templates/config_edit.html:101
 msgid "Stable"
@@ -1372,10 +1391,6 @@ msgstr "Nightly (Automatisch)"
 msgid "Logfile Configuration"
 msgstr "Konfiguration der Logdatei"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Loglevel"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Position und Name der Logdatei (calibre-web.log bei keiner Eingabe)"
@@ -1393,255 +1408,271 @@ msgid "Feature Configuration"
 msgstr "Feature-Konfiguration"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Hochladen aktivieren"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Anonymes Durchsuchen aktivieren"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Öffentliche Registrierung aktivieren"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
-msgstr "Remotelogin aktivieren ('Magischer Link')"
+msgid "Enable Magic Link Remote Login"
+msgstr "Remotelogin ('Magischer Link') aktivieren"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "Benutze Goodreads"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Einen API Schlüssel erhalten"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Öffentlicher Goodreads API Schlüssel"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Geheimer Goodreads API Schlüssel"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Logintyp"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
-msgstr "Benutze Standardanmeldung"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
+msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Benutze LDAP-Login"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Benutze OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP-Server Hostname oder IP-Adresse"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
-msgstr "LDAP-Server Port"
+msgstr "LDAP Server Port"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "LDAP-Schema (ldap oder ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
-msgstr "Benutzername des LDAP-Admins"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
+msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
-msgstr "Passwort des LDAP-Admins"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
+msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "LDAP-Server benutzt SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "LDAP-Server benutzt TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "Zertifikat des LDAP-Servers"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "Pfad zum SSL-Zertifikat des LDAP-Servers"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Ist der LDAP-Server ein OpenLDAP-Server?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Erhalte %(provider)s OAuth Berechtigungen"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Reverse Proxy Authentifizierung zulassen"
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr "Reverse Proxy Header Name"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Externe Programme"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Kein Konverter"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Kindlegen benutzen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Benutze Calibres Ebook-Konverter"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Einstellungen des E-Book Konverters"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Pfad zu Konvertertool"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Pfad zur UnRar-Binärdatei"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Login"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Ansichtskonfiguration"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Anzahl anzuzeigender zufälliger Bücher"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Anzahl in Übersicht anzuzeigender Autoren (0=alle werden angezeigt)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Theme"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Standard-Thema"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! dunkles Thema"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Regulärer Ausdruck, um Spalten zu ignorien"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Verknüpfe Gelesen/Ungelesen-Status mit Calibre-Spalte"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Regulärer Ausdruck für die Titelsortierung"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Kategorien für Erwachseneninhalte"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Keine"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Standard-Einstellungen für neue Benutzer"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Administrator"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Downloads erlauben"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Anzeige von Büchern erlauben"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Hochladen erlauben"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
 msgstr "Löschen von Büchern erlauben"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Ändern des Passworts erlauben"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Editieren öffentlicher Bücherregale erlauben"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Standard-Sichtbarkeiten für neue Benutzer"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Erwachseneninhalte anzeigen"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Im Browser lesen"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Im Browser anhören"
 
 #: cps/templates/detail.html:117
@@ -1652,9 +1683,9 @@ msgstr "Buch"
 msgid "of"
 msgstr "von"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "Sprache"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1677,21 +1708,9 @@ msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Metadaten bearbeiten"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP-Port (normalerweise 25 für unverschlüsseltes SMTP, 465 für SSL und 587 für STARTTLS"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Verschlüsselung"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Keine"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1701,23 +1720,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "SMTP-Passwort"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Absenderadresse"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Einstellungen speichern"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Einstellungen speichern und Test-E-Mail versenden"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Erlaubte Domains für die Registrierung"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1733,28 +1744,32 @@ msgid "Enter domainname"
 msgstr "Domainnamen eingeben"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr "Verbotene Domains für eine Registrierung"
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Soll diese Domain-Regel wirklich gelöscht werden?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Nächste"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
-msgstr "Erzeuge Issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
-msgstr "Zurück zur Hauptseite"
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Entdecke (Zufälliges Buch)"
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr ""
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
+msgstr "Zurück zur Hauptseite"
 
 #: cps/templates/index.html:64
 msgid "Group by series"
@@ -1780,7 +1795,11 @@ msgstr "Kürzlich hinzugefügte Bücher"
 msgid "The latest Books"
 msgstr "Die neuesten Bücher"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Zufällige Bücher"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
@@ -1808,7 +1827,7 @@ msgstr "Bücher nach Sprache sortiert"
 msgid "Books ordered by file formats"
 msgstr "Bücher nach Dateiformaten sortiert"
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Öffentliche Bücherregale"
 
@@ -1816,7 +1835,7 @@ msgstr "Öffentliche Bücherregale"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Bücher, die in öffentlichen Bücherregal organisiert und für jedermann sichtbar sind"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Deine Bücherregale"
 
@@ -1828,10 +1847,19 @@ msgstr "Persönliches Bücherregal des Benutzers, nur sichtbar für den aktuelle
 msgid "Home"
 msgstr "Home"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr ""
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Nagivation umschalten"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
@@ -1853,70 +1881,65 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Lade hoch..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
+msgid "Please do not refresh the page"
 msgstr "Bitte die Seite nicht neu laden"
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Über"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Vorheriger Eintrag"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Buchdetails"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Fehler"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Benutzername"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Passwort"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Merken"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
-msgstr "Passwort vergessen"
+msgid "Forgot Password?"
+msgstr "Passwort vergessen?"
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Einloggen mit magischem Link"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr "Calibre-Web Logdatei anzeigen:  "
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr "Calibre-Web Logdatei: "
 
 #: cps/templates/logviewer.html:8
@@ -1924,11 +1947,35 @@ msgid "Stream output, can't be displayed"
 msgstr "Stream Ausgabe, kann nicht angezeigt werden"
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
 msgstr "Zugriffslogbuch anzeigen: "
 
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
+msgstr ""
+
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web E-Book-Katalog"
 
 #: cps/templates/read.html:74
@@ -2040,51 +2087,51 @@ msgid "Basic txt Reader"
 msgstr "Einfacher TXT-Reader"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Neues Benutzerkonto registrieren"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Wähle einen Benutzernamen"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "E-Mail-Adresse"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
-msgstr "Benutze dein anderes Gerät, logge dich ein und besuche "
+msgid "On another device, login and visit:"
+msgstr "Benutze dein anderes Gerät, logge dich ein und besuche:"
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Danach wirst du automatisch auf diesem Gerät eingeloggt sein."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Dieser Link wird in 10 Minuten ablaufen."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Keine Ergebnisse für:"
+msgid "No Results Found"
+msgstr "Keine Ergebnisse"
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Versuche eine andere Suche"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Ergebnisse für:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Herausgabedatum von"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Herausgabedatum bis"
 
 #: cps/templates/search_form.html:43
@@ -2108,11 +2155,11 @@ msgid "Exclude Extensions"
 msgstr "Erweiterungen ausschließen"
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Bewertungen größer als"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Bewertungen kleiner als"
 
 #: cps/templates/shelf.html:10
@@ -2128,24 +2175,24 @@ msgid "Change order"
 msgstr "Reihenfolge ändern"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Wirklich das Bücherregal löschen?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
-msgstr "Das Bücherregal wird für alle und für immer gelöscht!"
+msgid "Shelf will be deleted for all users"
+msgstr "Das Bücherregal wird für alle und für immer gelöscht"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
-msgstr "Soll das Bücherregal öffentlich sein?"
+msgid "Share with Everyone"
+msgstr "Bücherregal mit anderen Benutzern teilen"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Drag 'n drop um Reihenfolge zu ändern"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
-msgstr "Statistiken der Calibre-Bibliothek"
+msgid "Library Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:12
 msgid "Books in this Library"
@@ -2164,21 +2211,17 @@ msgid "Series in this Library"
 msgstr "Serien in dieser Bibliothek"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Dynamische Bibliotheken"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
-msgstr "Programm-Bibliotheken"
+msgid "Program Library"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Installierte Version"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Aufgabenliste"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Benutzer"
@@ -2196,11 +2239,11 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Laufzeit"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Startzeitpunkt"
 
 #: cps/templates/tasks.html:24
@@ -2215,16 +2258,12 @@ msgstr "Alle Aufgaben verstecken"
 msgid "Reset user Password"
 msgstr "Benutzerpasswort zurücksetzen"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Kindle E-Mail"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Zeige nur Bücher mit dieser Sprache"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Zeige alle"
 
 #: cps/templates/user_edit.html:52
@@ -2239,152 +2278,38 @@ msgstr "Verknüpfung herstellen"
 msgid "Unlink"
 msgstr "Verknüpfung entfernen"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
-msgstr "Benutzer löschen"
-
-#: cps/templates/user_edit.html:138
-msgid "Recent Downloads"
-msgstr "Letzte Downloads"
-
-#~ msgid "Show sorted books"
-#~ msgstr "Zeige Bücher sortiert"
-
-#~ msgid "Newest Books"
-#~ msgstr "Neueste Bücher"
-
-#~ msgid "Oldest Books"
-#~ msgstr "Älteste Bücher"
-
-#~ msgid "Books (A-Z)"
-#~ msgstr "Bücher (A-Z)"
-
-#~ msgid "Books (Z-A)"
-#~ msgstr "Bücher (Z-A)"
-
-#~ msgid "Ratings: %(serie)s"
-#~ msgstr "Bewertungen: %(serie)s"
-
-#~ msgid "Sorted Books"
-#~ msgstr "Bücher sortiert"
-
-#~ msgid "Sort By"
-#~ msgstr "Sortiert nach"
-
-#~ msgid "Newest"
-#~ msgstr "Neueste"
-
-#~ msgid "Oldest"
-#~ msgstr "Älteste"
-
-#~ msgid "Ascending"
-#~ msgstr "Aufsteigend"
-
-#~ msgid "Descending"
-#~ msgstr "Absteigend"
-
-#~ msgid "PDF.js viewer"
-#~ msgstr "PDF.js Viewer"
-
-#~ msgid "Failed to create path for cover %(path)s (Permission denied)."
-#~ msgstr "Fehler beim Erzeugen des Pfads für das Cover %(path)s (Zugriff verweigert)"
-
-#~ msgid "Failed to store cover-file %(cover)s."
-#~ msgstr "Fehler beim Speichern des Covers %(cover)s."
-
-#~ msgid "Cover-file is not a valid image file"
-#~ msgstr "Cover-Datei ist keine gültige Bilddatei"
-
-#~ msgid "successfully deleted shelf %(name)s"
-#~ msgstr "Bücherregal %(name)s erfolgreich gelöscht"
-
-#~ msgid "LDAP Provider URL"
-#~ msgstr "URL des LDAP-Anbieters"
-
-#~ msgid "Register with %s, "
-#~ msgstr "Registrieren mit %s, "
-
-#~ msgid "Import of optional Google Drive requirements missing"
-#~ msgstr "Optionale Abhängigkeiten für Google Drive fehlen"
-
-#~ msgid "client_secrets.json is missing or not readable"
-#~ msgstr "client_secrets.json nicht vorhanden oder nicht lesbar"
-
-#~ msgid "client_secrets.json is not configured for web application"
-#~ msgstr "client_secrets.json nicht für Webapplikationen konfiguriert"
-
-#~ msgid "Keyfile location is not valid, please enter correct path"
-#~ msgstr "Ungültiger Speicherort der SSL-Keydatei, bitte gültigen Pfad angeben"
-
-#~ msgid "Certfile location is not valid, please enter correct path"
-#~ msgstr "Ungültiger Speicherort des SSL-Zertifikats, bitte gültigen Pfad angeben"
-
-#~ msgid "Please enter a LDAP provider, port, DN and user object identifier"
-#~ msgstr "Bitte LDAP-Provider, Port, DN und User Object Identifer eingeben"
-
-#~ msgid "Please enter a LDAP service account and password"
-#~ msgstr "Bitte Account und Passwort des LDAP Services eingeben"
-
-#~ msgid "Please enter Github oauth credentials"
-#~ msgstr "Bitte die Github Oauth Anmeldedaten eingeben"
-
-#~ msgid "Please enter Google oauth credentials"
-#~ msgstr "Bitte die Google Oauth Anmeldedaten eingeben"
-
-#~ msgid "Logfile location is not valid, please enter correct path"
-#~ msgstr "Ungültiger Speicherort der Logdatei, bitte gültigen Pfad angeben"
-
-#~ msgid "Access Logfile location is not valid, please enter correct path"
-#~ msgstr "Ungültiger Speicherort der Zugriffs-Logdatei, bitte gültigen Pfad eingeben"
-
-#~ msgid "DB location is not valid, please enter correct path"
-#~ msgstr "Ungültiger Speicherort der DB, bitte gültigen Pfad eingeben"
-
-#~ msgid "Excecution permissions missing"
-#~ msgstr "Ausführungsberechtigung nicht vorhanden"
-
-#~ msgid "Error excecuting UnRar"
-#~ msgstr "Fehler bei der Ausführung von UnRar"
-
-#~ msgid "Unrar binary file not found"
-#~ msgstr "UnRar-Binärdatei nicht gefunden"
-
-#~ msgid "Use GitHub OAuth"
-#~ msgstr "Benutze Github Oauth"
-
-#~ msgid "Use Google OAuth"
-#~ msgstr "Benutze Google Oauth"
-
-#~ msgid "Obtain GitHub OAuth Credential"
-#~ msgstr "GitHub OAuth Credential erhalten"
-
-#~ msgid "GitHub OAuth Client Id"
-#~ msgstr "Github OAuth Client-ID"
-
-#~ msgid "GitHub OAuth Client Secret"
-#~ msgstr "Github OAuth Client-Secret"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
 
-#~ msgid "Obtain Google OAuth Credential"
-#~ msgstr "Google OAuth Credential erhalten"
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
 
-#~ msgid "Google OAuth Client Id"
-#~ msgstr "Google OAuth Client-ID"
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
 
-#~ msgid "Google OAuth Client Secret"
-#~ msgstr "Google OAuth Client-Secret"
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
 
-#~ msgid "Use"
-#~ msgstr "Benutzen"
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
+msgstr "Benutzer löschen"
 
-#~ msgid "unknown"
-#~ msgstr "Unbekannt"
+#: cps/templates/user_edit.html:144
+msgid "Recent Downloads"
+msgstr "Letzte Downloads"
 
-#~ msgid "New Books"
-#~ msgstr "Neue Bücher"
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
 
-#~ msgid "Show Calibre-Web log"
-#~ msgstr "Zeige Calibre-Web Logdatei"
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
 
-#~ msgid "Show access log"
-#~ msgstr "Zeige Zugriffslogdatei"
+#~ msgid "Best rated Books"
+#~ msgstr ""
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 4291472b..b94fcf31 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 de7393a0..e59b3069 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2019-07-26 11:44+0100\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -28,177 +28,186 @@ msgid "not installed"
 msgstr "No instalado"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Servidor en proceso de apagado. Por favor, cierre la ventana."
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz del usuario"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "¡Por favor completar todos los campos!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un nombre de dominio válido"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Editar los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Correo electrónico de prueba enviado con éxito a %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocurrió un error enviando el correo electrónico de prueba: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede eliminar usuario"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Ocurrió un error inesperado."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Remplazando ficheros"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Los conexiones de base datos están cerradas"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Parando servidor"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Fallo al actualizar"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Error general"
 
@@ -391,42 +400,50 @@ msgstr "Fichero %(file)s no encontrado en Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Esperando"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Fallido"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Comenzado"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Finalizado"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-mail "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Convertir: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Subir: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Tarea desconocida"
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -555,16 +572,20 @@ msgstr "Estante %(title)s cambiado"
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Error al abrir un estante. El estante no existe o no es accesible"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
@@ -582,19 +603,19 @@ msgid "Hot Books"
 msgstr "Libros populares"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Mostrar libros populares"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -603,7 +624,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -619,7 +640,7 @@ msgstr "Descubrir"
 msgid "Show random books"
 msgstr "Mostrar libros al azar"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Categorías"
 
@@ -628,7 +649,7 @@ msgid "Show category selection"
 msgstr "Mostrar selección de categorías"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Series"
 
@@ -644,7 +665,7 @@ msgstr "Autores"
 msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Editoras"
 
@@ -653,6 +674,7 @@ msgid "Show publisher selection"
 msgstr "Mostrar selección de editores"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Idioma"
 
@@ -705,216 +727,201 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Haz clic en el botón de abajo para actualizar a la última versión estable."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Libros añadidos recientemente"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Libros mejor valorados"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Libros al azar"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Libros"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Error al abrir eBook. El archivo no existe o no es accesible:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: "
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del fichero: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Lista de editores"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Lista de series"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Idiomas disponibles"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Lista de categorías"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Publicado después de"
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Publicado antes de"
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "búsqueda"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ha sucedido un error en el envío del libro: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Por favor configure primero la dirección de correo de su kindle..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Se ha enviado un correo electrónico de verificación a su cuenta de correo electrónico."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Este nombre de usuario o correo electrónico ya están en uso."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesión iniciada como : '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "No pude entrar a la cuenta. El servidor LDAP está inactivo, por favor contacte a su administrador"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "Iniciar sesión"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Token no encontrado"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "El token ha expirado"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Error al abrir el eBook. El archivo no existe o el archivo no es accesible."
 
@@ -929,23 +936,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen falló con error %(error)s. Mensaje: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Lista de usuarios"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Nickname"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "Correo electrónico"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -959,7 +969,7 @@ msgid "Download"
 msgstr "Descargar"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Ver libros electrónicos"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -970,28 +980,32 @@ msgstr "Subir archivo"
 msgid "Edit"
 msgstr "Editar"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Ajustes SMTP del servidor de correo electrónico"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "Servidor SMTP"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "Puerto SMTP"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Desde el correo"
 
 #: cps/templates/admin.html:61
@@ -1003,63 +1017,71 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Dir DB Calibre"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Nivel de registro"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Puerto"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Libros por página"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Subiendo"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Navegación anónima"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Registro público"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Inicio de sesión remoto"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Administración"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Ver archivos de registro"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Reconectar a la BD Calibre"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Reiniciar Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Detener Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1079,7 +1101,7 @@ msgid "Current version"
 msgstr "Versión actual"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Comprobar actualizaciones"
 
 #: cps/templates/admin.html:149
@@ -1087,30 +1109,29 @@ msgid "Perform Update"
 msgstr "Realizar actualización"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quiere reiniciar Calibre-Web?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Regresar"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "¿Realmente quiere detener Calibre-Web?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Actualizando. Por favor, no recargue la página"
 
 #: cps/templates/author.html:15
@@ -1146,7 +1167,8 @@ msgid "Delete formats:"
 msgstr "Borrar formatos:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Borrar"
 
@@ -1189,23 +1211,23 @@ msgid "Tags"
 msgstr "Etiquetas"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Id de las series"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Clasificación"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL de la portada (jpg, la portada es descargada y almacenada en la base de datos, el campo  está vacío de nuevo)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Subir portada desde un medio de almacenamiento local"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Fecha de publicación"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1214,7 +1236,8 @@ msgstr "Fecha de publicación"
 msgid "Publisher"
 msgstr "Editor"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Idioma"
 
@@ -1227,34 +1250,33 @@ msgid "No"
 msgstr "No"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Subir formato"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "ver libro tras la edición"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Enviar"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "¿Estás realmente seguro?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "El libro será eliminado de la base de datos de Calibre"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "y del disco duro"
 
 #: cps/templates/book_edit.html:209
@@ -1265,10 +1287,6 @@ msgstr "Palabra clave"
 msgid " Search keyword "
 msgstr "Buscar por palabras clave"
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "¡Vamos!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Haz clic en la portada para cargar los metadatos en el formulario"
@@ -1277,8 +1295,9 @@ msgstr "Haz clic en la portada para cargar los metadatos en el formulario"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1299,7 +1318,7 @@ msgid "Library Configuration"
 msgstr "Configuración de la librería"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Ubicación de la base de datos de Calibre"
 
 #: cps/templates/config_edit.html:25
@@ -1351,7 +1370,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Ubicación del archivo clave SSL (dejar en blanco si no hay un servidor SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Actualizar canal"
 
 #: cps/templates/config_edit.html:101
@@ -1374,10 +1393,6 @@ msgstr "Nocturno (Automatico)"
 msgid "Logfile Configuration"
 msgstr "Configuración del archivo de registro"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Nivel de registro"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Ubicación y nombre del archivo de registro (si no se especifica será calibre-web.log)"
@@ -1395,255 +1410,271 @@ msgid "Feature Configuration"
 msgstr "Configuración de características"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Permitir subida"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Permitir navegación anónima"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Permitir registro público"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Permitir inicio de sesión remoto (\"magic link\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Obtener una API Key"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Goodreads API Key"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Tipo de inicio de sesión"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Usar autenticación estándar"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Usar autenticación LDAP"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Usar OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Nombre de host o dirección IP del servidor LDAP"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "Puerto del servidor LDAP"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "Esquema LDAP (ldap o ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr "Nombre de usuario de administrador LDAP"
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr "Contraseña de administrador LDAP"
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "Servidor LDAP utiliza SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "Servidor LDAP utiliza TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "Certificado de servidor LDAP"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "Certificado SSL de servidor LDAP"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Nombre distinguido LDAP (DN)"
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr "Filtro de objetos de usuario LDAP"
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "¿El servidor LDAP es OpenLDAP?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Obtener la Credencial OAuth de %(proveedor)"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "Id. de cliente de OAuth de %(provider)"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "Secreto OAuth de Cliente de %(provider)"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Binarios externos"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "No convertir"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Utilizar Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Utilizar el convertidor de libros de Calibre"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Ajustes del convertidos E-Book"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Ruta para convertertool"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Ubicación del binario de Unrar"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Ver configuración"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Título"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Número de libros aleatorios a mostrar"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Número de autores para mostrar antes de ocultar (0 = desactivar la ocultación)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Tema"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Tema estándar"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! Tema Oscuro"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Expresión regular para ignorar columnas"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Enlace del estado de la columna de Calibre de leído/sin leer"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Expresión regular para ordenar títulos"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Etiquetas para contenido para adultos"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Ninguno"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Expresión regular para ordenar títulos"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Ajustes por defecto para nuevos usuarios"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Usuario administrador"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Permitir descargas"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Permitir visor de libros"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Permitir editar"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Permitir eliminar libros"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la contraseña"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Permitir editar estantes públicos"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Visibilidad predeterminada para nuevos usuarios"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Mostrar libros aleatorios con vista detallada"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Mostrar contenido para adulto"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Ver en el navegador"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Escuchar en el navegador"
 
 #: cps/templates/detail.html:117
@@ -1654,9 +1685,9 @@ msgstr "Libro"
 msgid "of"
 msgstr "de"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "idioma"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1679,47 +1710,27 @@ msgid "Add to shelf"
 msgstr "Agregar al estante"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Editar metadatos"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "Puerto SMTP (por lo general 25 para SMTP plano, 465 para SSL y 587 para STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Cifrado"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Ninguno"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
-msgstr "STATRTTLS"
+msgstr "STARTTLS"
 
 #: cps/templates/email_edit.html:23
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "Contraseña SMTP"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Desde el correo electrónico"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Guardar ajustes"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Guardar ajustes y enviar un correo electrónico de prueba"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Permitir dominios para registrarse"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1735,29 +1746,33 @@ msgid "Enter domainname"
 msgstr "Introducir nombre de dominio"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "¿Realmente quiere eliminar esta regla de dominio?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Siguiente"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Abrir una incidencia"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Volver al inicio"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Descubrir (Libros al azar)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Grupo por serie"
@@ -1782,7 +1797,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "Libros recientes"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Libros al azar"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
@@ -1810,7 +1829,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Estantes públicos"
 
@@ -1818,7 +1837,7 @@ msgstr "Estantes públicos"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Libros organizados en estantes públicos, visibles para todo el mundo"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Sus estantes"
 
@@ -1830,10 +1849,19 @@ msgstr "Los estantes propios del usuario, solo visibles para el propio usuario a
 msgid "Home"
 msgstr "Inicio"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Regresar"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Alternar navegación"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
@@ -1855,70 +1883,65 @@ msgstr "Cerrar sesión"
 msgid "Register"
 msgstr "Registro"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Cargando..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "por favor no recargue la página"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Detalles del libro"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Error"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Nombre de usuario"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Contraseña"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Recordarme"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Iniciar sesión con \"magic link\""
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1926,11 +1949,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Cátalogo de ebook de Calibre-Web"
 
 #: cps/templates/read.html:74
@@ -2042,51 +2089,51 @@ msgid "Basic txt Reader"
 msgstr "Lector básico de txt"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Registre una cuenta nueva"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Escoger un nombre de usuario"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "Dirección de correo electrónico"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Tu dirección de correo"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Utiliza tu otro dispositivo, inicia sesión y visita"
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Una vez que lo realice, iniciará sesión automáticamente en ese dispositivo."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "El enlace expirará después de 10 minutos."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Sin resultados para:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Intente una búsqueda diferente"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Resultados para:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Fecha de publicación desde"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Fecha de publicación hasta"
 
 #: cps/templates/search_form.html:43
@@ -2110,11 +2157,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Clasificación mayor que"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Clasificación menor que"
 
 #: cps/templates/shelf.html:10
@@ -2130,23 +2177,23 @@ msgid "Change order"
 msgstr "Cambiar orden"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Realmente quiere eliminar este estante?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "¡El estante se perderá para todo el mundo y para siempre!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "¿Hacer público el estante?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Pinchar y arrastrar para reordenar"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Estadísticas de la Biblioteca"
 
 #: cps/templates/stats.html:12
@@ -2166,21 +2213,17 @@ msgid "Series in this Library"
 msgstr "Series en esta biblioteca"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Bibliotecas vinculadas"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Bibliotecas del programa"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Versión instalada"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Lista de tareas"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Usuario"
@@ -2198,11 +2241,11 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Tiempo de ejecución"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Fecha de inicio"
 
 #: cps/templates/tasks.html:24
@@ -2217,16 +2260,12 @@ msgstr "Ocultar todas las tareas"
 msgid "Reset user Password"
 msgstr "Resetear contraseña de usuario"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Correo del Kindle"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Mostrar libros con idioma"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Mostrar todo"
 
 #: cps/templates/user_edit.html:52
@@ -2241,14 +2280,38 @@ msgstr "Vincular"
 msgid "Unlink"
 msgstr "Desvincular"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Borrar este usuario"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Descargas recientes"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "%s: %s"
 #~ msgstr "%s: %s"
 
@@ -2501,3 +2564,75 @@ msgstr "Descargas recientes"
 #~ msgid "Show access log"
 #~ msgstr "Mostrar registro de acceso"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Etiquetas para contenido para adultos"
+
+#~ msgid "Show mature content"
+#~ msgstr "Mostrar contenido para adulto"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Lista de editores"
+
+#~ msgid "Series list"
+#~ msgstr "Lista de series"
+
+#~ msgid "Available languages"
+#~ msgstr "Idiomas disponibles"
+
+#~ msgid "Category list"
+#~ msgstr "Lista de categorías"
+
+#~ msgid "Series id"
+#~ msgstr "Id de las series"
+
+#~ msgid "Submit"
+#~ msgstr "Enviar"
+
+#~ msgid "Go!"
+#~ msgstr "¡Vamos!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Permitir eliminar libros"
+
+#~ msgid "language"
+#~ msgstr "idioma"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "Puerto SMTP (por lo general 25 para SMTP plano, 465 para SSL y 587 para STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Desde el correo electrónico"
+
+#~ msgid "Save settings"
+#~ msgstr "Guardar ajustes"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "por favor no recargue la página"
+
+#~ msgid "E-mail address"
+#~ msgstr "Dirección de correo electrónico"
+
+#~ msgid "No Results for:"
+#~ msgstr "Sin resultados para:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Intente una búsqueda diferente"
+
+#~ msgid "Tasks list"
+#~ msgstr "Lista de tareas"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Correo del Kindle"
+
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index bdae0f08..bc32dcab 100644
Binary files a/cps/translations/fi/LC_MESSAGES/messages.mo and b/cps/translations/fi/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 9538028f..bb63df4e 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -26,177 +26,186 @@ msgstr "asennettu"
 msgid "not installed"
 msgstr "ei asennettu"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Palvelin uudelleenkäynnistetty, ole hyvä ja päivitä sivu"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Palvelinta sammutetaan, ole hyvä ja sulje sivu"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Ylläpitosivu"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Muuta sähköpostipalvelimen asetuksia"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testisähköposti lähetetty onnistuneesti osoitteeseen %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Testisähköpostin lähetyksessä tapahtui virhe: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Pääkäyttäjiä ei jää jäljelle, käyttäjää ei voi poistaa"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Tapahtui tuntematon virhe."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Päivitys valmistui, ole hyvä ja paina OK ja lataa sivu uudelleen"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Yleinen virhe"
 
@@ -389,42 +398,50 @@ msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Aloitettu"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Valmistui"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "Sähköposti: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Muunna: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Lähetä: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Tuntematon tehtävä: "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -553,16 +570,20 @@ msgstr "Hylly %(title)s muutettu"
 msgid "Edit a shelf"
 msgstr "Muokkaa hyllyä"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylly: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
@@ -580,19 +601,19 @@ msgid "Hot Books"
 msgstr "Kuumat kirjat"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Näytä kuumat kirjat"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -601,7 +622,7 @@ msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -617,7 +638,7 @@ msgstr "Löydä"
 msgid "Show random books"
 msgstr "Näytä satunnaisia kirjoja"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -626,7 +647,7 @@ msgid "Show category selection"
 msgstr "Näytä kategoriavalinta"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Sarjat"
 
@@ -642,7 +663,7 @@ msgstr "Kirjailijat"
 msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -651,6 +672,7 @@ msgid "Show publisher selection"
 msgstr "Näytä julkaisijavalinta"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Kielet"
 
@@ -703,216 +725,201 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Paina alla olevaa nappia päivittääksesi uusimpaan vakaaseen versioon."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Viimeksi lisätyt kirjat"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Parhaiksi arvostellut kirjat"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Satunnaisia kirjoja"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Kirjat"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Virhe eKirjan avaamisessa. Tiedostoa ei ole tai se ei ole saatavilla:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Julkaisjalistaus"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Sarjalistaus"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Tillgängliga språk"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Kategorilista"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Hae"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "hae"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Kirjan: %(res)s lähettämisessa tapahtui virhe"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "rekisteröidy"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Käyttäjätunnus tai sähköpostiosoite on jo käytössä."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Kirjautuminen epäonnistui. LDAP palvelin alhaalla, ot yhteyttä ylläpitoon"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "kirjaudu"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Valtuutusta ei löytynyt"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Valtuutus vanhentunut"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Lue kirja"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Virhe kirjan avaamisessa. Tiedostoa ei ole tai se ei ole saatavilla."
 
@@ -927,23 +934,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen epäonnistui virheeseen %(error)s. Viesti: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Käyttäjälista"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Lempinimi"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "Sähköposti"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -957,7 +967,7 @@ msgid "Download"
 msgstr "Lataa"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Näytä ekirjat"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -968,28 +978,32 @@ msgstr "Lähetä"
 msgid "Edit"
 msgstr "Muokkaa"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "SMTP sähköpostipalvelimen asetukset"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP palvein"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP portti"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP tunnus"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Lähettäjän sähköposti"
 
 #: cps/templates/admin.html:61
@@ -1001,63 +1015,71 @@ msgid "Configuration"
 msgstr "Asetukset"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Calibre DB hakemisto"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Lokitaso"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Portti"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Kirjaa sivulla"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Lähetetään"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Nimetön selaus"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Julkinen rekisteröinti"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Etäkirjautuminen"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Ylläpito"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Katsele lokitiedostoja"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Uudelleenyhdistä Calibre DB"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Uudellenkäynnistä Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Sammuta Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1077,7 +1099,7 @@ msgid "Current version"
 msgstr "Nykyinen versio"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Tarkista päivitykset"
 
 #: cps/templates/admin.html:149
@@ -1085,30 +1107,29 @@ msgid "Perform Update"
 msgstr "Päivitä"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Palaa"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Päivitetään, älä päivitä sivua"
 
 #: cps/templates/author.html:15
@@ -1144,7 +1165,8 @@ msgid "Delete formats:"
 msgstr "Poista tiedostomuodot:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Poista"
 
@@ -1187,23 +1209,23 @@ msgid "Tags"
 msgstr "Tunnisteet"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Sarja-id"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Arvostelu"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Kannen osoite (jpg, kuva ladataan ja tallennetaan tietokantaan, kenttä jää uudelleen tyhjäksi)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Lataa kuva paikalliselta levyltä"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Julkaisupäivä"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1212,7 +1234,8 @@ msgstr "Julkaisupäivä"
 msgid "Publisher"
 msgstr "Julkaisija"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Kieli"
 
@@ -1225,34 +1248,33 @@ msgid "No"
 msgstr "Ei"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Lataa tiedostomuoto"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "katso kirjaa muokkauksen jälkeen"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Lähetä"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Oletko aivan varma?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Kirja poistetaan Calibren tietokannasta"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "ja kiintolevyltä"
 
 #: cps/templates/book_edit.html:209
@@ -1263,10 +1285,6 @@ msgstr "Avainsana"
 msgid " Search keyword "
 msgstr " Hae avainsanaa "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Mene!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
@@ -1275,8 +1293,9 @@ msgstr "Klikkaa kantta ladataksesi metadata lomakkeelle"
 msgid "Loading..."
 msgstr "Ladataan..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Sulje"
 
@@ -1297,7 +1316,7 @@ msgid "Library Configuration"
 msgstr "Kirjaston asetukset"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Calibre -tietokannan paikka"
 
 #: cps/templates/config_edit.html:25
@@ -1349,7 +1368,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL avaintiedoston paikka (jätä tyhjäksi ei-SSL -palvelimella)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Päivityskanava"
 
 #: cps/templates/config_edit.html:101
@@ -1372,10 +1391,6 @@ msgstr "Öinen (Automaattinen)"
 msgid "Logfile Configuration"
 msgstr "Lokitiedoston asetukset"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Lokitaso"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Lokitiedoston nimi ja paikka (calibre-web.log jos ei asetettu)"
@@ -1393,255 +1408,271 @@ msgid "Feature Configuration"
 msgstr "Ominaisuuksien asetukset"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Salli lähetys"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Salli nimetön selailu"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Salli julkinen rekisteröinti"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Salli etäkirjautuminen (\"magic link\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "Käytä Goodreads -palvelua"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Hae API-avain"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Goodreads API-avain"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API-salaisuus"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Kirjautumisen tyyppi"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Käytä oletuskirjautumista"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Käytä LDAP kirjautumista"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Käytä OAuth kirjautumista"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP palvelimen nimi tai IP osoite"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "LDAP Palveimen portti"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "LDAP skeema (ldap tai ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr "LDAP pääkäyttäjän käyttäjänimi"
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr "LDAP pääkäyttäjän salasana"
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "LDAP palvelin käyttää SSL:ää"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "LDAP palvelin käyttää TLS:ää"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "LDAP palvelimen sertifikaatti"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "LDAP SSL sertifikaatin polku"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP DN"
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr "LDAP käyttäjä suodin (object filter)"
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP palvelin on OpenLDAP?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Hanki %(provider)s OAuth valtuutus"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth asiakas Id"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth asiakas salaisuus"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Ulkoiset binäärit"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Ei muuntajaa"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Käytä Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Käytä calibren e-kirjamuuntajaa"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "E-kirjamuuntajan asetukset"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Polku muunnintyökaluun"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Unrar binäärin paikka"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Näytä konfiguraatio"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Otsikko"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Satunnaisten kirjojen näytön lukumäärä"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Kirjailijoiden lukumäärä ennen piilotusta (0=poista piilotus)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Teema"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "oletusteema"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! Tumma teema"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Regular expression sarakkeiden poisjättämiseen"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Linkitä luettu/ei luettu -tieto Calibren sarakkeeseen"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Regular expression nimikkeiden järjestämiseen"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Aikusimateriaalin merkinnät"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Ei mitään"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Regular expression nimikkeiden järjestämiseen"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Uuden käyttäjän oletusasetukset"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Pääkäyttäjä"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Salli kirjojen lataukset"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Salli kirjojen luku"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Salli lisäykset"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Salli muutokset"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Salli kirjojen poisto"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Salli sananan vaihto"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Salli julkisten hyllyjen editointi"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Oletusnäkymä uusille käyttäjille"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Näytä satunnaisia kirjoja näkymässä"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Näytä aikuismateriaali"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Lue selaimessa"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Kuuntele selaimessa"
 
 #: cps/templates/detail.html:117
@@ -1652,9 +1683,9 @@ msgstr "Kirja"
 msgid "of"
 msgstr ""
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "kieli"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1677,21 +1708,9 @@ msgid "Add to shelf"
 msgstr "Lisää hyllyyn"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Muokkaa metadataa"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP-port (ylisimmin 25 normaalille SMTP:lle, 465 SSL:lle ja 587 STARTTLS:lle)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Salaus"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Ei mitään"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1701,23 +1720,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "SMTP salasana"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Lähettäjän sähköpostiosoite"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Tallenna asetukset"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Tallenna asetukset ja testaa sähköpostia"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Rekisteröinnissä sallitut domainit"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1733,29 +1744,33 @@ msgid "Enter domainname"
 msgstr "Syötä domainnimi"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Haluatko todellakin poistaa tämän domainin säännön?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Seuraava"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Luo virheilmoitus"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Palaa kotiin"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Löydä (satunnaiset kirjat)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Ryhmitä sarjoittain"
@@ -1780,7 +1795,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "Viimeisimmät kirjat"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Satunnaisia kirjoja"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Näytä satunnausia kirjoja"
 
@@ -1808,7 +1827,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Julkiset hyllyt"
 
@@ -1816,7 +1835,7 @@ msgstr "Julkiset hyllyt"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Kirjat julkisissa hyllyissä. Näkyy kaikille"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Omat hyllysi"
 
@@ -1828,10 +1847,19 @@ msgstr "Käyttäjän omat hyllyt. Näkyy vain käyttäjäll eitselleen"
 msgid "Home"
 msgstr "Koti"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Palaa"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Vaihda navigointi"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
@@ -1853,70 +1881,65 @@ msgstr "Kirjaudu ulos"
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Ladataan..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "ole hyvä äläkä päivitä sivua"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Selaa"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Luo hylly"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Tietoja"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Edellinen"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Kirjan tiedot"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Virhe"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Käyttäjänimi"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Salasana"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Muista minut"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Kirjadu käyttäen magic link"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1924,11 +1947,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-kirjaluettelo"
 
 #: cps/templates/read.html:74
@@ -2040,51 +2087,51 @@ msgid "Basic txt Reader"
 msgstr "Perus txt -lukija"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Rekisteröi uusi tili"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Valitse käyttäjänimi"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "Sähköpostiosoite"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Käytä toista laitetta, kirjaudu ja käy osoitteessa "
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Kun teet näin, sinut kirjataan automaattisesti sisään tälle laitteelle."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Linkki vanhenee 10 minuutissa."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Ei tuloksia haulle:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Ole hyvä ja koita muuta hakua"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Tulosket haulle:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Julkaisupäivästä"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Julkaisupäivään"
 
 #: cps/templates/search_form.html:43
@@ -2108,11 +2155,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Arvio enemmän kun"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Arvio vähemmän kun"
 
 #: cps/templates/shelf.html:10
@@ -2128,23 +2175,23 @@ msgid "Change order"
 msgstr "Muuta järjestystä"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "Hylly poistetaan kaikilta ja ikuisesti!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "pitäisikö hyllyn olla julkinen?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Vedä ja pudota muuttaaksesi järjestystä"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Calibre -kirjaston tilastot"
 
 #: cps/templates/stats.html:12
@@ -2164,21 +2211,17 @@ msgid "Series in this Library"
 msgstr "Sarjat kirjastossa"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Linkitetyt kirjastot"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Ohjelmiston luokka"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Asennettu versio"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Tehtävälista"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Käyttäjä"
@@ -2196,11 +2239,11 @@ msgid "Progress"
 msgstr "Edistyminen"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Ajoaika"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Käynnistysaika"
 
 #: cps/templates/tasks.html:24
@@ -2215,16 +2258,12 @@ msgstr "Piilota kaikki tehtävät"
 msgid "Reset user Password"
 msgstr "Nollaa käyttäjän salasana"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Kindle sähköposti"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Näytä kirjat kielellä"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Näytä kaikki"
 
 #: cps/templates/user_edit.html:52
@@ -2239,14 +2278,38 @@ msgstr "Linkitä"
 msgid "Unlink"
 msgstr "Poista linkitys"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Poista tämä käyttäjä"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Viimeisimmät lataukset"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Afar"
 #~ msgstr "afar"
 
@@ -3507,3 +3570,75 @@ msgstr "Viimeisimmät lataukset"
 #~ msgid "Show access log"
 #~ msgstr "Näytä pääsyloki"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Aikusimateriaalin merkinnät"
+
+#~ msgid "Show mature content"
+#~ msgstr "Näytä aikuismateriaali"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Julkaisjalistaus"
+
+#~ msgid "Series list"
+#~ msgstr "Sarjalistaus"
+
+#~ msgid "Available languages"
+#~ msgstr "Tillgängliga språk"
+
+#~ msgid "Category list"
+#~ msgstr "Kategorilista"
+
+#~ msgid "Series id"
+#~ msgstr "Sarja-id"
+
+#~ msgid "Submit"
+#~ msgstr "Lähetä"
+
+#~ msgid "Go!"
+#~ msgstr "Mene!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Salli kirjojen poisto"
+
+#~ msgid "language"
+#~ msgstr "kieli"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP-port (ylisimmin 25 normaalille SMTP:lle, 465 SSL:lle ja 587 STARTTLS:lle)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Lähettäjän sähköpostiosoite"
+
+#~ msgid "Save settings"
+#~ msgstr "Tallenna asetukset"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "ole hyvä äläkä päivitä sivua"
+
+#~ msgid "E-mail address"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "No Results for:"
+#~ msgstr "Ei tuloksia haulle:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Ole hyvä ja koita muuta hakua"
+
+#~ msgid "Tasks list"
+#~ msgstr "Tehtävälista"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Kindle sähköposti"
+
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index eff71dc9..7b23dc5a 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 ab52bcf3..2e7fe2bd 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2019-08-21 15:20+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -39,177 +39,186 @@ msgstr ""
 msgid "not installed"
 msgstr "non installé"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Page administrateur"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Courriel de test envoyé avec succès sur %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Il y a eu une erreur pendant l’envoi du courriel de test : %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable…"
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Demander une mise à jour"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Téléchargement la mise à jour"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Connexion à la base de donnée fermée"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 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/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Erreur générale"
 
@@ -402,42 +411,50 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Patienter"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Echoué"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Débué"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Terminé"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "Courriel : "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Convertir vers : "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Téléverser : "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Tâche inconnue : "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -566,16 +583,20 @@ msgstr "L’étagère %(title)s a été modifiée"
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
@@ -593,19 +614,19 @@ msgid "Hot Books"
 msgstr "Livres populaires"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Montrer les livres populaires"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -614,7 +635,7 @@ msgid "Show read and unread"
 msgstr "Montrer lu et non-lu"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -630,7 +651,7 @@ msgstr "Découvrir"
 msgid "Show random books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Catégories"
 
@@ -639,7 +660,7 @@ msgid "Show category selection"
 msgstr "Montrer la sélection par catégories"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Séries"
 
@@ -655,7 +676,7 @@ msgstr "Auteurs"
 msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Editeurs"
 
@@ -664,6 +685,7 @@ msgid "Show publisher selection"
 msgstr "Montrer la sélection par éditeur"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Langues"
 
@@ -716,216 +738,201 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Téléchargez la dernière version en cliquant sur le bouton ci-dessous."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Ajouts récents"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Livres les mieux notés"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Livres au hasard"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Découverte (livres au hasard)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Livres"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est pas accessible :"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editeur : '%(name)s'"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Note: %(rating)s étoiles"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Liste des éditeurs"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Liste des séries"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Langues disponibles"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Liste des catégories"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "recherche"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Le livre a été mis en file de traitement avec succès pour un envois vers %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, 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:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Veuillez configurer votre adresse de courriel Kindle en premier lieu…"
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Ce nom d’utilisateur ou cette adresse de courriel sont déjà utilisés."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Impossible de se connecter. Serveur LDAP hors service, veuillez contacter votre administrateur"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "connexion"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Erreur lors de l’ouverture d’un eBook. Le fichier n’existe pas ou le fichier n’est pas accessible."
 
@@ -940,23 +947,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "La commande Kindlegen a échouée avec le code d’erreur : %(error)s et le message : %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Liste des utilisateurs"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Surnom"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "Courriel"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -970,7 +980,7 @@ msgid "Download"
 msgstr "Télécharger"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Afficher les Ebooks"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -981,28 +991,32 @@ msgstr "Téléverser"
 msgid "Edit"
 msgstr "Éditer"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Paramètres du serveur SMTP"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "Adresse du serveur SMTP"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "Port du serveur SMTP"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "Compte utilisateur SMTP"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Expéditeur des courriels"
 
 #: cps/templates/admin.html:61
@@ -1014,63 +1028,71 @@ msgid "Configuration"
 msgstr "Configuration"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Répertoire de la base de donnée Calibre"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Niveau de journalisation"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Livres par page"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Téléversement de fichier"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Navigation anonyme"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Inscription public"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Connexion (\"magic link\")"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Administration"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Afficher les fichiers journaux"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Se reconnecter à Calibre-Web"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Redémarrer Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Arrêter Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1090,7 +1112,7 @@ msgid "Current version"
 msgstr "Version actuellement installée"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Rechercher les mise à jour"
 
 #: cps/templates/admin.html:149
@@ -1098,30 +1120,29 @@ msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Oui"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Retour"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Voulez-Vous vraiment arrêter Calibre-Web?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
 #: cps/templates/author.html:15
@@ -1157,7 +1178,8 @@ msgid "Delete formats:"
 msgstr "Supprimer les formats :"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1200,23 +1222,23 @@ msgid "Tags"
 msgstr "Étiquette"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Numéro dans la série"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Évaluation"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL de la couverture (jpg, la couverture est déposée sur le serveur et sauvegardée en base, ce champ est ensuite remis à vide)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Téléverser la couverture depuis un fichier en local"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Date de publication"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1225,7 +1247,8 @@ msgstr "Date de publication"
 msgid "Publisher"
 msgstr "Editeur"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Langue"
 
@@ -1238,34 +1261,33 @@ msgid "No"
 msgstr "Non"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Format du fichier téléversé"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "voir le livre après l'édition"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Soumettre"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Etes-vous vraiment sur?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Le livre va être supprimé de la base de données de Calibre"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "et du disque dur"
 
 #: cps/templates/book_edit.html:209
@@ -1276,10 +1298,6 @@ msgstr "Mot-clé"
 msgid " Search keyword "
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Allez !"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Cliquer sur la couverture pour importer les métadonnées dans le formulaire"
@@ -1288,8 +1306,9 @@ msgstr "Cliquer sur la couverture pour importer les métadonnées dans le formul
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Fermer"
 
@@ -1310,7 +1329,7 @@ msgid "Library Configuration"
 msgstr "Configuration de la Bibliothèque"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Emplacement de la base de donnée Calibre"
 
 #: cps/templates/config_edit.html:25
@@ -1362,7 +1381,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Emplacement de la clé de chiffrement SSL (laisser vide pour les serveurs non SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Canal de mise à jour"
 
 #: cps/templates/config_edit.html:101
@@ -1385,10 +1404,6 @@ msgstr "Nightly (Automatique)"
 msgid "Logfile Configuration"
 msgstr "Configuration du journal d’évenements"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Niveau de journalisation"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Emplacement et nom du fichier journal (sera calibre-web.log si vide)"
@@ -1406,255 +1421,271 @@ msgid "Feature Configuration"
 msgstr "Configuration des options"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Autoriser le téléversement de fichier"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Autoriser la navigation anonyme"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Autoriser l’inscription publique"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Activer la connexion (\"magic link\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Obtenir la clé API"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Clé de l’API Goodreads"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Secret de l’API Goodreads"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Type d’authentification"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Utiliser l’authentification standard"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Utiliser l’authentification LDAP"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Utiliser OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr ""
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr ""
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr ""
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Configuration des outils de conversion externes"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Pas de convertisseur"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Utiliser Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Utiliser Calibre ebook-convert"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Paramètres de la commande de conversion de livres"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Chemin d’accès à la commande de conversion"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Chemin d’accès à la commande UnRar"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Connexion"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Configuration du mode d’affichage"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titre"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Nombre de livres choisis au hasard à afficher"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Nombre d’auteurs à afficher avant de masquer (0=désactiver le masquage)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Thème"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Thème par défaut"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "thème caliBur! Dark Theme"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Expression régulière à utiliser pour filtrer les colonnes"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Lier le statut lu/non lu à la colonne équivalente dans Calibre"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Expression régulière à utiliser pour trier les titres"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Mots clés pour contenue pour adulte"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Aucun"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Expression régulière à utiliser pour trier les titres"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Réglages par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Utilisateur admin"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Permettre les téléchargements"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Autoriser le visionneur de livres"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Permettre le téléversement de fichiers"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Permettre l'édition"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Autoriser la suppression des livres"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Autoriser la modification d’étagères publiques"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Mode de visualisation par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Montrer aléatoirement des livres dans la vue détaillée"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Montrer le contenu pour adulte"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Lire dans le navigateur"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Lire dans le navigateur"
 
 #: cps/templates/detail.html:117
@@ -1665,9 +1696,9 @@ msgstr "Livre"
 msgid "of"
 msgstr "de"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "langue"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1690,21 +1721,9 @@ msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Éditer les métadonnées"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "Port SMTP (habituellement 25 pour strict SMTP et 465 pour SSL et 587 pour STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Type de chiffrement"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Aucun"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1714,23 +1733,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "Mot de passe utilisateur SMTP"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Adresse de l’expéditeur des courriels"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Sauvegarder les réglages"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Sauvegarder les réglages et tester l’envoi d’un courriel"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Domaines autorisés pour l’inscription"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1746,29 +1757,33 @@ msgid "Enter domainname"
 msgstr "Saisir le nom du domaine"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Souhaitez-vous vraiment supprimer cette règle de domaine ?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Suivant"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Signaler un problème"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Retour à l’accueil"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Découverte (livres au hasard)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Grouper par série"
@@ -1793,7 +1808,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "Les derniers livres"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Livres au hasard"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
@@ -1821,7 +1840,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Étagères publiques"
 
@@ -1829,7 +1848,7 @@ msgstr "Étagères publiques"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Livres disponibles dans les étagères publiques, visibles par tous"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
@@ -1841,10 +1860,19 @@ msgstr "Etagères personnelles, seulement visible de l’utilisateur propréitai
 msgid "Home"
 msgstr "Accueil"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Retour"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Basculer la navigation"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Recherche avancée"
@@ -1866,70 +1894,65 @@ msgstr "Déconnexion"
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Téléversement en cours…"
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "veuillez ne pas rafraîchir la page"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Détails du livre"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Erreur"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Mot de passe"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Se rappeler de moi"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Se connecter avec le (\"magic link\")"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1937,11 +1960,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Catalogue de livres électroniques Calibre-Web"
 
 #: cps/templates/read.html:74
@@ -2053,51 +2100,51 @@ msgid "Basic txt Reader"
 msgstr "Lecteur de texte simple"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Enregistrer un nouveau compte"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Choisissez un nom d'utilisateur"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "Adresse de courriel"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Votre adresse de courriel"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Utilisez votre autre appareil, connectez-vous et visitez "
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Une fois fait, vous serez automatiquement connecté à cet appareil."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Le lien expirera après 10 minutes."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Aucun résultat pour :"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Essayer une recherche différente"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Résultats pour :"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Date de publication (depuis)"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Date de publication (jusqu’à)"
 
 #: cps/templates/search_form.html:43
@@ -2121,11 +2168,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Évaluation supérieure à"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Évaluation inférieure à"
 
 #: cps/templates/shelf.html:10
@@ -2141,23 +2188,23 @@ msgid "Change order"
 msgstr "Modifier l’ordre"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "L’étagère sera supprimée pour tout le monde et de façon définitive !"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "cette étagère doit-elle être publique ?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Glisser-déposer pour modifier l’ordre"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Statistiques de la librairie Calibre"
 
 #: cps/templates/stats.html:12
@@ -2177,21 +2224,17 @@ msgid "Series in this Library"
 msgstr "Séries dans la librairie"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Librairies liées"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Bibliothèque logiciel"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Version installée"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Liste des tâches"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Utilisateur"
@@ -2209,11 +2252,11 @@ msgid "Progress"
 msgstr "Avancement"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Durée"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Démarrage"
 
 #: cps/templates/tasks.html:24
@@ -2228,16 +2271,12 @@ msgstr "Masquer toutes les tâches"
 msgid "Reset user Password"
 msgstr "Réinitialiser le mot de passe de l’utilisateur"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Adresse de courriel Kindle"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Montrer les livres dans la langue"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Montrer tout"
 
 #: cps/templates/user_edit.html:52
@@ -2252,14 +2291,38 @@ msgstr "Relier"
 msgid "Unlink"
 msgstr "Dissocier"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Supprimer cet utilisateur"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Téléchargement récent"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Use"
 #~ msgstr "Utiliser"
 
@@ -2281,3 +2344,75 @@ msgstr "Téléchargement récent"
 #~ msgid "Show access log"
 #~ msgstr "Afficher le journal des accès"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Mots clés pour contenue pour adulte"
+
+#~ msgid "Show mature content"
+#~ msgstr "Montrer le contenu pour adulte"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Liste des éditeurs"
+
+#~ msgid "Series list"
+#~ msgstr "Liste des séries"
+
+#~ msgid "Available languages"
+#~ msgstr "Langues disponibles"
+
+#~ msgid "Category list"
+#~ msgstr "Liste des catégories"
+
+#~ msgid "Series id"
+#~ msgstr "Numéro dans la série"
+
+#~ msgid "Submit"
+#~ msgstr "Soumettre"
+
+#~ msgid "Go!"
+#~ msgstr "Allez !"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Autoriser la suppression des livres"
+
+#~ msgid "language"
+#~ msgstr "langue"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "Port SMTP (habituellement 25 pour strict SMTP et 465 pour SSL et 587 pour STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Adresse de l’expéditeur des courriels"
+
+#~ msgid "Save settings"
+#~ msgstr "Sauvegarder les réglages"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "veuillez ne pas rafraîchir la page"
+
+#~ msgid "E-mail address"
+#~ msgstr "Adresse de courriel"
+
+#~ msgid "No Results for:"
+#~ msgstr "Aucun résultat pour :"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Essayer une recherche différente"
+
+#~ msgid "Tasks list"
+#~ msgstr "Liste des tâches"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Adresse de courriel Kindle"
+
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index e437d269..81ce7157 100644
Binary files a/cps/translations/hu/LC_MESSAGES/messages.mo and b/cps/translations/hu/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 7a647427..2f7a317a 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -26,177 +26,186 @@ msgstr ""
 msgid "not installed"
 msgstr "nincs telepítve"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "A kiszolgáló leállítása folyamatban, zárd be ezt az ablakot"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Rendszergazda oldala"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Az e-mail kiszolgáló beállításainak módosítása"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "A teszt levél sikeresen elküldve ide: %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Hiba történt a teszt levél küldése során: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Ismeretlen hiba történt."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "A frissítés települt, kattints az OK-ra és újra tölt az oldal"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Általános hiba"
 
@@ -389,42 +398,50 @@ msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "A könyv elérési útja (\"%(path)s\") nem található a Google Drive-on"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Nem sikerült"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Elindítva"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Végrehajtva"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-mail cím: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Konvertálás:"
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Feltöltés:"
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Ismeretlen feladat:"
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -553,16 +570,20 @@ msgstr "A következő polc megváltoztatva: %(title)s"
 msgid "Edit a shelf"
 msgstr "Polc szerkesztése"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Polc: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
@@ -580,19 +601,19 @@ msgid "Hot Books"
 msgstr "Kelendő könyvek"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Kelendő könyvek mutatása"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -601,7 +622,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -617,7 +638,7 @@ msgstr "Felfedezés"
 msgid "Show random books"
 msgstr "Könyvek találomra mutatása"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Címkék"
 
@@ -626,7 +647,7 @@ msgid "Show category selection"
 msgstr "Címke választó mutatása"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -642,7 +663,7 @@ msgstr "Szerzők"
 msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -651,6 +672,7 @@ msgid "Show publisher selection"
 msgstr "Kiadó választó mutatása"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -703,216 +725,201 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Legutóbb hozzáadott könyvek"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Legjobbra értékelt könyvek"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Könyvek találomra"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Hiba történt az e-könyv megnyitásakor. A fájl nem létezik vagy nem érhető el:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Kiadók listája"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Sorozatok listája"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Elérhető nyelvek"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Címkék listája"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "keresés"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Hiba történt a könyv küldésekor: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Először be kell állítani a kindle e-mail címet..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "regisztrálás"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Jóváhagyó levél elküldve az email címedre."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Ez a felhasználónév vagy e-mail cím már használatban van."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "belépés"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "A token nem található."
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "A token érvényessége lejárt."
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Egy olvasott könyv"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -927,23 +934,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "A Kindlegen futtatása nem sikerült a(z) %(error)s hiba miatt. Üzenet: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Felhasználók listája"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Felhasználói név"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "E-mail"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "Letöltések"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -957,7 +967,7 @@ msgid "Download"
 msgstr "Letöltés"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -968,28 +978,32 @@ msgstr "Feltöltés"
 msgid "Edit"
 msgstr "Szerkesztés"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "SMTP e-mail kiszolgáló beállítások"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP szervernév"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP felhasználó"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Küldő e-mail cím"
 
 #: cps/templates/admin.html:61
@@ -1001,63 +1015,71 @@ msgid "Configuration"
 msgstr "Konfiguráció"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Calibre adatbázis mappája:"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Naplózás szintje:"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Port:"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Könyvek oldalanként:"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Feltöltés:"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Böngészés bejelentkezés nélkül:"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Nyílvános regisztráció:"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Távoli belépés:"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Adminisztráció"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr ""
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Újracsatlakozás a Calibre adatbázishoz"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "A Calibre adatbázis újraindítása"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "A Calibre adatbázis leállítása"
 
 #: cps/templates/admin.html:131
@@ -1077,7 +1099,7 @@ msgid "Current version"
 msgstr "Jelenlegi verzió"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Frissítés keresése"
 
 #: cps/templates/admin.html:149
@@ -1085,30 +1107,29 @@ msgid "Perform Update"
 msgstr "Frissítés elkezdése"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Vissza"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Frissítés folyamatban, ne töltsd újra az oldalt"
 
 #: cps/templates/author.html:15
@@ -1144,7 +1165,8 @@ msgid "Delete formats:"
 msgstr "Formátumok törlése:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Törlés"
 
@@ -1187,23 +1209,23 @@ msgid "Tags"
 msgstr "Címkék"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Sorozat azonosítója"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Értékelés"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Borító URL (jpg, borító letöltve és elmentve az adatbázisban, a mező újra üres lesz utána)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Borító feltöltése helyi meghajtóról"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Kiadás éve"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1212,7 +1234,8 @@ msgstr "Kiadás éve"
 msgid "Publisher"
 msgstr "Kiadó"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Nyelv"
 
@@ -1225,34 +1248,33 @@ msgid "No"
 msgstr "Nem"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Feltöltés formátuma"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "Könyv megnézése szerkesztés után"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Küldés"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Biztosan?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "A könyv törölve lesz a Calibre adatbázisból"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr " és a merevlemezről"
 
 #: cps/templates/book_edit.html:209
@@ -1263,10 +1285,6 @@ msgstr "Kulcsszó"
 msgid " Search keyword "
 msgstr " Keresési kulcsszó "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Rajta!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Kattints a borítóra a metadatok betöltésére"
@@ -1275,8 +1293,9 @@ msgstr "Kattints a borítóra a metadatok betöltésére"
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Bezárás"
 
@@ -1297,7 +1316,7 @@ msgid "Library Configuration"
 msgstr "Könyvát beállításai"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Calibra adatbázis helye"
 
 #: cps/templates/config_edit.html:25
@@ -1349,7 +1368,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL kulcsfájl helye (nem SSL szerverekhez üresen kell hagyni)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Frissítési forrás"
 
 #: cps/templates/config_edit.html:101
@@ -1372,10 +1391,6 @@ msgstr "Éjszakai (automatikus)"
 msgid "Logfile Configuration"
 msgstr "Naplózási beállítások"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Naplózás szintje"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Naplófájl helye és neve (üresen hagyva calibre-web.log)"
@@ -1393,255 +1408,271 @@ msgid "Feature Configuration"
 msgstr "Funkciók beállítása"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Feltöltés engedélyezése"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Böngészés bejelentkezés nélkül engedélyezése"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Nyilvános regisztráció engedélyezése"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Távoli belépés engedélyezése (\"varázs-hivatkozás\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "API-kulcs beszerzése"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Goodreads API-kulcs"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API titkos kód"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr ""
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr ""
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr ""
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Külső futtatható fájlok"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Átalakítás nélkül"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Kindlegen használata"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Calibre e-könyv átalakító használata"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "E-könyv átalakító beállításai"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Elérési út az átalakító-eszközhöz"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Az Unrar futtatási állományának helye"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Belépés"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Általános beállítások"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Név"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Találomra mutatott könyvek száma"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Mutatott szerzők száma (0=elrejtés kikapcsolása)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Téma"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Alapértelmezett téma"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! sötét téma"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Reguláris kifejezés oszlopok kihagyásához"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Olvasva/olvasatlan állapot hozzárendelése Calibre oszlophoz"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Reguláris kifejezés címek sorbarendezéséhez"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Felnőtt tartalom címkéi"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Nincs"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Reguláris kifejezés címek sorbarendezéséhez"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Új felhasználók alapértelmezett beállításai"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Rendszergazda felhasználó"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Letöltés engedélyezése"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Feltöltés engedélyezése"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Szerkesztés engedélyezése"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Könyv törlés engedélyezése"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Jelszó változtatásának engedélyezése"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Nyilvános polcok szerkesztésének engedélyezése"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Új felhasználók alapértelmezett látható elemei"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Mutasson könyveket találomra a részletes nézetben"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Mutassa a felnőtt tartalmat"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Olvasás böngészőben"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr ""
 
 #: cps/templates/detail.html:117
@@ -1652,9 +1683,9 @@ msgstr " "
 msgid "of"
 msgstr "kötete a sorozatnak:"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "nyelv"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1677,21 +1708,9 @@ msgid "Add to shelf"
 msgstr "Hozzáadás polchoz"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP port (egyszerű SMTP-hez rendszerint 25, SSL-hez 465 és STARTTLS-hez 587)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Titkosítás"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Nincs"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1701,23 +1720,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "SMTP jelszó"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "E-mail-ből"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Beállítások mentése"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Beállítások mentése és teszt e-mail küldése"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Regisztráláshoz engedélyezett tartományok"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1733,28 +1744,32 @@ msgid "Enter domainname"
 msgstr "Tartomány megadása"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Valóban törölni akarod ezt a tartomány-szabályt?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Következő"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
-msgstr "Vissza a kezdőlapra"
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Felfedezés (könyvek találomra)"
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr ""
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
+msgstr "Vissza a kezdőlapra"
 
 #: cps/templates/index.html:64
 msgid "Group by series"
@@ -1780,7 +1795,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "A legfrissebb könyvek"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Könyvek találomra"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
@@ -1808,7 +1827,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Nyilvános polcok"
 
@@ -1816,7 +1835,7 @@ msgstr "Nyilvános polcok"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Könyvek nyilvános polcokra rakva, mindenkinek látható"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Saját polcok"
 
@@ -1828,10 +1847,19 @@ msgstr "A felhasználó saját polcai, csak a jelenlegi felhasználónak láthat
 msgid "Home"
 msgstr "Kezdőlap"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Vissza"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Navigáció átkapcsolása"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Részletes keresés"
@@ -1853,70 +1881,65 @@ msgstr "Kilépés"
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "Ne frissítsd az oldalt!"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Könyv részletei"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Hiba"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Felhasználó név"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Jelszó"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Emlékezz rám"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Belépés varázshivatkozással"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1924,11 +1947,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-könyv katalógus"
 
 #: cps/templates/read.html:74
@@ -2040,51 +2087,51 @@ msgid "Basic txt Reader"
 msgstr "Egyszerű txt olvasó"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Új felhasználó regisztrálása"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Válassz egy felhasználónevet"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "E-mail cím"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Az e-mail címed"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr ""
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Az első belépés után automatikusan be leszel léptetve ezen az eszközön."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Nincs találatok a következőhöz:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Próbálj másik keresést!"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Találatok a következőhöz:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Kiadás éve ettől: "
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Kiadás éve eddig: "
 
 #: cps/templates/search_form.html:43
@@ -2108,11 +2155,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Értékelés nagyob mint"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Értékelés kisebb mint"
 
 #: cps/templates/shelf.html:10
@@ -2128,23 +2175,23 @@ msgid "Change order"
 msgstr "Sorrend változtatása"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "A polc el fog tűnni mindenki számára és örökké!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "Nyilvános polc"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Húzd és dob a sorrend változtatásához"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "A Calibre könyvár statisztikái"
 
 #: cps/templates/stats.html:12
@@ -2164,21 +2211,17 @@ msgid "Series in this Library"
 msgstr "Sorozatok ebben a könyvtárban"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Hivatkozott könyvtárak"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Alkalmazás könyvtár"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Telepített verzió"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Feladatlista"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Felhasználó"
@@ -2196,11 +2239,11 @@ msgid "Progress"
 msgstr "Állapot"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Futásidő"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Indítás ideje"
 
 #: cps/templates/tasks.html:24
@@ -2215,16 +2258,12 @@ msgstr "Összes feladat elrejtése"
 msgid "Reset user Password"
 msgstr "Felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Kindle e-mail"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Mutasd a könyveket a következő nyelvvel"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Mindent mutass"
 
 #: cps/templates/user_edit.html:52
@@ -2239,14 +2278,38 @@ msgstr ""
 msgid "Unlink"
 msgstr ""
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "A felhasználó törlése"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Utolsó letöltések"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Afar"
 #~ msgstr "Afar"
 
@@ -3477,3 +3540,75 @@ msgstr "Utolsó letöltések"
 #~ msgid "Show access log"
 #~ msgstr ""
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Felnőtt tartalom címkéi"
+
+#~ msgid "Show mature content"
+#~ msgstr "Mutassa a felnőtt tartalmat"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Kiadók listája"
+
+#~ msgid "Series list"
+#~ msgstr "Sorozatok listája"
+
+#~ msgid "Available languages"
+#~ msgstr "Elérhető nyelvek"
+
+#~ msgid "Category list"
+#~ msgstr "Címkék listája"
+
+#~ msgid "Series id"
+#~ msgstr "Sorozat azonosítója"
+
+#~ msgid "Submit"
+#~ msgstr "Küldés"
+
+#~ msgid "Go!"
+#~ msgstr "Rajta!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Könyv törlés engedélyezése"
+
+#~ msgid "language"
+#~ msgstr "nyelv"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP port (egyszerű SMTP-hez rendszerint 25, SSL-hez 465 és STARTTLS-hez 587)"
+
+#~ msgid "From e-mail"
+#~ msgstr "E-mail-ből"
+
+#~ msgid "Save settings"
+#~ msgstr "Beállítások mentése"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "Ne frissítsd az oldalt!"
+
+#~ msgid "E-mail address"
+#~ msgstr "E-mail cím"
+
+#~ msgid "No Results for:"
+#~ msgstr "Nincs találatok a következőhöz:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Próbálj másik keresést!"
+
+#~ msgid "Tasks list"
+#~ msgstr "Feladatlista"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Kindle e-mail"
+
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 4b1cbfeb..d4f66626 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 ab8442f0..53ca14df 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -25,177 +25,186 @@ msgstr "installato"
 msgid "not installed"
 msgstr "non installato"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, per favore ricarica la pagina"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Aggiornamento della configurazione di Calibre-Web"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utente '%(user)s' creato"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Modifica la configurazione del server e-mail"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "E-mail di test inviato con successo a %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Si è verificato un errore nell'invio dell'e-mail di test: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utente '%(nick)s' eliminato"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Ho trovato un account creato in precedenza con questo e-mail."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica utente %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utente '%(nick)s' aggiornato"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Si è verificato un errore imprevisto."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, prego premi ok e ricarica la pagina"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Aggiornamento fallito:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP Error"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Errore generale"
 
@@ -388,42 +397,50 @@ msgstr "File %(file)s non trovato su Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Non ho trovato la cartella %(path)s del libro su Google Drive"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Attendi"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Avviato"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Terminato"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-mail: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Conversione: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Upload: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Processo sconosciuto: "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -552,16 +569,20 @@ msgstr "Lo scaffale %(title)s è stato modificato"
 msgid "Edit a shelf"
 msgstr "Modifica uno scaffale"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Scaffale: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
@@ -579,19 +600,19 @@ msgid "Hot Books"
 msgstr "Libri popolari"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Mostra l'opzione per la selezione dei libri più popolari"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio votati"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Libri da leggere"
 
@@ -600,7 +621,7 @@ msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -616,7 +637,7 @@ msgstr "Per scoprire"
 msgid "Show random books"
 msgstr "Mostra l'opzione per presentare libri aleatoriamente"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Categorie"
 
@@ -625,7 +646,7 @@ msgid "Show category selection"
 msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Serie"
 
@@ -641,7 +662,7 @@ msgstr "Autori"
 msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Editori"
 
@@ -650,6 +671,7 @@ msgid "Show publisher selection"
 msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Lingue"
 
@@ -702,216 +724,201 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Libri aggiunti di recente"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Libri con le migliori valutazioni"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Libri presentati aleatoriamente"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Libri"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Errore durante l'apertura del libro. Il file non esiste o il file non è accessibile:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Elenco degli editori"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Elenco delle serie"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Lingue disponibili"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Elenco delle categorie"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Pubblicato dopo "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Pubblicato prima "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "ricerca"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Libro accodato con successo per essere spedito a %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, 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:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Per favore configura dapprima il tuo indirizzo e-mail di Kindle..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "registra"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non può essere utilizzato per la registrazione"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un e-mail di conferma è stato inviato al tuo indirizzo."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Questo nome di utente o questo e-mail sono già utilizzati."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Non posso collegarmi. Il server LDAP non è raggiungibile, per favore contatta l'amministratore"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "accedi"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Leggi un libro"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Errore nell'aprire il libro. Il file non esiste o il file non è accessibile."
 
@@ -926,23 +933,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen ha restituito l'errore %(error)s. Messaggio: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Elenco utenti"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Nickname"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "E-mail"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -956,7 +966,7 @@ msgid "Download"
 msgstr "Download"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Vedi libri"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -967,28 +977,32 @@ msgstr "Upload"
 msgid "Edit"
 msgstr "Modifica"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Configurazione server SMTP"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "indirizzo server SMTP"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "porta SMTP"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "login SMTP"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "E-mail da"
 
 #: cps/templates/admin.html:61
@@ -1000,63 +1014,71 @@ msgid "Configuration"
 msgstr "Configurazione"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Cartella DB Calibre"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Livello di log"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Porta"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Libri per pagina"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Uploading"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Navigazione anonima"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Registrazione pubblica"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Login remoto"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr "Login reverse proxy"
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr "Nome intestazione reverse proxy"
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Amministrazione"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Visualizza Logfile"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Ricollegare al DB Calibre"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Riavvia Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Arresta Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1076,7 +1098,7 @@ msgid "Current version"
 msgstr "Versione attuale"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Ricerca aggiornamenti"
 
 #: cps/templates/admin.html:149
@@ -1084,30 +1106,29 @@ msgid "Perform Update"
 msgstr "Esegui l'aggiornamento"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Indietro"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Vuoi veramente arrestare Calibre-Web?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
 #: cps/templates/author.html:15
@@ -1143,7 +1164,8 @@ msgid "Delete formats:"
 msgstr "Elimina i formati:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Elimina"
 
@@ -1186,23 +1208,23 @@ msgid "Tags"
 msgstr "Categorie"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Serie id"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Valutazione"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL della copertina (jpg, la copertina viene caricata e salvata nel database, dopodiché il campo viene nuovamente svuotato)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Carica la copertina dal disco locale"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Data di pubblicazione"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1211,7 +1233,8 @@ msgstr "Data di pubblicazione"
 msgid "Publisher"
 msgstr "Editore"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Lingua"
 
@@ -1224,34 +1247,33 @@ msgid "No"
 msgstr "No"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Carica formato"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "visualizza il libro dopo la modifica"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Invia"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Sei davvero sicuro?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Il libro verrà cancellato dal database di Calibre"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "e dal disco rigido"
 
 #: cps/templates/book_edit.html:209
@@ -1262,10 +1284,6 @@ msgstr "Parola chiave"
 msgid " Search keyword "
 msgstr "Cerca parola chiave"
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Vai!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Fai clic sulla copertina per caricare i metadati presenti nel modulo"
@@ -1274,8 +1292,9 @@ msgstr "Fai clic sulla copertina per caricare i metadati presenti nel modulo"
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Chiudi"
 
@@ -1296,7 +1315,7 @@ msgid "Library Configuration"
 msgstr "Configurazione della libreria"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Posizione del database di Calibre"
 
 #: cps/templates/config_edit.html:25
@@ -1348,7 +1367,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Percorso del Keyfile SSL (lascia vuoto per una configurazione del server senza SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Canale d'aggiornamento"
 
 #: cps/templates/config_edit.html:101
@@ -1371,10 +1390,6 @@ msgstr "Nightly (automatico)"
 msgid "Logfile Configuration"
 msgstr "Configurazione del Logfile"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Livello di Log"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Percorso e nome del Logfile (senza indicazioni sarà calibre-web.log)"
@@ -1392,255 +1407,271 @@ msgid "Feature Configuration"
 msgstr "Ulteriori opzioni"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Abilita il caricamento"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Abilita la navigazione anonima"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Abilita la registrazione pubblica"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Attiva login remoto (\"magic link\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "Utilizza Goodreads"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Otteni una chiave API"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "API di Goodreads"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Tipo di login"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Utilizza l'autenticazione standard"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Utilizza l'autenticazione LDAP"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Utilizza OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Nome o indirizzo IP del server LDAP"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "Porta del server LDAP"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "Schema LDAP (ldap o ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr "Nome di utente dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr "Password dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "Il server LDAP utilizza SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "Il server LDAP utilizza TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "Certificato del server LDAP"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "Percorso del certificato SSL del server LDAP"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr "LDAP User object filter"
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Il server LDAP è un server OpenLDAP?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Ottieni le credenziali OAuth di %(provider)s"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Permetti l'autenticazione Reverse Proxy"
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr "Nome dell'intestazione Reverse Proxy"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Files binari esterni"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Nessun convertitore"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Utilizza Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Utilizza il convertitore di Calibre"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Configurazione del convertitore di libri"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Percorso del convertitore"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Percorso di UnRar"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Accesso"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Configurazione aspetto biblioteca"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titolo"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Numero di libri casuali da mostrare"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Numero di autori da mostrare prima di nascondere (0=disabilita mascheramento)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Tema"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Tema standard"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! Dark Theme"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Espressione regolare per ignorare le colonne"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Collega lo stato letto/non letto nella colonna di Calibre"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Espressione regolare per ordinare la visualizzazione del titolo"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Categorie che definiscono i libri per adulti"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Nessuna"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Espressione regolare per ordinare la visualizzazione del titolo"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Impostazioni predefinite per i nuovi utenti"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Utente amministratore"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Permetti il download"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Permetti l'utilizzo del visualizzatore di libri"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Permetti l'upload"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Permetti la modifica"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Permetti l'eliminazione di libri"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Permetti la modifica della password"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Permetti la modifica degli scaffali pubblici"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Visibilità di base per i nuovi utenti"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Mostra libri scelti aleatoriamente nella vista dettagliata"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Mostra sezione per adulti"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Leggi nel navigatore"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Ascolta nel navigatore"
 
 #: cps/templates/detail.html:117
@@ -1651,9 +1682,9 @@ msgstr "Libro"
 msgid "of"
 msgstr "di"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "lingua"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1676,47 +1707,27 @@ msgid "Add to shelf"
 msgstr "Aggiungi allo scaffale"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Modifica metadati"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "Porta SMTP (normalmente 25 senza codifica, 465 per codifica SSL e 587 per STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Crittografia"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Nessuna"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
-msgstr "STATRTTLS"
+msgstr "STARTTLS"
 
 #: cps/templates/email_edit.html:23
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "password SMTP"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "E-mail mittente"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Salva le impostazioni"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Salva le impostazioni e invia e-mail di test"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Dominii autorizzati alla registrazione"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1732,29 +1743,33 @@ msgid "Enter domainname"
 msgstr "Digita il nome di dominio"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr "Dominii bloccati per la registrazione"
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Vuoi veramente eliminare questa regola di dominio?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Prossimo"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Crea-segnala un problema"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Ritorna alla pagina principale"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Scopri (libri casuali)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Raggruppa per serie"
@@ -1779,7 +1794,11 @@ msgstr "Libri aggiunti di recente"
 msgid "The latest Books"
 msgstr "Gli ultimi libri"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Libri presentati aleatoriamente"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Mostra libri casualmente"
 
@@ -1807,7 +1826,7 @@ msgstr "Libri ordinati per lingua"
 msgid "Books ordered by file formats"
 msgstr "Libri ordinati per formato"
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Scaffali pubblici"
 
@@ -1815,7 +1834,7 @@ msgstr "Scaffali pubblici"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Libri organizzati in scaffali pubblici, visibili a tutti"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "I tuoi scaffali"
 
@@ -1827,10 +1846,19 @@ msgstr "Scaffali dell'utente, visibili unicamente all'utente stesso"
 msgid "Home"
 msgstr "Home"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Indietro"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Alterna navigazione"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
@@ -1852,70 +1880,65 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registra"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Uploading..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "per favore non aggiornare la pagina"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Naviga"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Dettagli libro"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Errore"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Nome utente"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Password"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Ricordami"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr "Password dimenticata"
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Accedi con magic link"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr "Mostra il log di Calibre-Web: "
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr "Calibre-Web log: "
 
 #: cps/templates/logviewer.html:8
@@ -1923,11 +1946,35 @@ msgid "Stream output, can't be displayed"
 msgstr "Flusso attivo, non può essere visualizzato"
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
 msgstr "Mostra il log di accesso: "
 
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
+msgstr ""
+
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Catalogo Calibre-Web"
 
 #: cps/templates/read.html:74
@@ -2039,51 +2086,51 @@ msgid "Basic txt Reader"
 msgstr "Lettore di base txt"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Registra un nuovo account"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Scegli un nome utente"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "Indirizzo e-mail"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Il tuo indirizzo e-mail"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Utilizza il tuo altro apparecchio, accedi e visita"
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Una volta completato, verrai automaticamente connesso con questo dispositivo."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Il link scadrà tra 10 minuti."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Nessun risultato per:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Prova una ricerca differente"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "risultati per:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Data di pubblicazione da"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Data di pubblicazione fino a"
 
 #: cps/templates/search_form.html:43
@@ -2107,11 +2154,11 @@ msgid "Exclude Extensions"
 msgstr "Escludi estensioni"
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Valutazione superiore a"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Valutazione inferiore a"
 
 #: cps/templates/shelf.html:10
@@ -2127,23 +2174,23 @@ msgid "Change order"
 msgstr "Cambia ordine"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Vuoi davvero eliminare lo scaffale?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "Lo scaffale sarà perso per tutti e per sempre!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "scaffale pubblico"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Riordina tramite drag and drop"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Statistiche della libreria di Calibre"
 
 #: cps/templates/stats.html:12
@@ -2163,21 +2210,17 @@ msgid "Series in this Library"
 msgstr "Serie in questa libreria"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Librerie collegate"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Programma libreria"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Versione installata"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Lista delle operazioni"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Utente"
@@ -2195,11 +2238,11 @@ msgid "Progress"
 msgstr "Avanzamento"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Tempo d'esecuzione"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Ora d'inizio"
 
 #: cps/templates/tasks.html:24
@@ -2214,16 +2257,12 @@ msgstr "Nascondi tutte le operazioni"
 msgid "Reset user Password"
 msgstr "Resetta la password dell'utente"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "E-mail di Kindle"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Mostra libri in "
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "tutte le lingue presenti"
 
 #: cps/templates/user_edit.html:52
@@ -2238,14 +2277,38 @@ msgstr "Collega"
 msgid "Unlink"
 msgstr "Scollega"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Elimina questo utente"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Download recenti"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Afar"
 #~ msgstr "Afar"
 
@@ -3671,3 +3734,75 @@ msgstr "Download recenti"
 #~ msgid "Show access log"
 #~ msgstr "Mostra il log di accesso"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Categorie che definiscono i libri per adulti"
+
+#~ msgid "Show mature content"
+#~ msgstr "Mostra sezione per adulti"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Elenco degli editori"
+
+#~ msgid "Series list"
+#~ msgstr "Elenco delle serie"
+
+#~ msgid "Available languages"
+#~ msgstr "Lingue disponibili"
+
+#~ msgid "Category list"
+#~ msgstr "Elenco delle categorie"
+
+#~ msgid "Series id"
+#~ msgstr "Serie id"
+
+#~ msgid "Submit"
+#~ msgstr "Invia"
+
+#~ msgid "Go!"
+#~ msgstr "Vai!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Permetti l'eliminazione di libri"
+
+#~ msgid "language"
+#~ msgstr "lingua"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "Porta SMTP (normalmente 25 senza codifica, 465 per codifica SSL e 587 per STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "E-mail mittente"
+
+#~ msgid "Save settings"
+#~ msgstr "Salva le impostazioni"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "per favore non aggiornare la pagina"
+
+#~ msgid "E-mail address"
+#~ msgstr "Indirizzo e-mail"
+
+#~ msgid "No Results for:"
+#~ msgstr "Nessun risultato per:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Prova una ricerca differente"
+
+#~ msgid "Tasks list"
+#~ msgstr "Lista delle operazioni"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "E-mail di Kindle"
+
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 34c3fa40..fb43e9ee 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 be47e054..17699a25 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -26,177 +26,186 @@ msgstr ""
 msgid "not installed"
 msgstr "インストールされていません"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました。ページを再読み込みしてください"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンしています。ページを閉じてください"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "不明"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "メールサーバの設定を編集"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "テストメールが %(kindlemail)s に送信されました"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "不明なエラーが発生しました。"
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "エラー発生"
 
@@ -389,42 +398,50 @@ msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "待機中"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "開始"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "終了"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "不明"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "メール: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "変換: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "アップロード: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "不明なタスク: "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -553,16 +570,20 @@ msgstr "%(title)s を変更しました"
 msgid "Edit a shelf"
 msgstr "本棚を編集する"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "本棚: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
@@ -580,19 +601,19 @@ msgid "Hot Books"
 msgstr "人気の本"
 
 #: cps/ub.py:60
-msgid "Show hot books"
-msgstr "人気な本を表示"
+msgid "Show Hot Books"
+msgstr ""
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
-msgstr "高評価の本"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
+msgstr ""
 
 #: cps/ub.py:65
-msgid "Show best rated books"
-msgstr "評価が高い本を表示"
+msgid "Show Top Rated Books"
+msgstr ""
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "読んだ本"
 
@@ -601,7 +622,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -617,7 +638,7 @@ msgstr "見つける"
 msgid "Show random books"
 msgstr "ランダムで本を表示"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -626,7 +647,7 @@ msgid "Show category selection"
 msgstr "カテゴリ選択を表示"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "シリーズ"
 
@@ -642,7 +663,7 @@ msgstr "著者"
 msgid "Show author selection"
 msgstr "著者選択を表示"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "出版社"
 
@@ -651,6 +672,7 @@ msgid "Show publisher selection"
 msgstr "出版社選択を表示"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "言語"
 
@@ -703,216 +725,201 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "最近追加された本"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "高評価"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "ランダム"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
-msgstr "話題(ダウンロード数順)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
+msgstr ""
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr ""
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "出版社一覧"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "シリーズ一覧"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "言語"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "カテゴリ一覧"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "検索"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "検索"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "このユーザ名またはメールアドレスはすでに使われています。"
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "ログイン"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "トークンが見つかりません"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "トークンが無効です"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません:"
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -927,24 +934,27 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen が失敗しました。エラー: %(error)s, メッセージ: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
-msgstr "ユーザ一覧"
+msgid "Users"
+msgstr ""
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
-msgstr "ニックネーム"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
+msgstr "ユーザ名"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
-msgstr "メールアドレス"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
+msgstr ""
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
-msgstr "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
+msgstr ""
 
 #: cps/templates/admin.html:15
-msgid "DLS"
-msgstr "DLS"
+msgid "Downloads"
+msgstr ""
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
 msgid "Admin"
@@ -957,7 +967,7 @@ msgid "Download"
 msgstr "ダウンロード"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -968,29 +978,33 @@ msgstr "アップロード"
 msgid "Edit"
 msgstr "編集"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
-msgstr "SMTPメールサーバ設定"
+msgid "E-mail Server Settings"
+msgstr ""
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
-msgstr "SMTPホスト名"
+msgid "SMTP Hostname"
+msgstr ""
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
-msgstr "SMTPポート"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
+msgstr ""
 
-#: cps/templates/admin.html:49
-msgid "SSL"
-msgstr "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
+msgstr "暗号化"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
-msgstr "SMTPログイン"
+msgid "SMTP Login"
+msgstr ""
 
-#: cps/templates/admin.html:51
-msgid "From mail"
-msgstr "メールから"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
+msgstr ""
 
 #: cps/templates/admin.html:61
 msgid "Change SMTP settings"
@@ -1001,64 +1015,72 @@ msgid "Configuration"
 msgstr "設定"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
-msgstr "Calibreデータベースのあるフォルダ"
+msgid "Calibre Database Directory"
+msgstr ""
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "ログレベル"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "ポート番号"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
-msgstr "1ページに表示する本の冊数"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
+msgstr ""
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
-msgstr "アップロード機能"
+msgid "Uploads"
+msgstr ""
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
-msgstr "匿名で閲覧"
+msgid "Anonymous Browsing"
+msgstr ""
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
-msgstr "誰でも新規登録可能"
+msgid "Public Registration"
+msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
-msgstr "リモートログイン"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
+msgstr ""
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "管理"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr ""
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
-msgstr "Calibreデータベースに再接続"
+msgid "Reconnect Calibre Database"
+msgstr ""
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
-msgstr "Calibre-Webを再起動"
+msgid "Restart"
+msgstr ""
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
-msgstr "Calibre-Webを停止"
+msgid "Shutdown"
+msgstr ""
 
 #: cps/templates/admin.html:131
 msgid "Update"
@@ -1077,39 +1099,38 @@ msgid "Current version"
 msgstr "現在のバージョン"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
-msgstr "更新を確認"
+msgid "Check for Update"
+msgstr ""
 
 #: cps/templates/admin.html:149
 msgid "Perform Update"
 msgstr "更新を実行"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
-msgstr "Calibre-Webを再起動します。よろしいですか？"
+msgid "Are you sure you want to restart?"
+msgstr ""
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
-msgstr "はい"
+msgid "OK"
+msgstr ""
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "戻る"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
-msgstr "Calibre-Webを停止します。よろしいですか?"
+msgid "Are you sure you want to shutdown?"
+msgstr ""
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
-msgstr "更新中です。ページ再読み込みしないでください"
+msgid "Updating, please do not reload this page"
+msgstr ""
 
 #: cps/templates/author.html:15
 msgid "via"
@@ -1144,7 +1165,8 @@ msgid "Delete formats:"
 msgstr "削除する形式:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "削除"
 
@@ -1187,24 +1209,24 @@ msgid "Tags"
 msgstr "タグ"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "シリーズID"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "評価"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
-msgstr "カバー画像のURL (カバー画像はjpg形式でダウンロードしてデータベースに保存され、ここは再度空欄になります)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr ""
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
-msgstr "カバー画像をローカルからアップロード"
+msgid "Upload Cover from Local Disk"
+msgstr ""
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
-msgstr "発行日"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
+msgstr ""
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
 #: cps/templates/book_edit.html:272 cps/templates/detail.html:156
@@ -1212,7 +1234,8 @@ msgstr "発行日"
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "言語"
 
@@ -1225,34 +1248,33 @@ msgid "No"
 msgstr "いいえ"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
-msgstr "アップロードする形式"
+msgid "Upload Format"
+msgstr ""
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
-msgstr "編集後に本を表示"
+msgid "View Book on Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
-msgstr "メタデータを取得"
+msgid "Fetch Metadata"
+msgstr ""
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "決定"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "よろしいですか?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
-msgstr "この本はCalibreデータベースから削除されます"
+msgid "This book will be permanently erased from database"
+msgstr ""
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr ""
 
 #: cps/templates/book_edit.html:209
@@ -1263,10 +1285,6 @@ msgstr "キーワード"
 msgid " Search keyword "
 msgstr "キーワードを検索"
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "決定"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "カバー画像をクリックしてメタデータをフォームに読み込んでください"
@@ -1275,8 +1293,9 @@ msgstr "カバー画像をクリックしてメタデータをフォームに読
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "閉じる"
 
@@ -1297,8 +1316,8 @@ msgid "Library Configuration"
 msgstr "ライブラリ設定"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
-msgstr "Calibreデータベースの場所"
+msgid "Location of Calibre Database"
+msgstr ""
 
 #: cps/templates/config_edit.html:25
 msgid "Use Google Drive?"
@@ -1349,8 +1368,8 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL鍵ファイルの場所 (非SSLサーバでは空欄にしてください)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
-msgstr "チャンネルを更新"
+msgid "Update Channel"
+msgstr ""
 
 #: cps/templates/config_edit.html:101
 msgid "Stable"
@@ -1372,10 +1391,6 @@ msgstr "最新 (自動)"
 msgid "Logfile Configuration"
 msgstr "ログファイルの設定"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "ログレベル"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "ログファイル名 (空欄の場合はcalibre-web.log)"
@@ -1393,255 +1408,271 @@ msgid "Feature Configuration"
 msgstr "機能設定"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
-msgstr "アップロードを有効にする"
+msgid "Enable Uploads"
+msgstr ""
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
-msgstr "匿名での閲覧を有効にする"
+msgid "Enable Anonymous Browsing"
+msgstr ""
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
-msgstr "誰でも新規登録を可能にする"
+msgid "Enable Public Registration"
+msgstr ""
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
-msgstr "リモートログインを有効する (\"マジックリンク\")"
+msgid "Enable Magic Link Remote Login"
+msgstr ""
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
-msgstr "APIキーを取得"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
+msgstr ""
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "GoodreadsのAPIキー"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "GoodreadsのAPIシークレット"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr ""
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr ""
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr ""
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "外部バイナリ"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
-msgstr "変換ソフトなし"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
+msgstr ""
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Kindlegenを使う"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "calibreのebook converterを使う"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "E-Book converterの設定"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "convertertoolのパス"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Unrarバイナリのパス"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "ログイン"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "表示設定"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "タイトル"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
-msgstr "ランダムで表示する本の冊数"
-
 #: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
-msgstr "非表示にする前に表示する著者の人数 (0の場合は常に表示)"
+msgid "No. of Random Books to Display"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "テーマ"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "通常テーマ"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! ダークテーマ"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
-msgstr "本を非表示にする際の正規表現"
-
 #: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
-msgstr "Calibre上のデータと既読/未読のステータスを紐付ける"
+msgid "Regular Expression for Ignoring Columns"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "タイトルでソートする際の正規表現"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr ""
 
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "成人向けのタグ"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "なし"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
-msgstr "新規ユーザのデフォルト設定"
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
-msgstr "管理者ユーザ"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "ダウンロードを許可"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "アップロードを許可"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "編集を許可"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "本の削除を許可"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "パスワード変更を許可"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "みんなの本棚の編集を許可"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
-msgstr "新規ユーザのデフォルト表示設定"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
-msgstr "詳細画面でランダムで本を表示"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "成人向けコンテンツを表示"
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
-msgstr "ブラウザで読む"
+msgid "Read in Browser"
+msgstr ""
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr ""
 
 #: cps/templates/detail.html:117
@@ -1652,9 +1683,9 @@ msgstr "本"
 msgid "of"
 msgstr "の"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "言語"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1677,20 +1708,8 @@ msgid "Add to shelf"
 msgstr "本棚に追加"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
-msgstr "メタデータを編集"
-
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTPポート (多くの場合plain SMTPは25、SSLは465、STARTTLSは587)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "暗号化"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "なし"
+msgid "Edit Metadata"
+msgstr ""
 
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
@@ -1701,24 +1720,16 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
-msgstr "SMTPパスワード"
-
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "メールから"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "設定を保存"
+msgid "SMTP Password"
+msgstr ""
 
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
-msgstr "設定を保存してテストメールを送信する"
+msgid "Save and Send Test E-mail"
+msgstr ""
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
-msgstr "登録を許可されたドメイン"
+msgid "Allowed Domains (Whitelist)"
+msgstr ""
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
 msgid "Add Domain"
@@ -1733,28 +1744,32 @@ msgid "Enter domainname"
 msgstr "ドメイン名を入力"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
-msgstr "このドメインルールを削除してもよろしいですか？"
+msgid "Are you sure you want to delete this domain?"
+msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "次"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
-msgstr "ホームに戻る"
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "本を見つける (ランダムで表示)"
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr ""
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
+msgstr ""
 
 #: cps/templates/index.html:64
 msgid "Group by series"
@@ -1780,7 +1795,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "最新の本"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "ランダム"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "ランダムで本を表示"
 
@@ -1808,7 +1827,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "みんなの本棚"
 
@@ -1816,7 +1835,7 @@ msgstr "みんなの本棚"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "みんなの本棚に入れた本棚は、他の人からも見えます"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "あなたの本棚"
 
@@ -1828,9 +1847,18 @@ msgstr "ユーザ自身の本棚は、自分にのみ見えます"
 msgid "Home"
 msgstr "ホーム"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "戻る"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
-msgstr "ナビゲーション"
+msgid "Toggle Navigation"
+msgstr ""
+
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
 
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
@@ -1853,70 +1881,65 @@ msgstr "ログアウト"
 msgid "Register"
 msgstr "登録"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "アップロード中..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "ページを更新しないでください"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "本棚を作成"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "本の詳細"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "エラー"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "ユーザ名"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "パスワード"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
-msgstr "記憶する"
+msgid "Remember Me"
+msgstr ""
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
-msgstr "マジックリンクでログイン"
+msgid "Log in with Magic Link"
+msgstr ""
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1924,12 +1947,36 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
-msgstr "Calibre-Web 電子書籍カタログ"
+msgid "Calibre-Web eBook Catalog"
+msgstr ""
 
 #: cps/templates/read.html:74
 msgid "Reflow text when sidebars are open."
@@ -2040,52 +2087,52 @@ msgid "Basic txt Reader"
 msgstr "テキストリーダ"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
-msgstr "新規アカウントを登録する"
+msgid "Register New Account"
+msgstr ""
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "ユーザ名を入力してください"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "メールアドレス"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr ""
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
-msgstr "一度実行すれば、自動的にこの端末でログインします"
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr ""
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "結果なし:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "他の検索を試してくだい"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "結果:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
-msgstr "これ以前の出版日:"
+msgid "Published Date From"
+msgstr ""
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
-msgstr "これ以降の出版日:"
+msgid "Published Date To"
+msgstr ""
 
 #: cps/templates/search_form.html:43
 msgid "Exclude Tags"
@@ -2108,12 +2155,12 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
-msgstr "これ以上の評価:"
+msgid "Rating Above"
+msgstr ""
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
-msgstr "これ未満の評価:"
+msgid "Rating Below"
+msgstr ""
 
 #: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
@@ -2128,24 +2175,24 @@ msgid "Change order"
 msgstr "順番を変更"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
-msgstr "この本棚を削除してもよろしいですか?"
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
-msgstr "この本棚は誰にも見えなくなり、完全に消滅します"
+msgid "Shelf will be deleted for all users"
+msgstr ""
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
-msgstr "この本棚を他の人にも表示しますか？"
+msgid "Share with Everyone"
+msgstr ""
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
-msgstr "ドラッグ＆ドロップで並び替える"
+msgid "Drag to Rearrange Order"
+msgstr ""
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
-msgstr "Calibreライブラリの統計"
+msgid "Library Statistics"
+msgstr ""
 
 #: cps/templates/stats.html:12
 msgid "Books in this Library"
@@ -2164,21 +2211,17 @@ msgid "Series in this Library"
 msgstr "このライブラリ内のシリーズ"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
-msgstr "紐付けられたライブラリ"
+msgid "Linked Libraries"
+msgstr ""
 
 #: cps/templates/stats.html:32
-msgid "Program library"
-msgstr "プログラムのライブラリ"
+msgid "Program Library"
+msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "インストールされたバージョン"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "タスク一覧"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "ユーザ"
@@ -2196,12 +2239,12 @@ msgid "Progress"
 msgstr "進捗"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
-msgstr "実行時間"
+msgid "Run Time"
+msgstr ""
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
-msgstr "開始時間"
+msgid "Start Time"
+msgstr ""
 
 #: cps/templates/tasks.html:24
 msgid "Delete finished tasks"
@@ -2215,17 +2258,13 @@ msgstr "すべてのタスクを非表示にする"
 msgid "Reset user Password"
 msgstr "ユーザパスワードをリセット"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Kindleのメールアドレス"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
-msgstr "この言語で本を表示"
+msgid "Language of Books"
+msgstr ""
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
-msgstr "全て表示"
+msgid "Show All"
+msgstr ""
 
 #: cps/templates/user_edit.html:52
 msgid "OAuth Settings"
@@ -2239,14 +2278,38 @@ msgstr ""
 msgid "Unlink"
 msgstr ""
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
-msgstr "このユーザを削除"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
+msgstr ""
+
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "最近のダウンロード"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Failed to create path for cover %(path)s (Permission denied)."
 #~ msgstr ""
 
@@ -2418,3 +2481,393 @@ msgstr "最近のダウンロード"
 #~ msgid "Show access log"
 #~ msgstr ""
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "成人向けのタグ"
+
+#~ msgid "Show mature content"
+#~ msgstr "成人向けコンテンツを表示"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Show hot books"
+#~ msgstr "人気な本を表示"
+
+#~ msgid "Best rated Books"
+#~ msgstr "高評価の本"
+
+#~ msgid "Show best rated books"
+#~ msgstr "評価が高い本を表示"
+
+#~ msgid "Best rated books"
+#~ msgstr "高評価"
+
+#~ msgid "Hot Books (most downloaded)"
+#~ msgstr "話題(ダウンロード数順)"
+
+#~ msgid "Publisher list"
+#~ msgstr "出版社一覧"
+
+#~ msgid "Series list"
+#~ msgstr "シリーズ一覧"
+
+#~ msgid "Available languages"
+#~ msgstr "言語"
+
+#~ msgid "Category list"
+#~ msgstr "カテゴリ一覧"
+
+#~ msgid "User list"
+#~ msgstr "ユーザ一覧"
+
+#~ msgid "Nickname"
+#~ msgstr "ニックネーム"
+
+#~ msgid "E-mail"
+#~ msgstr "メールアドレス"
+
+#~ msgid "Kindle"
+#~ msgstr "Kindle"
+
+#~ msgid "DLS"
+#~ msgstr "DLS"
+
+#~ msgid "View Ebooks"
+#~ msgstr ""
+
+#~ msgid "SMTP e-mail server settings"
+#~ msgstr "SMTPメールサーバ設定"
+
+#~ msgid "SMTP hostname"
+#~ msgstr "SMTPホスト名"
+
+#~ msgid "SMTP port"
+#~ msgstr "SMTPポート"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "SMTP login"
+#~ msgstr "SMTPログイン"
+
+#~ msgid "From mail"
+#~ msgstr "メールから"
+
+#~ msgid "Calibre DB dir"
+#~ msgstr "Calibreデータベースのあるフォルダ"
+
+#~ msgid "Log level"
+#~ msgstr "ログレベル"
+
+#~ msgid "Books per page"
+#~ msgstr "1ページに表示する本の冊数"
+
+#~ msgid "Uploading"
+#~ msgstr "アップロード機能"
+
+#~ msgid "Anonymous browsing"
+#~ msgstr "匿名で閲覧"
+
+#~ msgid "Public registration"
+#~ msgstr "誰でも新規登録可能"
+
+#~ msgid "Remote login"
+#~ msgstr "リモートログイン"
+
+#~ msgid "Reverse proxy login"
+#~ msgstr ""
+
+#~ msgid "View Logfiles"
+#~ msgstr ""
+
+#~ msgid "Reconnect to Calibre DB"
+#~ msgstr "Calibreデータベースに再接続"
+
+#~ msgid "Restart Calibre-Web"
+#~ msgstr "Calibre-Webを再起動"
+
+#~ msgid "Stop Calibre-Web"
+#~ msgstr "Calibre-Webを停止"
+
+#~ msgid "Check for update"
+#~ msgstr "更新を確認"
+
+#~ msgid "Do you really want to restart Calibre-Web?"
+#~ msgstr "Calibre-Webを再起動します。よろしいですか？"
+
+#~ msgid "Ok"
+#~ msgstr "はい"
+
+#~ msgid "Do you really want to stop Calibre-Web?"
+#~ msgstr "Calibre-Webを停止します。よろしいですか?"
+
+#~ msgid "Updating, please do not reload page"
+#~ msgstr "更新中です。ページ再読み込みしないでください"
+
+#~ msgid "Series id"
+#~ msgstr "シリーズID"
+
+#~ msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+#~ msgstr "カバー画像のURL (カバー画像はjpg形式でダウンロードしてデータベースに保存され、ここは再度空欄になります)"
+
+#~ msgid "Upload Cover from local drive"
+#~ msgstr "カバー画像をローカルからアップロード"
+
+#~ msgid "Publishing date"
+#~ msgstr "発行日"
+
+#~ msgid "Upload format"
+#~ msgstr "アップロードする形式"
+
+#~ msgid "view book after edit"
+#~ msgstr "編集後に本を表示"
+
+#~ msgid "Get metadata"
+#~ msgstr "メタデータを取得"
+
+#~ msgid "Submit"
+#~ msgstr "決定"
+
+#~ msgid "Book will be deleted from Calibre database"
+#~ msgstr "この本はCalibreデータベースから削除されます"
+
+#~ msgid "and from hard disk"
+#~ msgstr ""
+
+#~ msgid "Go!"
+#~ msgstr "決定"
+
+#~ msgid "Location of Calibre database"
+#~ msgstr "Calibreデータベースの場所"
+
+#~ msgid "Update channel"
+#~ msgstr "チャンネルを更新"
+
+#~ msgid "Enable uploading"
+#~ msgstr "アップロードを有効にする"
+
+#~ msgid "Enable anonymous browsing"
+#~ msgstr "匿名での閲覧を有効にする"
+
+#~ msgid "Enable public registration"
+#~ msgstr "誰でも新規登録を可能にする"
+
+#~ msgid "Enable remote login (\"magic link\")"
+#~ msgstr "リモートログインを有効する (\"マジックリンク\")"
+
+#~ msgid "Obtain an API Key"
+#~ msgstr "APIキーを取得"
+
+#~ msgid "Use standard Authentication"
+#~ msgstr ""
+
+#~ msgid "LDAP schema (ldap or ldaps)"
+#~ msgstr ""
+
+#~ msgid "LDAP Admin username"
+#~ msgstr ""
+
+#~ msgid "LDAP Admin password"
+#~ msgstr ""
+
+#~ msgid "LDAP Server use SSL"
+#~ msgstr ""
+
+#~ msgid "LDAP Server use TLS"
+#~ msgstr ""
+
+#~ msgid "LDAP User object filter"
+#~ msgstr ""
+
+#~ msgid "No converter"
+#~ msgstr "変換ソフトなし"
+
+#~ msgid "No. of random books to show"
+#~ msgstr "ランダムで表示する本の冊数"
+
+#~ msgid "No. of authors to show before hiding (0=disable hiding)"
+#~ msgstr "非表示にする前に表示する著者の人数 (0の場合は常に表示)"
+
+#~ msgid "Regular expression for ignoring columns"
+#~ msgstr "本を非表示にする際の正規表現"
+
+#~ msgid "Link read/unread status to Calibre column"
+#~ msgstr "Calibre上のデータと既読/未読のステータスを紐付ける"
+
+#~ msgid "View restriction based on Calibre column"
+#~ msgstr ""
+
+#~ msgid "Regular expression for title sorting"
+#~ msgstr "タイトルでソートする際の正規表現"
+
+#~ msgid "Default settings for new users"
+#~ msgstr "新規ユーザのデフォルト設定"
+
+#~ msgid "Admin user"
+#~ msgstr "管理者ユーザ"
+
+#~ msgid "Allow book viewer"
+#~ msgstr ""
+
+#~ msgid "Allow Delete books"
+#~ msgstr "本の削除を許可"
+
+#~ msgid "Default visibilities for new users"
+#~ msgstr "新規ユーザのデフォルト表示設定"
+
+#~ msgid "Show random books in detail view"
+#~ msgstr "詳細画面でランダムで本を表示"
+
+#~ msgid "Read in browser"
+#~ msgstr "ブラウザで読む"
+
+#~ msgid "Listen in browser"
+#~ msgstr ""
+
+#~ msgid "language"
+#~ msgstr "言語"
+
+#~ msgid "Edit metadata"
+#~ msgstr "メタデータを編集"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTPポート (多くの場合plain SMTPは25、SSLは465、STARTTLSは587)"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTPパスワード"
+
+#~ msgid "From e-mail"
+#~ msgstr "メールから"
+
+#~ msgid "Save settings"
+#~ msgstr "設定を保存"
+
+#~ msgid "Save settings and send Test E-Mail"
+#~ msgstr "設定を保存してテストメールを送信する"
+
+#~ msgid "Allowed domains for registering"
+#~ msgstr "登録を許可されたドメイン"
+
+#~ msgid "Denied domains for registering"
+#~ msgstr ""
+
+#~ msgid "Do you really want to delete this domain rule?"
+#~ msgstr "このドメインルールを削除してもよろしいですか？"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "Create issue"
+#~ msgstr ""
+
+#~ msgid "Back to home"
+#~ msgstr "ホームに戻る"
+
+#~ msgid "Toggle navigation"
+#~ msgstr "ナビゲーション"
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "ページを更新しないでください"
+
+#~ msgid "Remember me"
+#~ msgstr "記憶する"
+
+#~ msgid "Forgot password"
+#~ msgstr ""
+
+#~ msgid "Log in with magic link"
+#~ msgstr "マジックリンクでログイン"
+
+#~ msgid "Show Calibre-Web log: "
+#~ msgstr ""
+
+#~ msgid "Calibre-Web log: "
+#~ msgstr ""
+
+#~ msgid "Show access log: "
+#~ msgstr ""
+
+#~ msgid "Calibre-Web ebook catalog"
+#~ msgstr "Calibre-Web 電子書籍カタログ"
+
+#~ msgid "Register a new account"
+#~ msgstr "新規アカウントを登録する"
+
+#~ msgid "E-mail address"
+#~ msgstr "メールアドレス"
+
+#~ msgid "Use your other device, login and visit "
+#~ msgstr ""
+
+#~ msgid "Once you do so, you will automatically get logged in on this device."
+#~ msgstr "一度実行すれば、自動的にこの端末でログインします"
+
+#~ msgid "The link will expire after 10 minutes."
+#~ msgstr ""
+
+#~ msgid "No Results for:"
+#~ msgstr "結果なし:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "他の検索を試してくだい"
+
+#~ msgid "Publishing date from"
+#~ msgstr "これ以前の出版日:"
+
+#~ msgid "Publishing date to"
+#~ msgstr "これ以降の出版日:"
+
+#~ msgid "Rating bigger than"
+#~ msgstr "これ以上の評価:"
+
+#~ msgid "Rating less than"
+#~ msgstr "これ未満の評価:"
+
+#~ msgid "Do you really want to delete the shelf?"
+#~ msgstr "この本棚を削除してもよろしいですか?"
+
+#~ msgid "Shelf will be lost for everybody and forever!"
+#~ msgstr "この本棚は誰にも見えなくなり、完全に消滅します"
+
+#~ msgid "should the shelf be public?"
+#~ msgstr "この本棚を他の人にも表示しますか？"
+
+#~ msgid "Drag 'n drop to rearrange order"
+#~ msgstr "ドラッグ＆ドロップで並び替える"
+
+#~ msgid "Calibre library statistics"
+#~ msgstr "Calibreライブラリの統計"
+
+#~ msgid "Linked libraries"
+#~ msgstr "紐付けられたライブラリ"
+
+#~ msgid "Program library"
+#~ msgstr "プログラムのライブラリ"
+
+#~ msgid "Tasks list"
+#~ msgstr "タスク一覧"
+
+#~ msgid "Runtime"
+#~ msgstr "実行時間"
+
+#~ msgid "Starttime"
+#~ msgstr "開始時間"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Kindleのメールアドレス"
+
+#~ msgid "Show books with language"
+#~ msgstr "この言語で本を表示"
+
+#~ msgid "Show all"
+#~ msgstr "全て表示"
+
+#~ msgid "Delete this user"
+#~ msgstr "このユーザを削除"
+
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index f851cb0a..9e0e17e7 100644
Binary files a/cps/translations/km/LC_MESSAGES/messages.mo and b/cps/translations/km/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index fa6e2954..40e96466 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -27,177 +27,186 @@ msgstr ""
 msgid "not installed"
 msgstr "មិនបានតម្លើង"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr ""
 
@@ -390,42 +399,50 @@ msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr ""
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr ""
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr ""
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr ""
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -554,16 +571,20 @@ msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្ត
 msgid "Edit a shelf"
 msgstr "កែប្រែធ្នើ"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
@@ -581,19 +602,19 @@ msgid "Hot Books"
 msgstr "សៀវភៅដែលមានប្រជាប្រិយភាព"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "បង្ហាញសៀវភៅដែលមានប្រជាប្រិយភាព"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -602,7 +623,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -618,7 +639,7 @@ msgstr "ស្រាវជ្រាវ"
 msgid "Show random books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -627,7 +648,7 @@ msgid "Show category selection"
 msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -643,7 +664,7 @@ msgstr "អ្នកនិពន្ធ"
 msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr ""
 
@@ -652,6 +673,7 @@ msgid "Show publisher selection"
 msgstr ""
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -704,216 +726,201 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "សៀវភៅដែលទើបបានបន្ថែម"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "សៀវភៅដែលត្រូវបានវាយតម្លៃល្អជាងគេ"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "សៀវភៅចៃដន្យ"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ មិនមានឯកសារនេះ ឬមិនអាចបើកបាន៖"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr ""
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "បញ្ជីស៊េរី"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "ភាសាដែលមាន"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "បញ្ជីប្រភេទ"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "ស្វែងរក"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "ចូលប្រើ"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "រកមិនឃើញវត្ថុតាង"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "វត្ថុតាងហួសពេលកំណត់"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ មិនមានឯកសារនេះ ឬមិនអាចបើកបាន៖"
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -928,23 +935,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen បានបរាជ័យដោយមានកំហុស %(error)s. សារ៖ %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "បញ្ជីអ្នកប្រើប្រាស់"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "ឈ្មោះហៅក្រៅ"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "ឧបករណ៍ Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "ឯកសារ DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -958,7 +968,7 @@ msgid "Download"
 msgstr "ទាញយក"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -969,28 +979,32 @@ msgstr "អាប់ឡូដ"
 msgid "Edit"
 msgstr "កែប្រែ"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr ""
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "ឈ្មោះម៉ាស៊ីន SMTP"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "លេខ port SMTP"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "អ្នកចូលប្រើ SMTP"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "ពីអ៊ីមែល"
 
 #: cps/templates/admin.html:61
@@ -1002,63 +1016,71 @@ msgid "Configuration"
 msgstr "ការកំណត់"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "ទីតាំង database Calibre"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr ""
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "លេខ port"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "ចំនួនសៀវភៅក្នុងមួយទំព័រ"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "កំពុងអាប់ឡូដ"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr ""
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "ការចុះឈ្មាះសាធារណៈ"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "ការចូលប្រើប្រាស់ពីចម្ងាយ"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "កិច្ចការរដ្ឋបាល"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr ""
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "ភ្ជាប់ទៅ database Calibre ម្តងទៀត"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr ""
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr ""
 
 #: cps/templates/admin.html:131
@@ -1078,7 +1100,7 @@ msgid "Current version"
 msgstr ""
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "រកមើលបច្ចុប្បន្នភាព"
 
 #: cps/templates/admin.html:149
@@ -1086,30 +1108,29 @@ msgid "Perform Update"
 msgstr "ធ្វើបច្ចុប្បន្នភាព"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "បាទ/ចាស"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "មកក្រោយ"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr ""
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "កំពុងធ្វើបច្ចុប្បន្នភាព សូមកុំបើកទំព័រជាថ្មី"
 
 #: cps/templates/author.html:15
@@ -1145,7 +1166,8 @@ msgid "Delete formats:"
 msgstr "លុបឯកសារទម្រង់៖"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "លុប"
 
@@ -1188,7 +1210,7 @@ msgid "Tags"
 msgstr "Tag"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
+msgid "Series ID"
 msgstr "លេខសម្គាល់ស៊េរី"
 
 #: cps/templates/book_edit.html:77
@@ -1196,15 +1218,15 @@ msgid "Rating"
 msgstr "ការវាយតម្លៃ"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "ថ្ងៃបោះពុម្ភ"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1213,7 +1235,8 @@ msgstr "ថ្ងៃបោះពុម្ភ"
 msgid "Publisher"
 msgstr "អ្នកបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "ភាសា"
 
@@ -1226,34 +1249,33 @@ msgid "No"
 msgstr "ទេ"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "ទម្រង់អាប់ឡូដ"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "បញ្ចូល"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr ""
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "និងពីថាសរឹង"
 
 #: cps/templates/book_edit.html:209
@@ -1264,10 +1286,6 @@ msgstr "ពាក្យគន្លឹះ"
 msgid " Search keyword "
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "ទៅ!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
@@ -1276,8 +1294,9 @@ msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិ
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "បិទ"
 
@@ -1298,7 +1317,7 @@ msgid "Library Configuration"
 msgstr "ការកំណត់បណ្ណាល័យ"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "ទីតាំង database របស់ Calibre"
 
 #: cps/templates/config_edit.html:25
@@ -1350,7 +1369,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "ទីតាំង SSL keyfile (ទុកទទេសម្រាប់ម៉ាស៊ីន server ដែលមិនប្រើ SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr ""
 
 #: cps/templates/config_edit.html:101
@@ -1373,10 +1392,6 @@ msgstr ""
 msgid "Logfile Configuration"
 msgstr "ការកំណត់ logfile"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "កម្រិត log"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "ទីតាំង និងឈ្មោះ logfile (calibre-web.log ប្រសិនបើទទេ)"
@@ -1394,255 +1409,271 @@ msgid "Feature Configuration"
 msgstr "ការកំណត់មុខងារ"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
-msgstr "អនុញ្ញាតការអាប់ឡូត"
+msgid "Enable Uploads"
+msgstr ""
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "អនុញ្ញាតការរុករកដោយអនាមិក"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "អនុញ្ញាតការចុះឈ្មោះសាធារណៈ"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "អនុញ្ញាតការ login ពីចម្ងាយ (ឬ “magic link”)"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "ទាញយក API key"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Goodreads API key"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API secret"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr ""
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr ""
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr ""
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "គ្មានកម្មវិធីបម្លែង"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "ប្រើ Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "ប្រើកម្មវិធីបម្លែង eBook របស់ Calibre"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "ការកំណត់របស់កម្មវិធីបម្លែង eBook"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "ទីតាំងរបស់កម្មវិធីបម្លែង"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "មើលការកំណត់"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "ចំណងជើង"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "ចំនួនសៀវភៅចៃដន្យដើម្បីបង្ហាញ"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "ការតុបតែង"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "ការតុបតែងសម្រាប់ប្រើ"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "ការតុបតែងពណ៌ងងឹត caliBlur!"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Regular expression សម្រាប់រំលងជួរឈរ"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "ភ្ជាប់ស្ថានភាពបានអាន/មិនទាន់បានអានទៅជួរឈររបស់ Calibre"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Regular expression ដើម្បីរៀបចំណងជើងតាមលំដាប់"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Tag សម្រាប់មាតិកាសម្រាប់មនុស្សពេញវ័យ"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "គ្មាន"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Regular expression ដើម្បីរៀបចំណងជើងតាមលំដាប់"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "ការកំណត់មកស្រាប់សម្រាប់អ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "អនុញ្ញាតឲទាញយក"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "អនុញ្ញាតឲអាប់ឡូត"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "អនុញ្ញាតឲកែប្រែ"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
 msgstr "អនុញ្ញាតឲលុបសៀវភៅ"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "អនុញ្ញាតឲប្តូរលេខសម្ងាត់"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "អនុញ្ញាតឲកែប្រែធ្នើសាធារណៈ"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "ភាពមើលឃើញដែលមកស្រាប់សម្រាប់អ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "បង្ហាញសៀវភៅចៃដន្យក្នុងការបង្ហាញជាពិស្តារ"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "បង្ហាញមាតិកាសម្រាប់មនុស្សពេញវ័យ"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "អានក្នុងកម្មវិធី browser"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr ""
 
 #: cps/templates/detail.html:117
@@ -1653,9 +1684,9 @@ msgstr "សៀវភៅ"
 msgid "of"
 msgstr "នៃ"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "ភាសា"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1678,21 +1709,9 @@ msgid "Add to shelf"
 msgstr "បន្ថែមទៅធ្នើ"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "លេខ port SMTP (ជាធម្មតាលេខ 25 សម្រាប់ SMTP ធម្មតា ឬ 465 សម្រាប់ SSL ឬ 587 សម្រាប់ STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "ការអ៊ិនគ្រីប"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "គ្មាន"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1702,23 +1721,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "លេខសម្ងាត់ SMTP"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "ពីអ៊ីមែល"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "រក្សាទុកការកំណត់"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "រក្សាទុកការកំណត់រួចផ្ញើអ៊ីមែលសាកល្បង"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1734,28 +1745,32 @@ msgid "Enter domainname"
 msgstr ""
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "បន្ទាប់"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
 msgstr ""
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr ""
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
+msgstr ""
 
 #: cps/templates/index.html:64
 msgid "Group by series"
@@ -1781,7 +1796,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "សៀវភៅចុងក្រោយគេ"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "សៀវភៅចៃដន្យ"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
@@ -1809,7 +1828,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "ធ្នើសាធារណៈ"
 
@@ -1817,7 +1836,7 @@ msgstr "ធ្នើសាធារណៈ"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "សៀវភៅដែលរៀបចំនៅក្នុងធ្នើសាធារណៈ អាចមើលឃើញដោយគ្រប់គ្នា"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "ធ្នើរបស់អ្នក"
 
@@ -1829,10 +1848,19 @@ msgstr "ធ្នើផ្ទាល់ខ្លួនរបស់អ្នកប
 msgid "Home"
 msgstr ""
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "មកក្រោយ"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "បិទ/បើកការរុករក"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
@@ -1854,70 +1882,65 @@ msgstr "ចេញពីការប្រើប្រាស់"
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "សូមកុំបើកទំព័រជាថ្មី"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr ""
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "ឈ្មោះអ្នកប្រើប្រាស់"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "លេខសម្ងាត់"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "ចងចាំខ្ញុំ"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "ចូលប្រើប្រាស់ដោយ magic link"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1925,11 +1948,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr ""
 
 #: cps/templates/read.html:74
@@ -2041,51 +2088,51 @@ msgid "Basic txt Reader"
 msgstr "កម្មវិធីមើល txt សាមញ្ញ"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "ចុះឈ្មោះបង្កើតគណនីថ្មី"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "ជ្រើសរើសឈ្មោះអ្នកប្រើប្រាស់"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr ""
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "អាសយដ្ឋានអ៊ីមែលរបស់អ្នក"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr ""
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "ក្រោយពីនេះ អ្នកនឹងត្រូវបានឲចូលប្រើប្រាស់ក្នុងឧបករណ៍នេះដោយស្វ័យប្រវត្តិ។"
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "គ្មានលទ្ធផលសម្រាប់៖"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "សូមសាកល្បងស្វែងរកផ្សេងទៀត"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "លទ្ធផលសម្រាប់៖"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "ថ្ងៃបោះពុម្ភចាប់ពី"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "ថ្ងៃបោះពុម្ភរហូតដល់"
 
 #: cps/templates/search_form.html:43
@@ -2109,11 +2156,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "ការវាយតម្លៃលើសពី"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "ការវាយតម្លៃតិចជាង"
 
 #: cps/templates/shelf.html:10
@@ -2129,23 +2176,23 @@ msgid "Change order"
 msgstr "ប្តូរលំដាប់"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "ធ្នើនេះនឹងបាត់បង់ជាអចិន្ត្រៃយ៍សម្រាប់គ្រប់គ្នា!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "តើធ្នើនេះគួរជាសាធារណៈទេ?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "ទាញដើម្បីប្តូរលំដាប់"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "ស្ថិតិបណ្ណាល័យ Calibre"
 
 #: cps/templates/stats.html:12
@@ -2165,21 +2212,17 @@ msgid "Series in this Library"
 msgstr "ស៊េរីនានាក្នុងបណ្ណាល័យនេះ"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "បណ្ណាល័យដែលមានទំនាក់ទំនង"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Library របស់កម្មវិធី"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "លេខ version ដែលបានតម្លើង"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "បញ្ជីការងារ"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "អ្នកប្រើប្រាស់"
@@ -2197,11 +2240,11 @@ msgid "Progress"
 msgstr "ដំណើរការ"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "រយៈពេលដែលបានចាប់ផ្តើម"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "ពេលចាប់ផ្តើម"
 
 #: cps/templates/tasks.html:24
@@ -2216,16 +2259,12 @@ msgstr "លាក់ការងារទាំងអស់"
 msgid "Reset user Password"
 msgstr ""
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "អ៊ីមែល Kindle"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "បង្ហាញសៀវភៅដែលមានភាសា"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "បង្ហាញទាំងអស់"
 
 #: cps/templates/user_edit.html:52
@@ -2240,263 +2279,104 @@ msgstr ""
 msgid "Unlink"
 msgstr ""
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
-msgstr "លុបអ្នកប្រើប្រាស់នេះ"
-
-#: cps/templates/user_edit.html:138
-msgid "Recent Downloads"
-msgstr "ការទាញយកថ្មីៗ"
-
-#~ msgid "%s: %s"
-#~ msgstr "%s៖ %s"
-
-#~ msgid "E-Mail: %(book)s"
-#~ msgstr "អ៊ីមែល៖ %(book)s"
-
-#~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-#~ msgstr "ប្តូរចំណងជើងពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
-
-#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-#~ msgstr "ប្តូរអ្នកនិពន្ធពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
-
-#~ msgid "Password for user %(user)s reset"
-#~ msgstr ""
-
-#~ msgid "Password for user %s reset"
-#~ msgstr ""
-
-#~ msgid "Rename title from: '%(src)s' to '%(src)s' failed with error: %(error)s"
-#~ msgstr ""
-
-#~ msgid "Rename author from: '%(src)s' to '%(src)s' failed with error: %(error)s"
-#~ msgstr ""
-
-#~ msgid "Failed to create path for cover %(cover)s (Permission denied)."
-#~ msgstr ""
-
-#~ msgid "File extension '%s' is not allowed to be uploaded to this server"
-#~ msgstr ""
-
-#~ msgid "File extension \"%(ext)s\" is not allowed to be uploaded to this server"
-#~ msgstr "ឯកសារប្រភេទ “%(ext)s” មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
-
-#~ msgid "Current commit timestamp"
-#~ msgstr "Commit timestamp បច្ចុប្បន្ន"
-
-#~ msgid "Newest commit timestamp"
-#~ msgstr "Commit timestamp ចុងក្រោយគេ"
-
-#~ msgid "Convert: %(book)s"
-#~ msgstr "បម្លែង៖ %(book)s"
-
-#~ msgid "Convert to %(format)s: %(book)s"
-#~ msgstr ""
-
-#~ msgid "Files are replaced"
-#~ msgstr "ឯកសារត្រូវបានផ្លាស់ប្តូរ"
-
-#~ msgid "Server is stopped"
-#~ msgstr "ម៉ាស៊ីន server ត្រូវបានបញ្ឈប់"
-
-#~ msgid "Convertertool %(converter)s not found"
-#~ msgstr "មិនអាចរកឃើញកម្មវិធីបម្លែង %(converter)s"
-
-#~ msgid "Choose a password"
-#~ msgstr "ជ្រើសរើសលេខសម្ងាត់"
-
-#~ msgid "Could not find any formats suitable for sending by e-mail"
-#~ msgstr ""
-
-#~ msgid "Author list"
-#~ msgstr "បញ្ជីអ្នកនិពន្ធ"
-
-#~ msgid "File %(file)s uploaded"
-#~ msgstr "ឯកសារ %(file)s ត្រូវបានអាប់ឡូដ"
-
-#~ msgid "Update done"
-#~ msgstr "ការធ្វើបច្ចុប្បន្នភាពរួចរាល់"
-
-#~ msgid "Stable (Automatic))"
-#~ msgstr ""
-
-#~ msgid "Nightly (Automatic))"
-#~ msgstr ""
-
-#~ msgid "A new update is available. Click on the button below to update to version: "
-#~ msgstr ""
-
-#~ msgid "A new update is available. Click on the button below to update to version:  %(version)s"
-#~ msgstr ""
-
-#~ msgid "Failed to create path for cover %(path)s (Permission denied)."
-#~ msgstr ""
-
-#~ msgid "Failed to store cover-file %(cover)s."
-#~ msgstr ""
-
-#~ msgid "Cover-file is not a valid image file"
-#~ msgstr ""
-
-#~ msgid "Cover is not a jpg file, can't save"
-#~ msgstr "គម្របមិនមែនជាឯកសារ JPG មិនអាចរក្សាទុក"
-
-#~ msgid "Preparing document for printing..."
-#~ msgstr ""
-
-#~ msgid "Using your another device, visit"
-#~ msgstr "ដោយប្រើប្រាស់ឧបករណ៍ផ្សេងទៀតរបស់អ្នក សូមចូលទៅ"
-
-#~ msgid "and log in"
-#~ msgstr "រួចចូលប្រើប្រាស់"
-
-#~ msgid "Using your another device, login and visit "
-#~ msgstr ""
-
-#~ msgid "Newest Books"
-#~ msgstr "សៀវភៅថ្មីៗជាងគេ"
-
-#~ msgid "Oldest Books"
-#~ msgstr "សៀវភៅចាស់ជាងគេ"
-
-#~ msgid "Books (A-Z)"
-#~ msgstr "សៀវភៅពី A ទៅ Z"
-
-#~ msgid "Books (Z-A)"
-#~ msgstr "សៀវភៅពី Z ទៅ A"
-
-#~ msgid "Error opening eBook. Fileformat is not supported."
-#~ msgstr ""
-
-#~ msgid "File %(title)s"
-#~ msgstr ""
-
-#~ msgid "Show sorted books"
-#~ msgstr "បង្ហាញសៀវភៅដែលរៀបតាមលំដាប់"
-
-#~ msgid "Sorted Books"
-#~ msgstr "សៀវភៅរៀបតាមលំដាប់"
-
-#~ msgid "Sort By"
-#~ msgstr "រៀបតាម"
-
-#~ msgid "Newest"
-#~ msgstr "ថ្មីជាងគេ"
-
-#~ msgid "Oldest"
-#~ msgstr "ចាស់ជាងគេ"
-
-#~ msgid "Ascending"
-#~ msgstr "ពីតូចទៅធំ"
-
-#~ msgid "Descending"
-#~ msgstr "ពីធំទៅតូច"
-
-#~ msgid "PDF.js viewer"
-#~ msgstr "កម្មវិធីមើល PDF.js"
-
-#~ msgid "Please enter a LDAP provider and a DN"
-#~ msgstr ""
-
-#~ msgid "successfully deleted shelf %(name)s"
-#~ msgstr "បានបង្កើតធ្នើឈ្មោះ %(name)s ដោយជោគជ័យ"
-
-#~ msgid "LDAP Provider URL"
-#~ msgstr ""
-
-#~ msgid "Register with %s, "
-#~ msgstr ""
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
 
-#~ msgid "Import of optional Google Drive requirements missing"
-#~ msgstr "ខ្វះការនាំចូលតម្រូវការបន្ថែមរបស់ Google Drive"
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
 
-#~ msgid "client_secrets.json is missing or not readable"
-#~ msgstr "មិនមានឯកសារ client_secrets.json ឬមិនអាចបើកបាន"
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
 
-#~ msgid "client_secrets.json is not configured for web application"
-#~ msgstr "ឯកសារ client_secrets.json មិនទាន់បានកំណត់សម្រាប់កម្មវិធីវែប"
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
 
-#~ msgid "Keyfile location is not valid, please enter correct path"
-#~ msgstr "ទីតាំងរបស់ keyfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
+msgstr "លុបអ្នកប្រើប្រាស់នេះ"
 
-#~ msgid "Certfile location is not valid, please enter correct path"
-#~ msgstr "ទីតាំងរបស់ certfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
+#: cps/templates/user_edit.html:144
+msgid "Recent Downloads"
+msgstr "ការទាញយកថ្មីៗ"
 
-#~ msgid "Please enter a LDAP provider, port, DN and user object identifier"
-#~ msgstr ""
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
 
-#~ msgid "Please enter a LDAP service account and password"
-#~ msgstr ""
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
 
-#~ msgid "Please enter Github oauth credentials"
+#~ msgid "deny"
 #~ msgstr ""
 
-#~ msgid "Please enter Google oauth credentials"
+#~ msgid "allow"
 #~ msgstr ""
 
-#~ msgid "Logfile location is not valid, please enter correct path"
-#~ msgstr "ទីតាំងរបស់ logfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
+#~ msgid "Best rated books"
+#~ msgstr "សៀវភៅដែលត្រូវបានវាយតម្លៃល្អជាងគេ"
 
-#~ msgid "Access Logfile location is not valid, please enter correct path"
+#~ msgid "Publisher list"
 #~ msgstr ""
 
-#~ msgid "DB location is not valid, please enter correct path"
-#~ msgstr "ទីតាំងរបស់ database មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
+#~ msgid "Series list"
+#~ msgstr "បញ្ជីស៊េរី"
 
-#~ msgid "Excecution permissions missing"
-#~ msgstr "ខ្វះសិទ្ធិប្រតិបត្តិការ"
+#~ msgid "Available languages"
+#~ msgstr "ភាសាដែលមាន"
 
-#~ msgid "not configured"
-#~ msgstr ""
+#~ msgid "Category list"
+#~ msgstr "បញ្ជីប្រភេទ"
 
-#~ msgid "Error excecuting UnRar"
+#~ msgid "E-mail"
 #~ msgstr ""
 
-#~ msgid "Unrar binary file not found"
-#~ msgstr ""
+#~ msgid "Submit"
+#~ msgstr "បញ្ចូល"
 
-#~ msgid "Use GitHub OAuth"
-#~ msgstr ""
+#~ msgid "Go!"
+#~ msgstr "ទៅ!"
 
-#~ msgid "Use Google OAuth"
-#~ msgstr ""
+#~ msgid "Enable uploading"
+#~ msgstr "អនុញ្ញាតការអាប់ឡូត"
 
-#~ msgid "Obtain GitHub OAuth Credential"
+#~ msgid "View restriction based on Calibre column"
 #~ msgstr ""
 
-#~ msgid "GitHub OAuth Client Id"
-#~ msgstr ""
+#~ msgid "language"
+#~ msgstr "ភាសា"
 
-#~ msgid "GitHub OAuth Client Secret"
-#~ msgstr ""
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "លេខ port SMTP (ជាធម្មតាលេខ 25 សម្រាប់ SMTP ធម្មតា ឬ 465 សម្រាប់ SSL ឬ 587 សម្រាប់ STARTTLS)"
 
-#~ msgid "Obtain Google OAuth Credential"
-#~ msgstr ""
+#~ msgid "From e-mail"
+#~ msgstr "ពីអ៊ីមែល"
 
-#~ msgid "Google OAuth Client Id"
-#~ msgstr ""
+#~ msgid "Save settings"
+#~ msgstr "រក្សាទុកការកំណត់"
 
-#~ msgid "Google OAuth Client Secret"
+#~ msgid "api_endpoint="
 #~ msgstr ""
 
-#~ msgid "Use"
-#~ msgstr "ប្រើប្រាស់"
+#~ msgid "please don't refresh the page"
+#~ msgstr "សូមកុំបើកទំព័រជាថ្មី"
 
-#~ msgid "Play / pause"
+#~ msgid "E-mail address"
 #~ msgstr ""
 
-#~ msgid "volume"
-#~ msgstr ""
+#~ msgid "No Results for:"
+#~ msgstr "គ្មានលទ្ធផលសម្រាប់៖"
 
-#~ msgid "unknown"
-#~ msgstr "មិនដឹង"
+#~ msgid "Please try a different search"
+#~ msgstr "សូមសាកល្បងស្វែងរកផ្សេងទៀត"
 
-#~ msgid "New Books"
-#~ msgstr "សៀវភៅថ្មីៗ"
+#~ msgid "Tasks list"
+#~ msgstr "បញ្ជីការងារ"
 
-#~ msgid "Show Calibre-Web log"
-#~ msgstr ""
-
-#~ msgid "Show access log"
-#~ msgstr ""
+#~ msgid "Kindle E-Mail"
+#~ msgstr "អ៊ីមែល Kindle"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 3e749329..c5f05c0d 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 b4776ba7..25531bd2 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2019-06-17 22:37+0200\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -27,177 +27,186 @@ msgstr ""
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "De server is herstart; vernieuw de pagina"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig het stoppen van server; sluit het venster"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Systeembeheer"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Nieuwe gebruiker toevoegen"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Er is een bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "E-mailserverinstellingen bewerken"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-mail verstuurd naar %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Fout opgetreden bij het versturen van de test-e-mail: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "E-mailserverinstellingen bijgewerkt"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' is verwijderd"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Bezig met opvragen van updatepakket"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Bezig met downloaden van updatepakket"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Bezig met uitpakken van updatepakket"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Bezig met bestandsvervanging"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Databankverbindingen zijn gesloten"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Bezig met stoppen van server"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid; klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Algemene fout"
 
@@ -390,42 +399,50 @@ msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boekpad '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Aan het wachten"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-mailadres: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Converteren: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Uploaden: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Onbekende taak: "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -554,16 +571,20 @@ msgstr "Boekenplank '%(title)s' is aangepast"
 msgid "Edit a shelf"
 msgstr "Pas een boekenplank aan"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde bewerken van boekenplank '%(name)s'"
@@ -581,19 +602,19 @@ msgid "Hot Books"
 msgstr "Populaire boeken"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Populaire boeken tonen"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -602,7 +623,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -618,7 +639,7 @@ msgstr "Willekeurige boeken"
 msgid "Show random books"
 msgstr "Willekeurige boeken tonen"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -627,7 +648,7 @@ msgid "Show category selection"
 msgstr "Categoriekeuze tonen"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -643,7 +664,7 @@ msgstr "Auteurs"
 msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -652,6 +673,7 @@ msgid "Show publisher selection"
 msgstr "Uitgeverskeuze tonen"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Talen"
 
@@ -704,216 +726,201 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Druk op onderstaande knop om de laatste stabiele versie te installeren."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Recent toegevoegde boeken"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Best beoordeelde boeken"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Willekeurige boeken"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Boeken"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Kan e-boek niet openen. Het bestand bestaat niet of is niet toegankelijk:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Uitgeverslijst"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Boekenreeksen"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Beschikbare talen"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Categorielijst"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "zoeken"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "registreren"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Er is een bevestigingse-mail verstuurd naar je e-mailadres."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Deze gebruikersnaam of e-mailadres is al in gebruik."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Kan niet inloggen, LDAP server niet bereikbaar, contacteer de beheerder"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "inloggen"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Toegangssleutel niet gevonden"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Toegangssleutel is verlopen"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -928,23 +935,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "KindleGen mislukt; fout: %(error)s. Bericht: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Gebruikerslijst"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "e-mailadres"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle-e-mailadres"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "Downloads"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -958,7 +968,7 @@ msgid "Download"
 msgstr "Downloaden"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Boeken lezen"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -969,28 +979,32 @@ msgstr "Uploaden"
 msgid "Edit"
 msgstr "Bewerken"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "SMTP-serverinstellingen"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP-hostnaam"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP-poort"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP-gebruikersnaam"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Van e-mail"
 
 #: cps/templates/admin.html:61
@@ -1002,63 +1016,71 @@ msgid "Configuration"
 msgstr "Instellingen"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Calibre DB-map"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Logniveau"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Poort"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Aantal boeken per pagina"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Uploaden toestaan"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Anoniem verkennen"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Openbare registratie"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Inloggen op afstand"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Systeembeheer"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Logboeken bekijken"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Opnieuw verbinden met Calibre DB"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Calibre-Web herstarten"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Calibre-Web stoppen"
 
 #: cps/templates/admin.html:131
@@ -1078,7 +1100,7 @@ msgid "Current version"
 msgstr "Huidige versie"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Controleren op updates"
 
 #: cps/templates/admin.html:149
@@ -1086,30 +1108,29 @@ msgid "Perform Update"
 msgstr "Update uitvoeren"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Oké"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Annuleren"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Weet je zeker dat je Calibre-Web wilt stoppen?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Bezig met bijwerken; vernieuw de pagina niet"
 
 #: cps/templates/author.html:15
@@ -1145,7 +1166,8 @@ msgid "Delete formats:"
 msgstr "Formaten verwijderen:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1188,23 +1210,23 @@ msgid "Tags"
 msgstr "Labels"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Serie-id"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Beoordeling"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Boekomslag-url (jpg - de omslag wordt gedownload en opgeslagen in de databank; het invoerveld is nadien leeg)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Omslag uploaden vanaf computer"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Publicatiedatum"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1213,7 +1235,8 @@ msgstr "Publicatiedatum"
 msgid "Publisher"
 msgstr "Uitgever"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Taal"
 
@@ -1226,34 +1249,33 @@ msgid "No"
 msgstr "Nee"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Uploadformaat"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "boek inkijken na bewerking"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Opslaan"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Weet je het zeker?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Het boek wordt verwijderd uit de Calibre-database"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "en van de harde schijf"
 
 #: cps/templates/book_edit.html:209
@@ -1264,10 +1286,6 @@ msgstr "Trefwoord"
 msgid " Search keyword "
 msgstr " Trefwoord zoeken "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Ga!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Klik op de omslag om de metagegevens in het formulier te laden"
@@ -1276,8 +1294,9 @@ msgstr "Klik op de omslag om de metagegevens in het formulier te laden"
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1298,7 +1317,7 @@ msgid "Library Configuration"
 msgstr "Bibliotheekinstellingen"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Locatie van de Calibre-database"
 
 #: cps/templates/config_edit.html:25
@@ -1350,7 +1369,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL-sleutellocatie ('keyfile' - laat leeg voor niet-SSL-servers)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Updatekanaal"
 
 #: cps/templates/config_edit.html:101
@@ -1373,10 +1392,6 @@ msgstr "Bèta (automatisch)"
 msgid "Logfile Configuration"
 msgstr "Logbestanden"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Logniveau"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Locatie en naam van logbestand (calibre-web.log indien leeg)"
@@ -1394,255 +1409,271 @@ msgid "Feature Configuration"
 msgstr "Geavanceerde opties"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Uploaden inschakelen"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Anoniem verkennen inschakelen"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Openbare registratie inschakelen"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Inloggen op afstand inschakelen ('magic link')"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "API-sleutel verkrijgen"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Goodreads API-sleutel"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API-geheim"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Gebruik standaard authenticatie"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Gebruik LDAP authenticatie"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Gebruik OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP Server hostnaam of IP-adres"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "LDAP Server Poort"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "LDAP schema (ldap of ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr ""
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr ""
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Externe programma's"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Geen conversieprogramma"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "KindleGen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Calibre's e-boekconversie gebruiken"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Conversie-instellingen"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Locatie van conversieprogramma"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Locatie van Unrar-programma"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Inloggen"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Instellingen bekijken"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Aantal te tonen willekeurige boeken"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Aantal te tonen auteurs alvorens te verbergen (0=nooit verbergen)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Thema"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Standaard thema"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! donker thema"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Reguliere expressie om kolommen te negeren"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Gelezen/Ongelezen-status koppelen aan Calibre-kolom"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Reguliere expressie voor het sorteren op titel"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Labels voor 18+-inhoud"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Geen"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Reguliere expressie voor het sorteren op titel"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Standaardinstellingen voor nieuwe gebruikers"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Systeembeheerder"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Downloads toestaan"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Boeken lezen toestaan"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Uploads toestaan"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Bewerken toestaan"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Verwijderen van boeken toestaan"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Wachtwoord wijzigen toestaan"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Bewerken van openbare boekenplanken toestaan"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Standaard zichtbaar voor nieuwe gebruikers"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Willekeurige boeken tonen in gedetailleerde weergave"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "18+-inhoud tonen"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Lezen in webbrowser"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Luisteren in webbrowser"
 
 #: cps/templates/detail.html:117
@@ -1653,9 +1684,9 @@ msgstr "Boek"
 msgid "of"
 msgstr "van"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "taal"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1678,21 +1709,9 @@ msgid "Add to shelf"
 msgstr "Toevoegen aan boekenplank"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Metagegevens bewerken"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP-poort (meestal 25 voor normale SMTP, 465 voor SSL en 587 voor STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Beveiliging"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Geen"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1702,23 +1721,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "SMTP-wachtwoord"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Van e-mailadres"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Instellingen opslaan"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Instellingen opslaan en test-e-mail versturen"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Toegelaten domeinen voor registratie"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1734,29 +1745,33 @@ msgid "Enter domainname"
 msgstr "Voer domeinnaam in"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Weet je zeker dat je deze domeinregel wilt verwijderen?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Volgende"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Probleem melden"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Terug naar startpagina"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Verkennen (willekeurige boeken)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Sorteren op reeks"
@@ -1781,7 +1796,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "Recentste boeken"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Willekeurige boeken"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Willekeurige boeken tonen"
 
@@ -1809,7 +1828,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Openbare boekenplanken"
 
@@ -1817,7 +1836,7 @@ msgstr "Openbare boekenplanken"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Boeken georganiseerd op openbare boekenplanken, zichtbaar voor iedereen"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Jouw boekenplanken"
 
@@ -1829,10 +1848,19 @@ msgstr "Eigen boekenplanken, enkel zichtbaar voor huidige gebruiker"
 msgid "Home"
 msgstr "Startpagina"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Annuleren"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Navigatie aanpassen"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
@@ -1854,70 +1882,65 @@ msgstr "Uitloggen"
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Bezig met uploaden..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "vernieuw de pagina niet"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Boekenplank aanmaken"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informatie"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Boekgegevens"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Fout"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Gebruikersnaam"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Mij onthouden"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Inloggen met magische koppeling"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1925,11 +1948,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web - e-boekcatalogus"
 
 #: cps/templates/read.html:74
@@ -2041,51 +2088,51 @@ msgid "Basic txt Reader"
 msgstr "Basis tekstlezer"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Nieuw account registreren"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Kies een gebruikersnaam"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "e-mailadres"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Je e-mailadres"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Pak je andere apparaat, log in en ga naar "
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Daarna wordt je automatisch op dit apparaat ingelogd."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "De link vervalt na 10 minuten."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Geen resultaten voor:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Probeer andere zoektermen"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Resultaten voor:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Publicatiedatum van"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Publicatiedatum tot"
 
 #: cps/templates/search_form.html:43
@@ -2109,11 +2156,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Met beoordeling hoger dan"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Met beoordeling lager dan"
 
 #: cps/templates/shelf.html:10
@@ -2129,23 +2176,23 @@ msgid "Change order"
 msgstr "Volgorde veranderen"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "De boekenplank wordt permanent verwijderd voor iedereen!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "moet de boekenplank openbaar zijn?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Verander de volgorde middels slepen-en-neerzetten"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Calibre bibliotheekstatistieken"
 
 #: cps/templates/stats.html:12
@@ -2165,21 +2212,17 @@ msgid "Series in this Library"
 msgstr "Boekenreeksen in deze bibliotheek"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Gekoppelde bibliotheken"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Programmabibliotheek"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Versie"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Takenlijst"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Gebruiker"
@@ -2197,11 +2240,11 @@ msgid "Progress"
 msgstr "Voortgang"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Looptijd"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Begintijd"
 
 #: cps/templates/tasks.html:24
@@ -2216,16 +2259,12 @@ msgstr "Alle taken verbergen"
 msgid "Reset user Password"
 msgstr "Gebruikerswachtwoord herstellen"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Kindle-e-mailadres"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Taal van boeken"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Alle talen"
 
 #: cps/templates/user_edit.html:52
@@ -2240,14 +2279,38 @@ msgstr "Koppelen"
 msgid "Unlink"
 msgstr "Ontkoppelen"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Deze gebruiker verwijderen"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Recente downloads"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Afar"
 #~ msgstr "Afar; Hamitisch"
 
@@ -3661,3 +3724,75 @@ msgstr "Recente downloads"
 #~ msgid "Show access log"
 #~ msgstr "Toegangslogboek"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Labels voor 18+-inhoud"
+
+#~ msgid "Show mature content"
+#~ msgstr "18+-inhoud tonen"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Uitgeverslijst"
+
+#~ msgid "Series list"
+#~ msgstr "Boekenreeksen"
+
+#~ msgid "Available languages"
+#~ msgstr "Beschikbare talen"
+
+#~ msgid "Category list"
+#~ msgstr "Categorielijst"
+
+#~ msgid "Series id"
+#~ msgstr "Serie-id"
+
+#~ msgid "Submit"
+#~ msgstr "Opslaan"
+
+#~ msgid "Go!"
+#~ msgstr "Ga!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Verwijderen van boeken toestaan"
+
+#~ msgid "language"
+#~ msgstr "taal"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP-poort (meestal 25 voor normale SMTP, 465 voor SSL en 587 voor STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Van e-mailadres"
+
+#~ msgid "Save settings"
+#~ msgstr "Instellingen opslaan"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "vernieuw de pagina niet"
+
+#~ msgid "E-mail address"
+#~ msgstr "e-mailadres"
+
+#~ msgid "No Results for:"
+#~ msgstr "Geen resultaten voor:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Probeer andere zoektermen"
+
+#~ msgid "Tasks list"
+#~ msgstr "Takenlijst"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Kindle-e-mailadres"
+
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 13b93485..238884af 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 4f2161d6..9e11c784 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2019-08-06 18:35)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2019-08-18 22:06+0200\n"
 "Last-Translator: Jerzy Piątek <jerzy.piatek@gmail.com>\n"
 "Language: pl\n"
@@ -27,180 +27,189 @@ msgstr "zainstalowane"
 msgid "not installed"
 msgstr "nie zainstalowane"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
 # ???
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Panel administratora"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu (UI)"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nickname"
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Edycja ustawień serwera e-mail"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test e-maila zakończony pomyślnie. Wysłano do %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania e-maila testowego: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Nie można usunąć użytkownika. Brak na serwerze innego konta z prawami administratora"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
 # ???
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Przeglądanie plików Logu"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr ""
 
@@ -396,42 +405,50 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Nieudane"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Rozpoczynanie"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-mail: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Konwertowanie: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Wgrywanie: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Nieznane zadanie: "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 # ???
 #: cps/oauth_bb.py:74
 #, python-format
@@ -561,16 +578,20 @@ msgstr "Półka %(title)s została zmieniona"
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
@@ -588,19 +609,19 @@ msgid "Hot Books"
 msgstr "Najpopularniejsze książki"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Pokaż menu najpopularniejsze książki"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Najlepiej ocenione książki"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Pokaż menu najlepiej ocenione książki"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Przeczytane książki"
 
@@ -609,7 +630,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Nieprzeczytane książki"
 
@@ -625,7 +646,7 @@ msgstr "Odkrywaj"
 msgid "Show random books"
 msgstr "Pokaż menu odkrywaj"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -634,7 +655,7 @@ msgid "Show category selection"
 msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Seria"
 
@@ -650,7 +671,7 @@ msgstr "Autorzy"
 msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -659,6 +680,7 @@ msgid "Show publisher selection"
 msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Języki"
 
@@ -711,216 +733,201 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Kliknij przycisk poniżej, aby zaktualizować do najnowszej stabilnej wersji."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Ostatnio dodane książki"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Najlepiej oceniane książki"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Losowe książki"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Książki"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seria: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Lista wydawców"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Lista serii"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Dostępne języki"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Lista kategorii"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "szukaj"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, 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:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Najpierw skonfiguruj adres e-mail Kindla..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Wiadomość e-mail z potwierdzeniem została wysłana na Twoje konto e-mail."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Ta nazwa użytkownika lub adres e-mail jest już używany."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Brak możliwości zalogowania. Serwer LDAP jest niedostępny, skontaktuj się z administratorem"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr "Nowe hasło zostało wysłane na Twój adres e-mail"
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Nie znaleziono tokenu"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Token wygasł"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Błąd podczas otwierania eBooka. Plik nie istnieje lub plik jest niedostępny."
 
@@ -935,23 +942,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Niepowodzenie! Bład Kindlegen %(error)s. Komunikat: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Lista użytkowników"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "E-mail"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 # ???
@@ -967,7 +977,7 @@ msgid "Download"
 msgstr "Pobieranie"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Wyświetl Ebooki"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -978,28 +988,32 @@ msgstr "Wyślij"
 msgid "Edit"
 msgstr "Edytuj"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Ustawienia serwera e-mail SMTP"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "Adres serwera SMTP"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "Port serwera SMTP"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "Nazwa użytkownika SMTP"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Wyślij z adresu e-mail"
 
 #: cps/templates/admin.html:61
@@ -1011,63 +1025,71 @@ msgid "Configuration"
 msgstr "Konfiguracja"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Poziom Logu"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Ilość książek na stronie"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Wysyłanie"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Anonimowe przeglądanie"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Publiczna rejestracja"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Zdalne logowanie"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr "Nazwa nagłówka reverse proxy"
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Zarządzanie"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Podgląd Logów"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Połącz ponownie z bazą danych Calibre"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Uruchom ponownie Calibre Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Zatrzymaj Calibre Web"
 
 #: cps/templates/admin.html:131
@@ -1087,7 +1109,7 @@ msgid "Current version"
 msgstr "Bieżąca wersja"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Sprawdź aktualizacje"
 
 #: cps/templates/admin.html:149
@@ -1095,30 +1117,29 @@ msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "OK"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Wróć"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
 #: cps/templates/author.html:15
@@ -1156,7 +1177,8 @@ msgstr "Usuń formaty:"
 
 # ???
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Usuń"
 
@@ -1200,23 +1222,23 @@ msgid "Tags"
 msgstr "Tagi"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "ID serii"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Ocena"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Prześlij okładkę z dysku lokalnego"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Data publikacji"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1225,7 +1247,8 @@ msgstr "Data publikacji"
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Język"
 
@@ -1238,35 +1261,34 @@ msgid "No"
 msgstr "Nie"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Prześli format"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "wyświetl książkę po edycji"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Zatwierdź"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Czy jesteś pewny?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Książka zostanie usunięta z bazy danych Calibre"
 
 # ???
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "i z dysku twardego"
 
 #: cps/templates/book_edit.html:209
@@ -1277,10 +1299,6 @@ msgstr "Słowo kluczowe"
 msgid " Search keyword "
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Idź!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Kliknij okładkę, aby załadować metadane do formularza"
@@ -1289,8 +1307,9 @@ msgstr "Kliknij okładkę, aby załadować metadane do formularza"
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Zamknij"
 
@@ -1311,7 +1330,7 @@ msgid "Library Configuration"
 msgstr "Konfiguracja biblioteki"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Lokalizacja bazy danych Calibre"
 
 #: cps/templates/config_edit.html:25
@@ -1364,7 +1383,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Lokalizacja klucza SSL (pozostaw puste jeśli bez SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Kanał aktualizacji"
 
 #: cps/templates/config_edit.html:101
@@ -1387,10 +1406,6 @@ msgstr ""
 msgid "Logfile Configuration"
 msgstr "Konfiguracja Logów"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Poziom logów"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Lokalizacja i nazwa pliku Logu (domyślnie calibre-web.log)"
@@ -1408,255 +1423,271 @@ msgid "Feature Configuration"
 msgstr "Konfiguracja funkcjonalności"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Włącz wysyłanie"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Włącz anonimowe przeglądanie"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Włącz publiczną rejestrację"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Włącz zdalne logowanie (\"magic link\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "Użyj Goodreads"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Uzyskaj klucz API"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Klucz API Goodreads "
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Rodzaj logowania"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Użyj standardowego uwierzytelnienia"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Użyj uwierzytelniania LDAP"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Uzyj OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Nazwa hosta lub adres IP serwera LDAP"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "Port serwera LDAP"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "Schemat LDAP (ldap lub ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr "Nazwa administratora LDAP"
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr "Hasło administratora LDAP"
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "Serwer LDAP korzysta z protokołu SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "Serwer LDAP korzysta z TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "Certyfikat serwera LDAP"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "Ścieżka certyfikatu SSL LDAP"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Serwer LDAP to OpenLDAP?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr "Nazwa nagłowka reverse proxy"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Zewnętrzne pliki"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Brak konwertera"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Użyj konwertera Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Użyj konwertera książek Calibre"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Ustawienia konwertera e-booków (dodatkowe parametry)"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Lokalizacja do pliku konwertera"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Lokalizacja pliku binarnego Unrar"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Konfiguracja Widoku"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Nazwa"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Liczba losowych książek do pokazania"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Liczba autorów do pokazania przed ukryciem (0=wyłącza ukrywanie)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Motyw (Theme)"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Motyw Standardowy"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "Motyw caliBlur! Dark"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Wyrażenie regularne dla ignorowanych kolumn"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Link do statusu Przeczytanych/Nieprzeczytanych książek z kolumny Calibre (własna kolumna)"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Wyrażenie regularne dla tytułu sortującego"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Tagi dla Treści dla dorosłych"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Nic"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Wyrażenie regularne dla tytułu sortującego"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Domyślne ustawienia dla nowych użytkowników"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Użytkownik z uprawnieniami administratora"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Zezwalaj na pobieranie"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Zezwalaj na przeglądanie książek"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Zezwalaj na wysyłanie"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Zezwalaj na edycję"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Zezwalaj na usuwanie książek"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Zezwalaj na zmianę hasła"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Zezwalaj na edycję półek publicznych"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Domyślne ustawienia widoku dla nowych użytkowników"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Pokaz losowe książki w widoku szczegółowym"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Pokaż Treści dla dorosłych"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Czytaj w przeglądarce"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Słuchaj w przeglądarce"
 
 #: cps/templates/detail.html:117
@@ -1667,9 +1698,9 @@ msgstr "Książka"
 msgid "of"
 msgstr "z"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "język"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1692,21 +1723,9 @@ msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Edytuj metadane"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "Port serwera SMTP (używane 25 dla jawnego SMTP i 465 dla połączenia SSL i 587 dla połączenia STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Szyfrowanie"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Nic"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1716,23 +1735,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "Hasło SMTP"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Z adresu e-mail"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Zapisz ustawienia"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Zapisz ustawienia i wyślij testową wiadomość e-mail"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Domeny dozwolone do rejestracji"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1748,32 +1759,36 @@ msgid "Enter domainname"
 msgstr "Podaj nazwę domeny"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr "Nie można zarejestrowac domen"
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Czy naprawdę chcesz usunąć tę regułę domeny?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Następne"
 
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
 # | msgid "Create a Shelf"
-#: cps/templates/http_error.html:37
+#: cps/templates/http_error.html:38
 #, fuzzy
-msgid "Create issue"
+msgid "Create Issue"
 msgstr "Utwórz półkę"
 
 # ???
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Powrót do głównego menu"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Odkrywaj (losowe książki)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Grupuj według serii"
@@ -1798,7 +1813,11 @@ msgstr "Ostatnio dodane książki"
 msgid "The latest Books"
 msgstr "Ostatnie książki"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Losowe książki"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
@@ -1826,7 +1845,7 @@ msgstr "Ksiązki posortowane według języka"
 msgid "Books ordered by file formats"
 msgstr "Ksiązki posortowane według formatu"
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Publiczne półki"
 
@@ -1834,7 +1853,7 @@ msgstr "Publiczne półki"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Książki na półkach publicznych, widoczne dla wszystkich"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Twoje półki"
 
@@ -1846,10 +1865,19 @@ msgstr "Własne półki, widoczne tylko dla bieżącego użytkownika"
 msgid "Home"
 msgstr ""
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Wróć"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Przełącz nawigację"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
@@ -1871,72 +1899,67 @@ msgstr " Wyloguj się"
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr ""
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "proszę nie odświeżać strony"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "O programie"
 
 # ???
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Szczegóły książki"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Ładowanie gotowe, przetwarzanie, proszę czekać ..."
 
 # ???
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Błąd"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Hasło"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Zapamiętaj mnie"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr "Zapomniałem hasła"
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Zaloguj się za pomocą \"magic link\""
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr "Pokaż log Calibre-Web"
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr "Log Calibre-Web"
 
 #: cps/templates/logviewer.html:8
@@ -1944,11 +1967,35 @@ msgid "Stream output, can't be displayed"
 msgstr "Nie można wyświetlić wyjścia"
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
 msgstr "Pokaż log dostępu"
 
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
+msgstr ""
+
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Katalog e-booków Calibre-Web"
 
 #: cps/templates/read.html:74
@@ -2061,51 +2108,51 @@ msgid "Basic txt Reader"
 msgstr "Podstawowy czytnik txt"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Zarejestruj nowe konto"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Wybierz nazwę użytkownika"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "Adres e-mail"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Użyj innego urządzenia, zaloguj się i odwiedź"
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Gdy to zrobisz, automatycznie zalogujesz się na tym urządzeniu."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Link wygaśnie po 10 minutach."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Brak wyników dla:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Proszę wypróbować podobne wyszukiwanie"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Wyniki dla:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Data publikacji od"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Data publikacji do"
 
 #: cps/templates/search_form.html:43
@@ -2129,11 +2176,11 @@ msgid "Exclude Extensions"
 msgstr "Wyklucz rozszerzenia"
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Ocena większa niż"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Ocena mniejsza niż"
 
 #: cps/templates/shelf.html:10
@@ -2149,23 +2196,23 @@ msgid "Change order"
 msgstr "Zmień sortowanie"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz usunąć półkę?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "Półka nie będzie dostępne dla wszystkich na zawsze!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "półka powinna być publiczna?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Przeciągnij i upuść, aby zmienić kolejność"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Statystyki biblioteki Calibre"
 
 #: cps/templates/stats.html:12
@@ -2185,21 +2232,17 @@ msgid "Series in this Library"
 msgstr "Serie"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Załączone biblioteki"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Biblioteka programu"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Zainstalowana wersja"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Lista zadań"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Użytkownik"
@@ -2218,11 +2261,11 @@ msgstr "Postęp"
 
 # ???
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Czas wykonania"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Start"
 
 # ???
@@ -2238,16 +2281,12 @@ msgstr "Ukryj wszystkie zadania"
 msgid "Reset user Password"
 msgstr "Zresetuj hasło użytkownika"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Adres e-mail Kindle"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Pokaż książki w języku"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Pokaż wszystko"
 
 #: cps/templates/user_edit.html:52
@@ -2262,15 +2301,39 @@ msgstr "Połącz"
 msgid "Unlink"
 msgstr "Rozłącz"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Usuń tego użytkownika"
 
 # ???
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Pobrane"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Keyfile location is not valid, please enter correct path"
 #~ msgstr "Lokalizacja pliku kluczy jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
@@ -2319,3 +2382,75 @@ msgstr "Pobrane"
 #~ msgid "Show access log"
 #~ msgstr "Zdarzenia z logu Access"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Tagi dla Treści dla dorosłych"
+
+#~ msgid "Show mature content"
+#~ msgstr "Pokaż Treści dla dorosłych"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Lista wydawców"
+
+#~ msgid "Series list"
+#~ msgstr "Lista serii"
+
+#~ msgid "Available languages"
+#~ msgstr "Dostępne języki"
+
+#~ msgid "Category list"
+#~ msgstr "Lista kategorii"
+
+#~ msgid "Series id"
+#~ msgstr "ID serii"
+
+#~ msgid "Submit"
+#~ msgstr "Zatwierdź"
+
+#~ msgid "Go!"
+#~ msgstr "Idź!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Zezwalaj na usuwanie książek"
+
+#~ msgid "language"
+#~ msgstr "język"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "Port serwera SMTP (używane 25 dla jawnego SMTP i 465 dla połączenia SSL i 587 dla połączenia STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Z adresu e-mail"
+
+#~ msgid "Save settings"
+#~ msgstr "Zapisz ustawienia"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "proszę nie odświeżać strony"
+
+#~ msgid "E-mail address"
+#~ msgstr "Adres e-mail"
+
+#~ msgid "No Results for:"
+#~ msgstr "Brak wyników dla:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Proszę wypróbować podobne wyszukiwanie"
+
+#~ msgid "Tasks list"
+#~ msgstr "Lista zadań"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Adres e-mail Kindle"
+
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 45506d53..6b8245ef 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 468c3332..c2dcf2b0 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2020-01-21 23:03+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -27,177 +27,186 @@ msgstr "установлено"
 msgid "not installed"
 msgstr "не установлено"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, перезагрузите страницу"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Для этого адреса электронной почты или логина уже есть аккаунт."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Изменить настройки e-mail сервера"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Тестовое письмо успешно отправлено на %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Соеднинения с базой данных закрыты"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Таймаут при установлении соединения"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Общая ошибка"
 
@@ -390,42 +399,50 @@ msgstr "Файл %(file)s не найден на Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Начало"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Закончено"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-mail: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Конвертировать:"
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Загрузить:"
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Неизвестная задача:"
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -554,16 +571,20 @@ msgstr "Колка %(title)s изменена"
 msgid "Edit a shelf"
 msgstr "Изменить полку"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Полка: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
@@ -581,19 +602,19 @@ msgid "Hot Books"
 msgstr "Популярные Книги"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Показывать популярные книги"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -602,7 +623,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -618,7 +639,7 @@ msgstr "Обзор"
 msgid "Show random books"
 msgstr "Показывать случайные книги"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Категории"
 
@@ -627,7 +648,7 @@ msgid "Show category selection"
 msgstr "Показывать выбор категории"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Серии"
 
@@ -643,7 +664,7 @@ msgstr "Авторы"
 msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -652,6 +673,7 @@ msgid "Show publisher selection"
 msgstr "Показать выбор издателя"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Языки"
 
@@ -704,216 +726,201 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Нажмите на кнопку ниже для обновления до последней стабильной версии"
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Недавно Добавленные Книги"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Книги с наивысшим рейтингом"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Случайный выбор"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Книги"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Список издателей"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Серии"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Доступные языки"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Категории"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Опубликовано до "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Опубликовано после "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "поиск"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ошибка при отправке книги: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "регистрация"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail"
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Этот никнейм или e-mail уже используются"
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как пользователь '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Не удалось войти. Сервер LDAP не работает, обратитесь к администратору"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "войти"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Ключ не найден"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Ключ просрочен"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Читать Книгу"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Ошибка открытия электронной книги. Файл не существует или файл недоступен"
 
@@ -928,23 +935,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen - неудачно, с Ошибкой %(error)s. Сообщение: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Список пользователей"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Имя пользователя"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "Почта"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -958,7 +968,7 @@ msgid "Download"
 msgstr "Скачать"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Посмотреть электронные книги"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -969,28 +979,32 @@ msgstr "Загрузить"
 msgid "Edit"
 msgstr "Редактировать"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Настройки SMTP-сервера"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP-логин"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Отправитель"
 
 #: cps/templates/admin.html:61
@@ -1002,63 +1016,71 @@ msgid "Configuration"
 msgstr "Настройки сервера"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Уровень логирования"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Количество книг на странице"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Загрузка на сервер"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Анонимный просмотр"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Публичная регистрация"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Удалённый логин"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Управление"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Просмотреть лог файл"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Переподключиться к БД Calibre"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Перезагрузить Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Остановить Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1078,7 +1100,7 @@ msgid "Current version"
 msgstr "Текущая версия"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Проверка обновлений"
 
 #: cps/templates/admin.html:149
@@ -1086,30 +1108,29 @@ msgid "Perform Update"
 msgstr "Установить обновления"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Назад"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу."
 
 #: cps/templates/author.html:15
@@ -1145,7 +1166,8 @@ msgid "Delete formats:"
 msgstr "Удалить форматы:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1188,23 +1210,23 @@ msgid "Tags"
 msgstr "Теги"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Серия"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Рейтинг"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "URL обложки(jpg, обложка загружается и сохраняется в базе данных, после этого поле снова пустое)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Загрузить обложку с диска"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Опубликовано"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1213,7 +1235,8 @@ msgstr "Опубликовано"
 msgid "Publisher"
 msgstr "Издатель"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Язык"
 
@@ -1226,34 +1249,33 @@ msgid "No"
 msgstr "Нет"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Загружаемый формат"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "смотреть книгу после редактирования"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Отправить"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Вы действительно уверены?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Книга будет удалена из БД Calibre"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "и с диска"
 
 #: cps/templates/book_edit.html:209
@@ -1264,10 +1286,6 @@ msgstr "Ключевое слово"
 msgid " Search keyword "
 msgstr " Поиск по ключевому слову "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Старт!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
@@ -1276,8 +1294,9 @@ msgstr "Нажмите на обложку, чтобы получить мета
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Закрыть"
 
@@ -1298,7 +1317,7 @@ msgid "Library Configuration"
 msgstr "Настройки библотеки"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Расположение БД Calibre"
 
 #: cps/templates/config_edit.html:25
@@ -1350,7 +1369,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Расположение SSL файла-ключа (оставьте его пустым для серверов без SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Ветка обнавлений"
 
 #: cps/templates/config_edit.html:101
@@ -1373,10 +1392,6 @@ msgstr "Теставая (Автоматически)"
 msgid "Logfile Configuration"
 msgstr "Настройки лог-файла"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Уровень Логирования"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Расположение и имя лог-файла (не вводите calibre-web.log)"
@@ -1394,255 +1409,271 @@ msgid "Feature Configuration"
 msgstr "Дополнительный Настройки"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Разрешить загрузку на сервер"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Разрешить анонимный просмотр"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Разрешить публичную регистрацию"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Включить удаленный логин (\"magic link\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "Использовать Goodreads"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Получить ключ API"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Ключ API Goodreads"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Секрет"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Тип входа"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Использовать стандартную аутентификацию"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Использовать LDAP аутентификацию"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Использовать OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "Имя хоста или IP-адрес сервера LDAP"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "Порт сервера LDAP"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "Схема LDAP (ldap или ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr "Имя администратора LDAP"
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr "Пароль администратора LDAP"
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "Сервер LDAP использует SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "Сервер LDAP использует TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "Сертификат сервера LDAP"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "Путь к SSL сертификату LDAP"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Отличительное имя LDAP (DN)"
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr "Фильтр объектов пользователя LDAP"
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Сервер LDAP - это OpenLDAP ?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Получить %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth ID клиента"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Секрет клиента"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Настройки конвертации"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Нет конвертера"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Использовать Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Использовать конвертер calibre's ebook"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Настройки конвертера E-Book"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Путь к конвертеру"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Расположение двоичного файла Unrar"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Логин"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Просмотреть Конфигурацию"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Заголовок"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Количество отображаемых случайных книг"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Количество авторов для отображения перед скрытием (0 = отключить скрытие)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Тема"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Стандартная тема"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! Темная тема"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Regexp для игнорирования столбцов"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Ссылка на чтение/непрочитанный статус столбца Caliber"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Regexp для сортировки по названию"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Теги для Взрослого Контента"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Нет"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Regexp для сортировки по названию"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Настройки по умолчанию для новых пользователей"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Управление сервером"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Разрешить скачивание с сервера"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Разрешить чтение книг"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Разрешить загрузку на сервер"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Разрешить редактирование книг"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Разрешить удаление книг"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Разрешить смену пароля"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Разрешить редактирование публичных книжных полок"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Видимость для новых пользователей(по умолчанию)"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Показывать случайные книги при просмотре деталей"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Показывать взрослый контент"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Читать"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Ждите сигнала от браузера"
 
 #: cps/templates/detail.html:117
@@ -1653,9 +1684,9 @@ msgstr "Книга"
 msgid "of"
 msgstr "из"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "Язык"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1678,21 +1709,9 @@ msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Редактировать метаданные"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP-порт (обычно 25 для SMTP, 465 для SSL и 587 для STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Шифрование"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Нет"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1702,23 +1721,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "Пароль SMTP"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Адрес отправителя"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Сохранить настройки"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Сохранить настройки и отправить тестовое письмо"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Допустимые домены для регистрации"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1734,29 +1745,33 @@ msgid "Enter domainname"
 msgstr "Введите доменное имя"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Вы действительно желаете удалить это правило домена?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Дальше"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Создать запись"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Вернуться на главную"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Обзор (Случайные Книги)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Сгрупировать по серии"
@@ -1781,7 +1796,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "Последние Книги"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Случайный выбор"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Показывать Случайные Сниги"
 
@@ -1809,7 +1828,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Общие полки"
 
@@ -1817,7 +1836,7 @@ msgstr "Общие полки"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Книги размещены на полках, и доступны всем"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Ваши полки"
 
@@ -1829,10 +1848,19 @@ msgstr "Пользовательские полки, видимые только
 msgid "Home"
 msgstr "Главная"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Назад"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Включить навигацию"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
@@ -1854,70 +1882,65 @@ msgstr "Выход"
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Загружается..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "пожалуйста не обновляйте страницу"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Создать книжную полку"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Ошибка"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Имя пользователя"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Пароль"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Запомнить меня"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Войти через магическую ссылку"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1925,11 +1948,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Каталог электронных книг Caliber-Web"
 
 #: cps/templates/read.html:74
@@ -2041,51 +2088,51 @@ msgid "Basic txt Reader"
 msgstr "Средство для чтения txt-файлов"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Зарегистрировать новую учётную запись"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Выберите имя пользователя"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "E-mail адрес"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Ваш email-адрес"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Используйте другое устройство, войдите и посетите"
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "После этого вы автоматически войдете в систему на этом устройстве."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Срок действия ссылки истекает через 10 минут"
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Ничего не найдено по запросу:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Попробуйте изменить критерии поиска"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Результаты для:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Опубликовано от"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Опубликовано до"
 
 #: cps/templates/search_form.html:43
@@ -2109,11 +2156,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Рейтинг больше чем"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Рейтинг меньше чем"
 
 #: cps/templates/shelf.html:10
@@ -2129,23 +2176,23 @@ msgid "Change order"
 msgstr "Изменить порядок"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "Книжная полка будет безвозвратно удалена для всех"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "сделать книжную полку доступной для всех?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Перетащите для изменения порядка"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Статистика библиотеки Calibre"
 
 #: cps/templates/stats.html:12
@@ -2165,21 +2212,17 @@ msgid "Series in this Library"
 msgstr "Серий в этой Библиотеке"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Связанные библиотеки"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Программа"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Установленная версия"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Список задач"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Пользователь"
@@ -2197,11 +2240,11 @@ msgid "Progress"
 msgstr "Прогресс"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Время выполнения"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Время начала"
 
 #: cps/templates/tasks.html:24
@@ -2216,16 +2259,12 @@ msgstr "Скрыть все задачи"
 msgid "Reset user Password"
 msgstr "Сбросить пароль пользователя"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Адрес почты Kindle"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Показать книги на языках"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Показать все"
 
 #: cps/templates/user_edit.html:52
@@ -2240,14 +2279,38 @@ msgstr "Связать"
 msgid "Unlink"
 msgstr "Разъединить"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Удалить этого пользователя"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Последние загрузки"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Afar"
 #~ msgstr "Афар"
 
@@ -3388,3 +3451,75 @@ msgstr "Последние загрузки"
 #~ msgid "Show access log"
 #~ msgstr "Показать журнал доступа"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Теги для Взрослого Контента"
+
+#~ msgid "Show mature content"
+#~ msgstr "Показывать взрослый контент"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Список издателей"
+
+#~ msgid "Series list"
+#~ msgstr "Серии"
+
+#~ msgid "Available languages"
+#~ msgstr "Доступные языки"
+
+#~ msgid "Category list"
+#~ msgstr "Категории"
+
+#~ msgid "Series id"
+#~ msgstr "Серия"
+
+#~ msgid "Submit"
+#~ msgstr "Отправить"
+
+#~ msgid "Go!"
+#~ msgstr "Старт!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Разрешить удаление книг"
+
+#~ msgid "language"
+#~ msgstr "Язык"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP-порт (обычно 25 для SMTP, 465 для SSL и 587 для STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Адрес отправителя"
+
+#~ msgid "Save settings"
+#~ msgstr "Сохранить настройки"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "пожалуйста не обновляйте страницу"
+
+#~ msgid "E-mail address"
+#~ msgstr "E-mail адрес"
+
+#~ msgid "No Results for:"
+#~ msgstr "Ничего не найдено по запросу:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Попробуйте изменить критерии поиска"
+
+#~ msgid "Tasks list"
+#~ msgstr "Список задач"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Адрес почты Kindle"
+
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 6c16fd66..5684633b 100644
Binary files a/cps/translations/sv/LC_MESSAGES/messages.mo and b/cps/translations/sv/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index d686fe9c..7aa8371a 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2020-01-18 11:22+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -26,177 +26,186 @@ msgstr "installerad"
 msgid "not installed"
 msgstr "inte installerad"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Statistik"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Server startas om, vänligen uppdatera sidan"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Okänd"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Administrationssida"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller smeknamnet."
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "Redigera inställningar för e-postserver"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-post skicka till %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Det gick inte att skicka Testmeddelandet: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "Hittade ett befintligt konto för den här e-postadressen."
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Ett okänt fel uppstod."
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "Allmänt fel"
 
@@ -389,42 +398,50 @@ msgstr "Filen %(file)s hittades inte på Google Drive"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "Väntar"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "Startad"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "Klar"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr "E-post: "
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "Konvertera: "
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "Överför: "
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "Okänd uppgift: "
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -553,16 +570,20 @@ msgstr "Hyllan %(title)s ändrad"
 msgid "Edit a shelf"
 msgstr "Redigera en hylla"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylla: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
@@ -580,19 +601,19 @@ msgid "Hot Books"
 msgstr "Heta böcker"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Visa heta böcker"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -601,7 +622,7 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -617,7 +638,7 @@ msgstr "Upptäck"
 msgid "Show random books"
 msgstr "Visa slumpmässiga böcker"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -626,7 +647,7 @@ msgid "Show category selection"
 msgstr "Visa kategorival"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Serier"
 
@@ -642,7 +663,7 @@ msgstr "Författare"
 msgid "Show author selection"
 msgstr "Visa författarval"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -651,6 +672,7 @@ msgid "Show publisher selection"
 msgstr "Visa urval av förlag"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Språk"
 
@@ -703,216 +725,201 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicka på knappen nedan för att uppdatera till den senaste stabila versionen."
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Nyligen tillagda böcker"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Bäst rankade böcker"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Slumpmässiga böcker"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr "Böcker"
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Fel vid öppnande av e-bok. Filen finns inte eller filen är inte tillgänglig:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "Lista över förlag"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Serielista"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Tillgängliga språk"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Kategorilista"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Sök"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "sök"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Boken är i kö för att skicka till %(kindlemail)s"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Det gick inte att skicka den här boken: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Konfigurera din kindle-e-postadress först..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "registrera"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "Det här användarnamnet eller e-postadressen är redan i bruk."
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Det gick inte att logga in. LDAP-servern är nere, kontakta din administratör"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "logga in"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Token hittades inte"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Token har löpt ut"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Läs en bok"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Fel vid öppningen av e-boken. Filen finns inte eller filen är inte tillgänglig."
 
@@ -927,23 +934,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen misslyckades med fel %(error)s. Meddelande: %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Användarlista"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Smeknamn"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr "E-post"
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -957,7 +967,7 @@ msgid "Download"
 msgstr "Hämta"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "Visa e-böcker"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -968,28 +978,32 @@ msgstr "Ladda upp"
 msgid "Edit"
 msgstr "Redigera"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "Inställningar för SMTP-e-postserver"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP-värdnamn"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP-port"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP-inloggning"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Från meddelande"
 
 #: cps/templates/admin.html:61
@@ -1001,63 +1015,71 @@ msgid "Configuration"
 msgstr "Konfiguration"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Calibre DB dir"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "Loggnivå"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Böcker per sida"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Laddar upp"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Anonym surfning"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Publik registrering"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "Fjärrinloggning"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr "Omvänd proxy inloggning"
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr "Omvänt proxy rubriknamn"
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Administration"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "Visa loggfiler"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Anslut till Calibre DB igen"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "Starta om Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "Stoppa Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1077,7 +1099,7 @@ msgid "Current version"
 msgstr "Aktuell version"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Sök efter uppdatering"
 
 #: cps/templates/admin.html:149
@@ -1085,30 +1107,29 @@ msgid "Perform Update"
 msgstr "Utför uppdatering"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "Är du säker på att du vill starta om Calibre-Web?"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Tillbaka"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Uppdaterar, vänligen uppdatera inte sidan"
 
 #: cps/templates/author.html:15
@@ -1144,7 +1165,8 @@ msgid "Delete formats:"
 msgstr "Ta bort format:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1187,23 +1209,23 @@ msgid "Tags"
 msgstr "Taggar"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Serier-id"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Betyg"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "Omslagswebbadress (jpg, omslag hämtas och lagras i databasen, fältet är efteråt tomt igen)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "Ladda upp omslag från lokal enhet"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Publiceringsdatum"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1212,7 +1234,8 @@ msgstr "Publiceringsdatum"
 msgid "Publisher"
 msgstr "Förlag"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Språk"
 
@@ -1225,34 +1248,33 @@ msgid "No"
 msgstr "Nej"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Ladda upp format"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "visa bok efter redigering"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Skicka"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "Är du verkligen säker?"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Boken kommer att tas bort från Calibre-databasen"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "och från hårddisken"
 
 #: cps/templates/book_edit.html:209
@@ -1263,10 +1285,6 @@ msgstr "Sökord"
 msgid " Search keyword "
 msgstr " Sök sökord "
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Kör!"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Klicka på omslaget för att läsa in metadata till formuläret"
@@ -1275,8 +1293,9 @@ msgstr "Klicka på omslaget för att läsa in metadata till formuläret"
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Stäng"
 
@@ -1297,7 +1316,7 @@ msgid "Library Configuration"
 msgstr "Bibliotekets konfiguration"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Plats för Calibre-databasen"
 
 #: cps/templates/config_edit.html:25
@@ -1349,7 +1368,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL Keyfile plats (lämna den tom för icke-SSL-servrar)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr "Uppdatera kanal"
 
 #: cps/templates/config_edit.html:101
@@ -1372,10 +1391,6 @@ msgstr "Ostabil (automatisk)"
 msgid "Logfile Configuration"
 msgstr "Loggfil konfiguration"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Loggnivå"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Plats och namn på loggfilen (calibre-web.log för ingen post)"
@@ -1393,255 +1408,271 @@ msgid "Feature Configuration"
 msgstr "Funktion konfiguration"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Aktivera uppladdning"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Aktivera anonym surfning"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Aktivera offentlig registrering"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Aktivera fjärrinloggning (\"magisk länk\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "Använd Goodreads"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Hämta en API-nyckel"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr "Goodreads API-nyckel"
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr "Goodreads API-hemlighet"
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "Inloggningstyp"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "Använd standardautentisering"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "Använd LDAP-autentisering"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "Använd OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP-serverns värdnamn eller IP-adress"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "LDAP-serverport"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr "LDAP-schema (ldap eller ldaps)"
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr "LDAP-adminstratörsanvändarnamn"
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr "LDAP-adminstratörslösenord"
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "LDAP-server använder SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "LDAP-server använder TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "LDAP-servercertifikat"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "LDAP SSL-certifikatsökväg"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr "LDAP-användarobjektfilter"
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP-server är OpenLDAP?"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Skaffa %(provider)s OAuth-certifikat"
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth-klient-id"
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth-klient-hemlighet"
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr "Tillåt omvänd proxyautentisering"
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr "Omvänt proxy rubriknamn"
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "Externa binärer"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "Ingen konverterare"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "Använd Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "Använd calibres e-bokkonverterare"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "Inställningar för e-bokkonverteraren"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "Sökväg till convertertool"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Plats för Unrar-binär"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Logga in"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Visa konfiguration"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Antal slumpmässiga böcker att visa"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr "Antal författare att visa innan de döljs (0 = inaktivera dölja)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Tema"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Standard tema"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr "caliBlur! Mörkt tema"
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Reguljärt uttryck för att ignorera kolumner"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "Länka läst/oläst-status till Calibre-kolumn"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Reguljärt uttryck för titelsortering"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "Taggar för vuxeninnehåll"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Ingen"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Reguljärt uttryck för titelsortering"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Standardinställningar för nya användare"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Adminstratör användare"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Tillåt Hämtningar"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr "Tillåt bokvisare"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Tillåt Uppladdningar"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Tillåt Redigera"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Tillåt Ta bort böcker"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Tillåt Ändra lösenord"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Tillåt Redigering av offentliga hyllor"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Standardvisibiliteter för nya användare"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Visa slumpmässiga böcker i detaljvyn"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "Visa vuxeninnehåll"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Läs i webbläsaren"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr "Lyssna i webbläsaren"
 
 #: cps/templates/detail.html:117
@@ -1652,9 +1683,9 @@ msgstr "Bok"
 msgid "of"
 msgstr "av"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "språk"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1677,21 +1708,9 @@ msgid "Add to shelf"
 msgstr "Lägg till hyllan"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Redigera metadata"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP-port (vanligtvis 25 för vanlig SMTP och 465 för SSL och 587 för STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Ingen"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1701,23 +1720,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "SMTP-lösenord"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Från e-post"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Spara inställningarna"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Spara inställningarna och skicka test-e-post"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "Tillåtna domäner för registrering"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1733,29 +1744,33 @@ msgid "Enter domainname"
 msgstr "Ange domännamn"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr "Nekade domäner för registrering"
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "Är du säker på att du vill ta bort den här domänregeln?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Nästa"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "Skapa ärende"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "Tillbaka till hemmet"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Upptäck (slumpmässiga böcker)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr "Gruppera efter serie"
@@ -1780,7 +1795,11 @@ msgstr "Senaste tillagda böcker"
 msgid "The latest Books"
 msgstr "De senaste böckerna"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Slumpmässiga böcker"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
@@ -1808,7 +1827,7 @@ msgstr "Böcker ordnade efter språk"
 msgid "Books ordered by file formats"
 msgstr "Böcker ordnade av filformat"
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Offentliga hyllor"
 
@@ -1816,7 +1835,7 @@ msgstr "Offentliga hyllor"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Böcker organiserade i offentliga hyllor, synliga för alla"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Dina hyllor"
 
@@ -1828,10 +1847,19 @@ msgstr "Användarens egna hyllor, endast synliga för den aktuella användaren s
 msgid "Home"
 msgstr "Hem"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Tillbaka"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Växla navigering"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
@@ -1853,70 +1881,65 @@ msgstr "Logga ut"
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "uppdatera inte sidan"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Skapa en hylla"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "Fel"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Användarnamn"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Lösenord"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Kom ihåg mig"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr "Glömt lösenord"
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Logga in med magisk länk"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr "Visa Calibre-Web-logg: "
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr "Visa åtkomstlogg: "
 
 #: cps/templates/logviewer.html:8
@@ -1924,11 +1947,35 @@ msgid "Stream output, can't be displayed"
 msgstr "Strömutmatning kan inte visas"
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
 msgstr "Visa åtkomstlogg: "
 
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
+msgstr ""
+
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Calibre-Web e-bokkatalog"
 
 #: cps/templates/read.html:74
@@ -2040,51 +2087,51 @@ msgid "Basic txt Reader"
 msgstr "Grundläggande txt-läsare"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Registrera ett nytt konto"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Välj ett användarnamn"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "E-postadress"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Din e-postadress"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr "Använd din andra enhet, logga in och besök "
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "När du gör det kommer du automatiskt att logga in på den här enheten."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr "Länken går ut efter 10 minuter."
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Inga resultat för:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Försök en annan sökning"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Resultat för:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Publiceringsdatum från"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Publiceringsdatum till"
 
 #: cps/templates/search_form.html:43
@@ -2108,11 +2155,11 @@ msgid "Exclude Extensions"
 msgstr "Uteslut tillägg"
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "Betyg större än"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "Betyg mindre än"
 
 #: cps/templates/shelf.html:10
@@ -2128,23 +2175,23 @@ msgid "Change order"
 msgstr "Ändra ordningen"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Är du säker på att du vill ta bort hyllan?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "Hylla kommer att gå förlorad för alla och för alltid!"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "ska hyllan vara offentlig?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Drag och släpp för att ändra ordning"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Calibre-biblioteksstatistik"
 
 #: cps/templates/stats.html:12
@@ -2164,21 +2211,17 @@ msgid "Series in this Library"
 msgstr "Serier i detta bibliotek"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Kopplade bibliotek"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Programbibliotek"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Installerad version"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "Uppgiftslista"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "Användare"
@@ -2196,11 +2239,11 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "Drifttid"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "Starttid"
 
 #: cps/templates/tasks.html:24
@@ -2215,16 +2258,12 @@ msgstr "Dölj alla uppgifter"
 msgid "Reset user Password"
 msgstr "Återställ användarlösenordet"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Kindle e-post"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Visa böcker med språk"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Visa alla"
 
 #: cps/templates/user_edit.html:52
@@ -2239,14 +2278,38 @@ msgstr "Koppla"
 msgid "Unlink"
 msgstr "Koppla bort"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Ta bort den här användaren"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Senaste hämtningar"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "Current commit timestamp"
 #~ msgstr "Aktuelles Commit Datum"
 
@@ -2472,3 +2535,75 @@ msgstr "Senaste hämtningar"
 #~ msgid "Show access log"
 #~ msgstr "Visa åtkomstlogg"
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr "Taggar för vuxeninnehåll"
+
+#~ msgid "Show mature content"
+#~ msgstr "Visa vuxeninnehåll"
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr "Lista över förlag"
+
+#~ msgid "Series list"
+#~ msgstr "Serielista"
+
+#~ msgid "Available languages"
+#~ msgstr "Tillgängliga språk"
+
+#~ msgid "Category list"
+#~ msgstr "Kategorilista"
+
+#~ msgid "Series id"
+#~ msgstr "Serier-id"
+
+#~ msgid "Submit"
+#~ msgstr "Skicka"
+
+#~ msgid "Go!"
+#~ msgstr "Kör!"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Tillåt Ta bort böcker"
+
+#~ msgid "language"
+#~ msgstr "språk"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP-port (vanligtvis 25 för vanlig SMTP och 465 för SSL och 587 för STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Från e-post"
+
+#~ msgid "Save settings"
+#~ msgstr "Spara inställningarna"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "uppdatera inte sidan"
+
+#~ msgid "E-mail address"
+#~ msgstr "E-postadress"
+
+#~ msgid "No Results for:"
+#~ msgstr "Inga resultat för:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Försök en annan sökning"
+
+#~ msgid "Tasks list"
+#~ msgstr "Uppgiftslista"
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Kindle e-post"
+
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 34284797..6fae1e76 100644
Binary files a/cps/translations/uk/LC_MESSAGES/messages.mo and b/cps/translations/uk/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 4f714bd5..bfa07cf0 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -25,177 +25,186 @@ msgstr ""
 msgid "not installed"
 msgstr "не встановлено"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "Сторінка адміністратора"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "Сталась невідома помилка"
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr ""
 
@@ -388,42 +397,50 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr ""
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr ""
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr ""
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr ""
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -552,16 +569,20 @@ msgstr "Книжкова полиця %(title)s змінена"
 msgid "Edit a shelf"
 msgstr "Змінити книжкову полицю"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжкова полиця: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
@@ -579,19 +600,19 @@ msgid "Hot Books"
 msgstr "Популярні книги"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "Показувати популярні книги"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -600,7 +621,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -616,7 +637,7 @@ msgstr "Огляд"
 msgid "Show random books"
 msgstr "Показувати випадкові книги"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "Категорії"
 
@@ -625,7 +646,7 @@ msgid "Show category selection"
 msgstr "Показувати вибір категорії"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "Серії"
 
@@ -641,7 +662,7 @@ msgstr "Автори"
 msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr ""
 
@@ -650,6 +671,7 @@ msgid "Show publisher selection"
 msgstr ""
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "Мови"
 
@@ -702,216 +724,201 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "Нещодавно додані книги"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "Книги з найкращим рейтингом"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "Випадковий список книг"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "Список серій"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "Доступні мови"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "Список категорій"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr ""
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "пошук"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "зареєструватись"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "увійти"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "Токен не знайдено"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Час дії токено вичерпано"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "Читати книгу"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -926,23 +933,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen відхилено з помилкою %(error)s. Повідомлення: %(message)s "
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "Список користувачів"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "Ім'я користувача"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr "Kindle"
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr "DLS"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -956,7 +966,7 @@ msgid "Download"
 msgstr "Завантажити"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -967,28 +977,32 @@ msgstr "Додати нову книгу"
 msgid "Edit"
 msgstr "Редагувати"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr ""
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr "SSL"
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP логін"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "Відправник"
 
 #: cps/templates/admin.html:61
@@ -1000,63 +1014,71 @@ msgid "Configuration"
 msgstr "Налаштування сервера"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr ""
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "Кількість книг на сторінці"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "Загрузка на сервер"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "Анонімний перегляд"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "Публічна реєстрація"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr ""
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "Адміністрування"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr ""
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "Повторне підключення до БД Calibre"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr ""
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr ""
 
 #: cps/templates/admin.html:131
@@ -1076,7 +1098,7 @@ msgid "Current version"
 msgstr ""
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "Перевірка оновлень"
 
 #: cps/templates/admin.html:149
@@ -1084,30 +1106,29 @@ msgid "Perform Update"
 msgstr "Встановити оновлення"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "Ok"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "Назад"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr ""
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
 #: cps/templates/author.html:15
@@ -1143,7 +1164,8 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "Видалити"
 
@@ -1186,23 +1208,23 @@ msgid "Tags"
 msgstr "Теги"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "Серія"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "Рейтинг"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "Опубліковано"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1211,7 +1233,8 @@ msgstr "Опубліковано"
 msgid "Publisher"
 msgstr "Видавець"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Мова"
 
@@ -1224,34 +1247,33 @@ msgid "No"
 msgstr "Ні"
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "Формат завантаження"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "переглянути книгу після редагування"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "Зберегти"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr ""
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "Книга буде видалена з БД Calibre"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr "і з диску"
 
 #: cps/templates/book_edit.html:209
@@ -1262,10 +1284,6 @@ msgstr "Ключове слово"
 msgid " Search keyword "
 msgstr " Пошук по ключовому слову"
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "Шукати"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "Натисніть на обкладинку, щоб отримати метадані"
@@ -1274,8 +1292,9 @@ msgstr "Натисніть на обкладинку, щоб отримати м
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "Закрити"
 
@@ -1296,7 +1315,7 @@ msgid "Library Configuration"
 msgstr "Налаштування бібліотеки"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Розташування БД Calibre"
 
 #: cps/templates/config_edit.html:25
@@ -1348,7 +1367,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "Розташування ключових слів SSL (залиште його порожнім для серверів, які не використовують SSL)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr ""
 
 #: cps/templates/config_edit.html:101
@@ -1371,10 +1390,6 @@ msgstr ""
 msgid "Logfile Configuration"
 msgstr "Logfile налаштування"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "Рівень логовання"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Розташування і назва логфайлу (calibre-web.log for no entry)"
@@ -1392,255 +1407,271 @@ msgid "Feature Configuration"
 msgstr "Особливі налаштування"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "Дозволити завантаження книг на сервер"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr "Дозволити анонімний перегляд"
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "Дозволити публічну реєстрацію"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "Включити віддалений логін (\"magic link\")"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "Отримати ключ API"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr ""
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr ""
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr ""
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr ""
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr ""
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Ім'я користувача"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "Переглянути налаштування"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Заголовок"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr "Кількість показаних випадкових книг"
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Тема"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "Стандартна тема"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "Regexp для ігнорування стовпців"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "Regexp для сортування по назві"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
+msgid "View Restrictions based on Calibre column"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Ні"
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "Regexp для сортування по назві"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "Налаштування по замовчуванню для нових користувачів"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "Керування сервером"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "Дозволити завантажувати з сервера"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "Дозволити завантаження на сервер"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "Дозволити редагування книг"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
-msgstr "Дозволити видалення книг"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
+msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "Дозволити зміну пароля"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "Дозволити редагування публічних книжкових полиць"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "Можливості за замовчуванням для нових користувачів"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "Показувати випадкові книги при перегляді деталей"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "Відкрити в браузері"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr ""
 
 #: cps/templates/detail.html:117
@@ -1651,9 +1682,9 @@ msgstr "Книга"
 msgid "of"
 msgstr "з"
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "Мова"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1676,21 +1707,9 @@ msgid "Add to shelf"
 msgstr "Додати на книжкову полицю"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "Редагувати метадані"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP-порт (зазвичай 25 для SMTP, 465 для SSL і 587 для STARTTLS)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "Шифрування"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "Ні"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr "STARTTLS"
@@ -1700,23 +1719,15 @@ msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "Пароль SMTP"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "Адрес відправника"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "Зберегти налаштування"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "Зберегти налаштування і відправити тестове повідомлення"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1732,28 +1743,32 @@ msgid "Enter domainname"
 msgstr ""
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "Далі"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
 msgstr ""
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "Огляд (випадкові книги)"
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr ""
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
+msgstr ""
 
 #: cps/templates/index.html:64
 msgid "Group by series"
@@ -1779,7 +1794,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "Останні книги"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "Випадковий список книг"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
@@ -1807,7 +1826,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "Загальні книжкові полиці"
 
@@ -1815,7 +1834,7 @@ msgstr "Загальні книжкові полиці"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Книги, організовані на публічних полицях, видимі всім"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "Ваші книжкові полиці"
 
@@ -1827,10 +1846,19 @@ msgstr "Власні полиці користувача, видимі тіль
 msgid "Home"
 msgstr ""
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "Назад"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "Включити навігацію"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "Розширений пошук"
@@ -1852,70 +1880,65 @@ msgstr "Вийти"
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "Завантаження..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
-msgstr "будь ласка, не перезавантажуйте сторінку"
+msgid "Please do not refresh the page"
+msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "Створити книжкову полицю"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "Деталі"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr ""
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "Ім'я користувача"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "Пароль"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "Запам'ятати мене"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "Увійдіть в систему за допомогою magic link"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1923,11 +1946,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr ""
 
 #: cps/templates/read.html:74
@@ -2039,51 +2086,51 @@ msgid "Basic txt Reader"
 msgstr "Засіб для читання txt-файлів"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "Зареєструвати нового користувача"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "Виберіть ім'я користувача"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr ""
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "Ваш email-адрес"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr ""
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr "Після цього ви автоматично ввійдете в систему на цьому пристрої."
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "Нічого не знайдено за запитом:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "Спробуйте змінити критерії пошук"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Результати для:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr "Дата публікації з"
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr "Дата публікації до"
 
 #: cps/templates/search_form.html:43
@@ -2107,11 +2154,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr ""
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr ""
 
 #: cps/templates/shelf.html:10
@@ -2127,23 +2174,23 @@ msgid "Change order"
 msgstr "Змінити порядок"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "Книжкова полиця буде остаточно видалена для всіх"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "зробити книжкову полицю доступною для всіх?"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "Перетягніть для змінення порядку"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Статистика бібліотеки Calibre"
 
 #: cps/templates/stats.html:12
@@ -2163,21 +2210,17 @@ msgid "Series in this Library"
 msgstr "Серій в цій бібліотеці"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "Встановлене ПЗ"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "Назва"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "Встановлена версія"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr ""
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr ""
@@ -2195,11 +2238,11 @@ msgid "Progress"
 msgstr ""
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr ""
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr ""
 
 #: cps/templates/tasks.html:24
@@ -2214,16 +2257,12 @@ msgstr ""
 msgid "Reset user Password"
 msgstr ""
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr "Електронний адрес Kindle"
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "Показувати книги на мовах"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "Показати всі"
 
 #: cps/templates/user_edit.html:52
@@ -2238,14 +2277,38 @@ msgstr ""
 msgid "Unlink"
 msgstr ""
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
+
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
 msgstr "Видалити цього користувача"
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr "Нещодавно переглянуті"
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+
 #~ msgid "kindlegen binary %(kindlepath)s not found"
 #~ msgstr "Бінарний %(kindlepath)s не знайдено "
 
@@ -2567,3 +2630,75 @@ msgstr "Нещодавно переглянуті"
 #~ msgid "Show access log"
 #~ msgstr ""
 
+#~ msgid "Tags for Mature Content"
+#~ msgstr ""
+
+#~ msgid "Show mature content"
+#~ msgstr ""
+
+#~ msgid "deny"
+#~ msgstr ""
+
+#~ msgid "allow"
+#~ msgstr ""
+
+#~ msgid "Kobo Set-up"
+#~ msgstr ""
+
+#~ msgid "Publisher list"
+#~ msgstr ""
+
+#~ msgid "Series list"
+#~ msgstr "Список серій"
+
+#~ msgid "Available languages"
+#~ msgstr "Доступні мови"
+
+#~ msgid "Category list"
+#~ msgstr "Список категорій"
+
+#~ msgid "Series id"
+#~ msgstr "Серія"
+
+#~ msgid "Submit"
+#~ msgstr "Зберегти"
+
+#~ msgid "Go!"
+#~ msgstr "Шукати"
+
+#~ msgid "Allow Delete books"
+#~ msgstr "Дозволити видалення книг"
+
+#~ msgid "language"
+#~ msgstr "Мова"
+
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP-порт (зазвичай 25 для SMTP, 465 для SSL і 587 для STARTTLS)"
+
+#~ msgid "From e-mail"
+#~ msgstr "Адрес відправника"
+
+#~ msgid "Save settings"
+#~ msgstr "Зберегти налаштування"
+
+#~ msgid "api_endpoint="
+#~ msgstr ""
+
+#~ msgid "please don't refresh the page"
+#~ msgstr "будь ласка, не перезавантажуйте сторінку"
+
+#~ msgid "E-mail address"
+#~ msgstr ""
+
+#~ msgid "No Results for:"
+#~ msgstr "Нічого не знайдено за запитом:"
+
+#~ msgid "Please try a different search"
+#~ msgstr "Спробуйте змінити критерії пошук"
+
+#~ msgid "Tasks list"
+#~ msgstr ""
+
+#~ msgid "Kindle E-Mail"
+#~ msgstr "Електронний адрес Kindle"
+
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index c12f5606..ef2bd99d 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 a57cf66f..280c3d76 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: 2017-01-06 17:00+0000\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -26,177 +26,186 @@ msgstr "已安装"
 msgid "not installed"
 msgstr "未安装"
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr "UI配置"
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中'"
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "此邮箱或昵称的账号已经存在。"
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr "编辑邮箱服务器设置"
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件出错了: %(res)s"
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr "已更新邮件服务器设置"
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr "找到一个已有账号使用这个邮箱。"
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请按确定并刷新页面"
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr "一般错误"
 
@@ -389,42 +398,50 @@ msgstr "Google Drive上找不到文件 %(file)s"
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr ""
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr "转换："
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr "上传："
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr "未知任务："
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -553,16 +570,20 @@ msgstr "书架 %(title)s 已被修改"
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"
@@ -580,19 +601,19 @@ msgid "Hot Books"
 msgstr "热门书籍"
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr "显示热门书籍"
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -601,7 +622,7 @@ msgid "Show read and unread"
 msgstr "显示已读和未读"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -617,7 +638,7 @@ msgstr "发现"
 msgid "Show random books"
 msgstr "显示随机书籍"
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr "分类"
 
@@ -626,7 +647,7 @@ msgid "Show category selection"
 msgstr "显示分类选择"
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr "丛书"
 
@@ -642,7 +663,7 @@ msgstr "作者"
 msgid "Show author selection"
 msgstr "显示作者选择"
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr "出版社"
 
@@ -651,6 +672,7 @@ msgid "Show publisher selection"
 msgstr "显示出版社选择"
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr "语言"
 
@@ -703,216 +725,201 @@ msgstr "一个新的更新可用。点击下面按钮更新到版本: %(version)
 msgid "Click on the button below to update to the latest stable version."
 msgstr "点击下面按钮更新到最新稳定版本。"
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr "最近添加的书籍"
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr "最高评分书籍"
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
-msgstr "随机书籍"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
+msgstr "发现(随机书籍)"
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
-msgstr "热门书籍(最多下载)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
+msgstr ""
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者: %(name)s"
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社： %(name)s"
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分: %(rating)s 星"
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式: %(format)s"
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr "出版社列表"
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr "丛书列表"
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr "可用语言"
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr "分类列表"
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr "任务"
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr "搜索"
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr "出版时晚于 "
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr "出版时早于 "
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr "搜索"
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经被成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr "请先配置您的kindle邮箱..."
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr "您的邮箱不能用来注册"
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr "这个用户名或者邮箱已经被使用。"
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "无法登录。LDAP服务器挂了，请联系您的管理员"
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您已以 '%(nickname)s' 登录"
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "打开电子书错误。文件不存在或者无法访问。"
 
@@ -927,23 +934,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen 因为错误 %(error)s 失败。消息： %(message)s"
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr "用户列表"
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr "昵称"
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr ""
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr ""
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -957,7 +967,7 @@ msgid "Download"
 msgstr "下载"
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr "查看电子书"
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -968,28 +978,32 @@ msgstr "上传"
 msgid "Edit"
 msgstr "编辑"
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr "SMTP邮件服务器设置"
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr "SMTP地址"
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr ""
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr "SMTP用户名"
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr "来自邮箱"
 
 #: cps/templates/admin.html:61
@@ -1001,63 +1015,71 @@ msgid "Configuration"
 msgstr "配置"
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr "Calibre DB目录"
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr "日志级别"
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr "每页书籍数"
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr "上传"
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr "匿名浏览"
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr "开放注册"
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr "远程登录"
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr "管理"
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr "查看日志文件"
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr "重新连接到Calibre数据库"
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr "重启 Calibre-Web"
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr "停止 Calibre-Web"
 
 #: cps/templates/admin.html:131
@@ -1077,7 +1099,7 @@ msgid "Current version"
 msgstr "当前版本"
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr "检查更新"
 
 #: cps/templates/admin.html:149
@@ -1085,30 +1107,29 @@ msgid "Perform Update"
 msgstr "执行更新"
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr "您确定要重启 Calibre-Web 吗？"
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr "确定"
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
-msgstr "后退"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
+msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭 Calibre-Web 吗？"
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
 #: cps/templates/author.html:15
@@ -1144,7 +1165,8 @@ msgid "Delete formats:"
 msgstr "删除格式:"
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr "删除"
 
@@ -1187,23 +1209,23 @@ msgid "Tags"
 msgstr "标签"
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
-msgstr "丛书ID"
+msgid "Series ID"
+msgstr ""
 
 #: cps/templates/book_edit.html:77
 msgid "Rating"
 msgstr "评分"
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr "封面URL(jpg,封面会被下载被保存在数据库中，然后字段会被重新清空)"
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr "从本地磁盘上传封面"
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr "出版日期"
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1212,7 +1234,8 @@ msgstr "出版日期"
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "语言"
 
@@ -1225,34 +1248,33 @@ msgid "No"
 msgstr ""
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr "上传格式"
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr "编辑后查看书籍"
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
-msgstr "提交"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
+msgstr ""
 
 #: cps/templates/book_edit.html:185
 msgid "Are you really sure?"
 msgstr "您真的确认？"
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr "书籍会被从Calibre数据库和硬盘中删除"
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr ""
 
 #: cps/templates/book_edit.html:209
@@ -1263,10 +1285,6 @@ msgstr "关键字"
 msgid " Search keyword "
 msgstr "搜索关键字"
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr "走起！"
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr "点击封面加载元数据到表单"
@@ -1275,8 +1293,9 @@ msgstr "点击封面加载元数据到表单"
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr "关闭"
 
@@ -1297,7 +1316,7 @@ msgid "Library Configuration"
 msgstr "书库配置"
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr "Calibre 数据库位置"
 
 #: cps/templates/config_edit.html:25
@@ -1349,8 +1368,8 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL Key文件位置(非SSL服务器请留空)"
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
-msgstr "更新频道"
+msgid "Update Channel"
+msgstr ""
 
 #: cps/templates/config_edit.html:101
 msgid "Stable"
@@ -1372,10 +1391,6 @@ msgstr "Nightly (自动)"
 msgid "Logfile Configuration"
 msgstr "日志文件配置"
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr "日志级别"
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "日志文件位置和名称(默认为calibre-web.log)"
@@ -1393,255 +1408,271 @@ msgid "Feature Configuration"
 msgstr "特性配置"
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr "启用上传"
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
-msgstr "启用匿名浏览"
+msgid "Enable Anonymous Browsing"
+msgstr ""
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr "启用注册"
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr "启用远程登录 ('魔法链接')"
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr "使用Goodreads"
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr "获取API Key"
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr "登录类型"
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr "使用标准认证"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr "使用LDAP认证"
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr "使用OAuth"
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr "LDAP服务器名称或IP地址"
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr "LDAP服务器端口"
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr ""
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
-msgstr "LDAP Admin用户名"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
+msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
-msgstr "LDAP Admin密码"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
+msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr "LDAP服务器使用SSL"
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr "LDAP服务器使用TLS"
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr "LDAP服务器证书"
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr "LDAP SSL证书路径"
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr "外部二进制"
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr "没有转换器"
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr "使用Kindlegen"
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr "使用calibre的电子书转换器"
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr "电子书转换设置"
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr "转换工具路径"
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr "Unrar二进制位置"
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "登录"
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr "查看配置"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "标题"
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
-msgstr "随机书籍显示数量"
-
 #: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+msgid "No. of Random Books to Display"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "主题"
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr "标准主题"
 
-#: cps/templates/config_view_edit.html:38
+#: cps/templates/config_view_edit.html:42
 msgid "caliBlur! Dark Theme"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_view_edit.html:46
+msgid "Regular Expression for Ignoring Columns"
 msgstr "忽略列的正则表达式"
 
-#: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr "链接 已读/未读 状态到Calibre栏"
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
-msgstr "标题排序的正则表达式"
-
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
-msgstr "成人内容标签"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr "无"
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
+msgstr "标题排序的正则表达式"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr "新用户默认设置"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr "管理用户"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr "允许下载"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr "允许上传"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr "允许编辑"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
 msgstr "允许删除书籍"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr "允许修改密码"
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr "允许编辑公共书架"
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr "新用户的默认显示权限"
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr "在详情页显示随机书籍"
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
-msgstr "显示成人内容"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
+msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr "在浏览器中阅读"
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr ""
 
 #: cps/templates/detail.html:117
@@ -1652,9 +1683,9 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: cps/templates/detail.html:123
-msgid "language"
-msgstr "语言"
+#: cps/templates/detail.html:165
+msgid "Published"
+msgstr ""
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
@@ -1677,21 +1708,9 @@ msgid "Add to shelf"
 msgstr "添加到书架"
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
+msgid "Edit Metadata"
 msgstr "编辑元数据"
 
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr "SMTP端口(无加密SMTP通常是25, SSL加密是465, STARTTLS加密是587)"
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr "加密方式"
-
-#: cps/templates/email_edit.html:21
-msgid "None"
-msgstr "无"
-
 #: cps/templates/email_edit.html:22
 msgid "STARTTLS"
 msgstr ""
@@ -1701,23 +1720,15 @@ msgid "SSL/TLS"
 msgstr ""
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
+msgid "SMTP Password"
 msgstr "SMTP密码"
 
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr "来自邮箱"
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
-msgstr "保存设置"
-
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr "保存设置并发送测试邮件"
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr "允许注册的域名"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1733,29 +1744,33 @@ msgid "Enter domainname"
 msgstr "输入域名"
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr "您确定要删除这条域名规则吗？"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr "下一个"
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr ""
+
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
+msgstr ""
+
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
 msgstr "创建issue"
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr "回到首页"
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
-msgstr "发现(随机书籍)"
-
 #: cps/templates/index.html:64
 msgid "Group by series"
 msgstr ""
@@ -1780,7 +1795,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr "最新书籍"
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr "随机书籍"
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
@@ -1808,7 +1827,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr "公开书架"
 
@@ -1816,7 +1835,7 @@ msgstr "公开书架"
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "公开书架中的书籍，对所有人都可见"
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr "您的书架"
 
@@ -1828,10 +1847,19 @@ msgstr "用户私有书架，只对当前用户本身可见"
 msgid "Home"
 msgstr "首页"
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr "后退"
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
 msgstr "切换导航"
 
+#: cps/templates/layout.html:45
+msgid "Search Library"
+msgstr ""
+
 #: cps/templates/layout.html:55
 msgid "Advanced Search"
 msgstr "高级搜索"
@@ -1853,70 +1881,65 @@ msgstr "注销"
 msgid "Register"
 msgstr "注册"
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr "上传中..."
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
+msgid "Please do not refresh the page"
 msgstr "请不要刷新页面"
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr "浏览"
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr "书籍详情"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr "错误"
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr "用户名"
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr "密码"
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr "记住我"
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr "通过魔法链接登录"
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1924,11 +1947,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr "Caliebre-Web电子书目录"
 
 #: cps/templates/read.html:74
@@ -2040,51 +2087,51 @@ msgid "Basic txt Reader"
 msgstr "简单txt阅读器"
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr "注册新用户"
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr "选择一个用户名"
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr "邮箱地址"
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr "您的邮箱地址"
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr ""
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
-msgstr "一旦您这样做了，您在这个设备上会自动登录。"
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr ""
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
-msgstr "找不到结果:"
+msgid "No Results Found"
+msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
-msgstr "请尝试别的关键字"
+msgid "Search Term:"
+msgstr ""
 
 #: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "结果:"
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr ""
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr ""
 
 #: cps/templates/search_form.html:43
@@ -2108,11 +2155,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr "评分大于"
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr "评分小于"
 
 #: cps/templates/shelf.html:10
@@ -2128,23 +2175,23 @@ msgid "Change order"
 msgstr "修改顺序"
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr "您真的想要删除这个书架吗？"
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr "书架将会永远丢失！"
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr "要公开此书架吗？"
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr "拖拽以重新排序"
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr "Calibre书库统计"
 
 #: cps/templates/stats.html:12
@@ -2164,21 +2211,17 @@ msgid "Series in this Library"
 msgstr "个丛书在此书库"
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr "链接库"
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr "程序库"
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr "已安装版本"
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr "任务列表"
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr "用户"
@@ -2196,11 +2239,11 @@ msgid "Progress"
 msgstr "进展"
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr "运行时间"
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr "开始时间"
 
 #: cps/templates/tasks.html:24
@@ -2215,16 +2258,12 @@ msgstr "隐藏所有任务"
 msgid "Reset user Password"
 msgstr "重置用户密码"
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr ""
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr "按语言显示书籍"
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr "显示全部"
 
 #: cps/templates/user_edit.html:52
@@ -2239,1436 +2278,128 @@ msgstr "链接"
 msgid "Unlink"
 msgstr "取消链接"
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
-msgstr "删除此用户"
-
-#: cps/templates/user_edit.html:138
-msgid "Recent Downloads"
-msgstr "最近下载"
-
-#~ msgid "Afar"
-#~ msgstr "阿法尔语"
-
-#~ msgid "Abkhazian"
-#~ msgstr "阿布哈兹语"
-
-#~ msgid "Achinese"
-#~ msgstr "亚齐语"
-
-#~ msgid "Acoli"
-#~ msgstr "阿乔利语"
-
-#~ msgid "Adangme"
-#~ msgstr "阿当梅语"
-
-#~ msgid "Adyghe"
-#~ msgstr "阿迪格语"
-
-#~ msgid "Afrihili"
-#~ msgstr "阿弗里希利语"
-
-#~ msgid "Afrikaans"
-#~ msgstr "南非荷兰语"
-
-#~ msgid "Ainu (Japan)"
-#~ msgstr "阿伊努语（日本）"
-
-#~ msgid "Akan"
-#~ msgstr "阿坎语"
-
-#~ msgid "Akkadian"
-#~ msgstr "阿卡德语"
-
-#~ msgid "Aleut"
-#~ msgstr "阿留申语"
-
-#~ msgid "Altai; Southern"
-#~ msgstr "阿尔泰语（南）"
-
-#~ msgid "Amharic"
-#~ msgstr "阿姆哈拉语"
-
-#~ msgid "English; Old (ca. 450-1100)"
-#~ msgstr "英语（上古，约 450-1100）"
-
-#~ msgid "Angika"
-#~ msgstr "安吉卡语"
-
-#~ msgid "Arabic"
-#~ msgstr "阿拉伯语"
-
-#~ msgid "Aramaic; Official (700-300 BCE)"
-#~ msgstr "阿拉米语（官方，公元前 700-300）"
-
-#~ msgid "Aragonese"
-#~ msgstr "阿拉贡语"
-
-#~ msgid "Mapudungun"
-#~ msgstr "阿劳坎语"
-
-#~ msgid "Arapaho"
-#~ msgstr "阿拉帕霍语"
-
-#~ msgid "Arawak"
-#~ msgstr "阿拉瓦克语"
-
-#~ msgid "Assamese"
-#~ msgstr "阿萨姆语"
-
-#~ msgid "Asturian"
-#~ msgstr "阿斯图里亚斯语"
-
-#~ msgid "Avaric"
-#~ msgstr "阿瓦尔语"
-
-#~ msgid "Avestan"
-#~ msgstr "阿维斯陀语"
-
-#~ msgid "Awadhi"
-#~ msgstr "阿瓦德语"
-
-#~ msgid "Aymara"
-#~ msgstr "艾马拉语"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "阿塞拜疆语"
-
-#~ msgid "Bashkir"
-#~ msgstr "巴什基尔语"
-
-#~ msgid "Baluchi"
-#~ msgstr "俾路支语"
-
-#~ msgid "Bambara"
-#~ msgstr "班巴拉语"
-
-#~ msgid "Balinese"
-#~ msgstr "巴厘语"
-
-#~ msgid "Basa (Cameroon)"
-#~ msgstr "巴萨语（喀麦隆）"
-
-#~ msgid "Beja"
-#~ msgstr "贝扎语"
-
-#~ msgid "Belarusian"
-#~ msgstr "白俄罗斯语"
-
-#~ msgid "Bemba (Zambia)"
-#~ msgstr "本巴语（赞比亚）"
-
-#~ msgid "Bengali"
-#~ msgstr "孟加拉语"
-
-#~ msgid "Bhojpuri"
-#~ msgstr "博杰普尔语"
-
-#~ msgid "Bikol"
-#~ msgstr "比科尔语"
-
-#~ msgid "Bini"
-#~ msgstr "比尼语"
-
-#~ msgid "Bislama"
-#~ msgstr "比斯拉马语"
-
-#~ msgid "Siksika"
-#~ msgstr "西克西卡语"
-
-#~ msgid "Tibetan"
-#~ msgstr "藏语"
-
-#~ msgid "Bosnian"
-#~ msgstr "波斯尼亚语"
-
-#~ msgid "Braj"
-#~ msgstr "布拉吉语"
-
-#~ msgid "Breton"
-#~ msgstr "布列塔尼语"
-
-#~ msgid "Buriat"
-#~ msgstr "布里亚特语"
-
-#~ msgid "Buginese"
-#~ msgstr "布吉语"
-
-#~ msgid "Bulgarian"
-#~ msgstr "保加利亚语"
-
-#~ msgid "Bilin"
-#~ msgstr "比林语"
-
-#~ msgid "Caddo"
-#~ msgstr "卡多语"
-
-#~ msgid "Carib; Galibi"
-#~ msgstr "加勒比语"
-
-#~ msgid "Catalan"
-#~ msgstr "加泰罗尼亚语"
-
-#~ msgid "Cebuano"
-#~ msgstr "宿务语"
-
-#~ msgid "Czech"
-#~ msgstr "捷克语"
-
-#~ msgid "Chamorro"
-#~ msgstr "查莫罗语"
-
-#~ msgid "Chibcha"
-#~ msgstr "奇布查语"
-
-#~ msgid "Chechen"
-#~ msgstr "车臣语"
-
-#~ msgid "Chagatai"
-#~ msgstr "察合台语"
-
-#~ msgid "Chuukese"
-#~ msgstr "丘克语"
-
-#~ msgid "Mari (Russia)"
-#~ msgstr "马里语（俄罗斯）"
-
-#~ msgid "Chinook jargon"
-#~ msgstr "奇努克混合语"
-
-#~ msgid "Choctaw"
-#~ msgstr "乔克托语"
-
-#~ msgid "Chipewyan"
-#~ msgstr "奇佩维安语"
-
-#~ msgid "Cherokee"
-#~ msgstr "切罗基语"
-
-#~ msgid "Slavonic; Old"
-#~ msgstr "斯拉夫语（古教会）"
-
-#~ msgid "Chuvash"
-#~ msgstr "楚瓦什语"
-
-#~ msgid "Cheyenne"
-#~ msgstr "夏延语"
-
-#~ msgid "Coptic"
-#~ msgstr "科普特语"
-
-#~ msgid "Cornish"
-#~ msgstr "康沃尔语"
-
-#~ msgid "Corsican"
-#~ msgstr "科西嘉语"
-
-#~ msgid "Cree"
-#~ msgstr "克里语"
-
-#~ msgid "Turkish; Crimean"
-#~ msgstr "鞑靼语（克里米亚）"
-
-#~ msgid "Kashubian"
-#~ msgstr "卡舒比语"
-
-#~ msgid "Welsh"
-#~ msgstr "威尔士语"
-
-#~ msgid "Dakota"
-#~ msgstr "达科他语"
-
-#~ msgid "Danish"
-#~ msgstr "丹麦语"
-
-#~ msgid "Dargwa"
-#~ msgstr "达尔格瓦语"
-
-#~ msgid "Delaware"
-#~ msgstr "特拉华语"
-
-#~ msgid "Slave (Athapascan)"
-#~ msgstr "史拉维语（阿沙巴斯甘）"
-
-#~ msgid "German"
-#~ msgstr "德语"
-
-#~ msgid "Dogrib"
-#~ msgstr "多格里布语"
-
-#~ msgid "Dinka"
-#~ msgstr "丁卡语"
-
-#~ msgid "Dhivehi"
-#~ msgstr "迪维希语"
-
-#~ msgid "Dogri (macrolanguage)"
-#~ msgstr "多格拉语"
-
-#~ msgid "Sorbian; Lower"
-#~ msgstr "索布语（下）"
-
-#~ msgid "Duala"
-#~ msgstr "杜亚拉语"
-
-#~ msgid "Dutch; Middle (ca. 1050-1350)"
-#~ msgstr "荷兰语（中古，约 1050-1350）"
-
-#~ msgid "Dyula"
-#~ msgstr "迪尤拉语"
-
-#~ msgid "Dzongkha"
-#~ msgstr "宗喀语"
-
-#~ msgid "Efik"
-#~ msgstr "埃菲克语"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
+msgstr ""
 
-#~ msgid "Egyptian (Ancient)"
-#~ msgstr "埃及语（古）"
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
 
-#~ msgid "Ekajuk"
-#~ msgstr "埃克丘克语"
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
 
-#~ msgid "Greek; Modern (1453-)"
-#~ msgstr "希腊语（现代，1453-）"
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
 
-#~ msgid "Elamite"
-#~ msgstr "埃兰语"
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
+msgstr "删除此用户"
 
-#~ msgid "English"
-#~ msgstr "英语"
+#: cps/templates/user_edit.html:144
+msgid "Recent Downloads"
+msgstr "最近下载"
 
-#~ msgid "English; Middle (1100-1500)"
-#~ msgstr "英语（中古，1100-1500）"
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
 
-#~ msgid "Esperanto"
-#~ msgstr "世界语"
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
 
-#~ msgid "Estonian"
-#~ msgstr "爱沙尼亚语"
+#~ msgid "deny"
+#~ msgstr ""
 
-#~ msgid "Basque"
-#~ msgstr "巴斯克语"
+#~ msgid "allow"
+#~ msgstr ""
 
-#~ msgid "Ewe"
-#~ msgstr "埃维语"
+#~ msgid "Best rated books"
+#~ msgstr "最高评分书籍"
 
-#~ msgid "Ewondo"
-#~ msgstr "埃翁多语"
+#~ msgid "Hot Books (most downloaded)"
+#~ msgstr "热门书籍(最多下载)"
 
-#~ msgid "Fang (Equatorial Guinea)"
-#~ msgstr "芳语（赤道几内亚）"
+#~ msgid "Publisher list"
+#~ msgstr "出版社列表"
 
-#~ msgid "Faroese"
-#~ msgstr "法罗语"
+#~ msgid "Series list"
+#~ msgstr "丛书列表"
 
-#~ msgid "Persian"
-#~ msgstr "波斯语"
+#~ msgid "Available languages"
+#~ msgstr "可用语言"
 
-#~ msgid "Fanti"
-#~ msgstr "芳蒂语"
+#~ msgid "Category list"
+#~ msgstr "分类列表"
 
-#~ msgid "Fijian"
-#~ msgstr "斐济语"
+#~ msgid "Series id"
+#~ msgstr "丛书ID"
 
-#~ msgid "Filipino"
-#~ msgstr "菲律宾语"
+#~ msgid "Submit"
+#~ msgstr "提交"
 
-#~ msgid "Finnish"
-#~ msgstr "芬兰语"
+#~ msgid "Go!"
+#~ msgstr "走起！"
 
-#~ msgid "Fon"
-#~ msgstr "丰语"
+#~ msgid "Update channel"
+#~ msgstr "更新频道"
 
-#~ msgid "French"
-#~ msgstr "法语"
+#~ msgid "Enable AnonymousBbrowsing"
+#~ msgstr "启用匿名浏览"
 
-#~ msgid "French; Middle (ca. 1400-1600)"
-#~ msgstr "法语（中古，约 1400-1600）"
+#~ msgid "LDAP Schema (LDAP or LDAPS)"
+#~ msgstr ""
 
-#~ msgid "French; Old (842-ca. 1400)"
-#~ msgstr "法语（上古，842-约 1400）"
+#~ msgid "LDAP Admin Username"
+#~ msgstr "LDAP Admin用户名"
 
-#~ msgid "Frisian; Northern"
-#~ msgstr "弗里西语（北）"
+#~ msgid "LDAP Admin Password"
+#~ msgstr "LDAP Admin密码"
 
-#~ msgid "Frisian; Eastern"
-#~ msgstr "弗里西亚语（东）"
+#~ msgid "No. of Random Books to Show"
+#~ msgstr "随机书籍显示数量"
 
-#~ msgid "Frisian; Western"
-#~ msgstr "弗里西亚语（西）"
+#~ msgid "Allow Book Viewer"
+#~ msgstr ""
 
-#~ msgid "Fulah"
-#~ msgstr "富拉语"
+#~ msgid "language"
+#~ msgstr "语言"
 
-#~ msgid "Friulian"
-#~ msgstr "弗留利语"
+#~ msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+#~ msgstr "SMTP端口(无加密SMTP通常是25, SSL加密是465, STARTTLS加密是587)"
 
-#~ msgid "Ga"
-#~ msgstr "加语"
+#~ msgid "From e-mail"
+#~ msgstr "来自邮箱"
 
-#~ msgid "Gayo"
-#~ msgstr "卡约语"
+#~ msgid "Save settings"
+#~ msgstr "保存设置"
 
-#~ msgid "Gbaya (Central African Republic)"
-#~ msgstr "巴亚语（中非共和国）"
+#~ msgid "api_endpoint="
+#~ msgstr ""
 
-#~ msgid "Geez"
-#~ msgstr "吉兹语"
+#~ msgid "E-mail address"
+#~ msgstr "邮箱地址"
 
-#~ msgid "Gilbertese"
-#~ msgstr "吉尔伯特语"
+#~ msgid "Use your other device, login and visit "
+#~ msgstr ""
 
-#~ msgid "Gaelic; Scottish"
-#~ msgstr "盖尔语（苏格兰）"
+#~ msgid "Once you do so, you will automatically get logged in on this device."
+#~ msgstr "一旦您这样做了，您在这个设备上会自动登录。"
 
-#~ msgid "Irish"
-#~ msgstr "爱尔兰语"
+#~ msgid "The link will expire after 10 minutes."
+#~ msgstr ""
 
-#~ msgid "Galician"
-#~ msgstr "加利西亚语"
+#~ msgid "No Results for:"
+#~ msgstr "找不到结果:"
 
-#~ msgid "Manx"
-#~ msgstr "马恩岛语"
+#~ msgid "Please try a different search"
+#~ msgstr "请尝试别的关键字"
 
-#~ msgid "German; Middle High (ca. 1050-1500)"
-#~ msgstr "德语（中古高地，约 1050-1500）"
+#~ msgid "Tasks list"
+#~ msgstr "任务列表"
 
-#~ msgid "German; Old High (ca. 750-1050)"
-#~ msgstr "德语（上古高地，约 750-1050）"
-
-#~ msgid "Gondi"
-#~ msgstr "贡德语"
-
-#~ msgid "Gorontalo"
-#~ msgstr "哥伦打洛语"
-
-#~ msgid "Gothic"
-#~ msgstr "哥特语"
-
-#~ msgid "Grebo"
-#~ msgstr "格列博语"
-
-#~ msgid "Greek; Ancient (to 1453)"
-#~ msgstr "希腊语（古典，直到 1453）"
-
-#~ msgid "Guarani"
-#~ msgstr "瓜拉尼语"
-
-#~ msgid "German; Swiss"
-#~ msgstr "德语（瑞士）"
-
-#~ msgid "Gujarati"
-#~ msgstr "古吉拉特语"
-
-#~ msgid "Gwichʼin"
-#~ msgstr "库臣语"
-
-#~ msgid "Haida"
-#~ msgstr "海达语"
-
-#~ msgid "Creole; Haitian"
-#~ msgstr "克里奥尔语（海地）"
-
-#~ msgid "Hausa"
-#~ msgstr "豪萨语"
-
-#~ msgid "Hawaiian"
-#~ msgstr "夏威夷语"
-
-#~ msgid "Hebrew"
-#~ msgstr "希伯来语"
-
-#~ msgid "Herero"
-#~ msgstr "赫雷罗语"
-
-#~ msgid "Hiligaynon"
-#~ msgstr "希利盖农语"
-
-#~ msgid "Hindi"
-#~ msgstr "印地语"
-
-#~ msgid "Hittite"
-#~ msgstr "赫梯语"
-
-#~ msgid "Hmong"
-#~ msgstr "苗语"
-
-#~ msgid "Hiri Motu"
-#~ msgstr "希里莫图语"
-
-#~ msgid "Croatian"
-#~ msgstr "克罗地亚语"
-
-#~ msgid "Sorbian; Upper"
-#~ msgstr "索布语（上）"
-
-#~ msgid "Hungarian"
-#~ msgstr "匈牙利语"
-
-#~ msgid "Hupa"
-#~ msgstr "胡帕语"
-
-#~ msgid "Armenian"
-#~ msgstr "亚美尼亚语"
-
-#~ msgid "Iban"
-#~ msgstr "伊班语"
-
-#~ msgid "Igbo"
-#~ msgstr "伊博语"
-
-#~ msgid "Ido"
-#~ msgstr "伊多语"
-
-#~ msgid "Yi; Sichuan"
-#~ msgstr "彝语（四川）"
-
-#~ msgid "Inuktitut"
-#~ msgstr "伊努伊特语"
-
-#~ msgid "Interlingue"
-#~ msgstr "国际语（西方）"
-
-#~ msgid "Iloko"
-#~ msgstr "伊洛卡诺语"
-
-#~ msgid "Interlingua (International Auxiliary Language Association)"
-#~ msgstr "国际语"
-
-#~ msgid "Indonesian"
-#~ msgstr "印尼语"
-
-#~ msgid "Ingush"
-#~ msgstr "印古什语"
-
-#~ msgid "Inupiaq"
-#~ msgstr "依努庇克语"
-
-#~ msgid "Icelandic"
-#~ msgstr "冰岛语"
-
-#~ msgid "Italian"
-#~ msgstr "意大利语"
-
-#~ msgid "Javanese"
-#~ msgstr "爪哇语"
-
-#~ msgid "Lojban"
-#~ msgstr "逻辑语"
-
-#~ msgid "Japanese"
-#~ msgstr "日语"
-
-#~ msgid "Judeo-Persian"
-#~ msgstr "犹太-波斯语"
-
-#~ msgid "Judeo-Arabic"
-#~ msgstr "犹太-阿拉伯语"
-
-#~ msgid "Kara-Kalpak"
-#~ msgstr "卡拉卡尔帕克语"
-
-#~ msgid "Kabyle"
-#~ msgstr "卡布列语"
-
-#~ msgid "Kachin"
-#~ msgstr "景颇语"
-
-#~ msgid "Kalaallisut"
-#~ msgstr "格陵兰语"
-
-#~ msgid "Kamba (Kenya)"
-#~ msgstr "坎巴语（肯尼亚）"
-
-#~ msgid "Kannada"
-#~ msgstr "卡纳达语"
-
-#~ msgid "Kashmiri"
-#~ msgstr "克什米尔语"
-
-#~ msgid "Georgian"
-#~ msgstr "格鲁吉亚语"
-
-#~ msgid "Kanuri"
-#~ msgstr "卡努里语"
-
-#~ msgid "Kawi"
-#~ msgstr "卡威语"
-
-#~ msgid "Kazakh"
-#~ msgstr "哈萨克语"
-
-#~ msgid "Kabardian"
-#~ msgstr "卡巴尔达语"
-
-#~ msgid "Khasi"
-#~ msgstr "卡西语"
-
-#~ msgid "Khmer; Central"
-#~ msgstr "高棉语"
-
-#~ msgid "Khotanese"
-#~ msgstr "和田语"
-
-#~ msgid "Kikuyu"
-#~ msgstr "基库尤语"
-
-#~ msgid "Kinyarwanda"
-#~ msgstr "基尼阿万达语"
-
-#~ msgid "Kirghiz"
-#~ msgstr "吉尔吉斯语"
-
-#~ msgid "Kimbundu"
-#~ msgstr "金本杜语"
-
-#~ msgid "Konkani (macrolanguage)"
-#~ msgstr "孔卡尼语"
-
-#~ msgid "Komi"
-#~ msgstr "科米语"
-
-#~ msgid "Kongo"
-#~ msgstr "刚果语"
-
-#~ msgid "Korean"
-#~ msgstr "朝鲜语"
-
-#~ msgid "Kosraean"
-#~ msgstr "科斯拉伊语"
-
-#~ msgid "Kpelle"
-#~ msgstr "克佩勒语"
-
-#~ msgid "Karachay-Balkar"
-#~ msgstr "卡拉恰伊-巴尔卡尔语"
-
-#~ msgid "Karelian"
-#~ msgstr "卡累利阿语"
-
-#~ msgid "Kurukh"
-#~ msgstr "库卢克语"
-
-#~ msgid "Kuanyama"
-#~ msgstr "宽亚玛语"
-
-#~ msgid "Kumyk"
-#~ msgstr "库梅克语"
-
-#~ msgid "Kurdish"
-#~ msgstr "库尔德语"
-
-#~ msgid "Kutenai"
-#~ msgstr "库特内语"
-
-#~ msgid "Ladino"
-#~ msgstr "拉迪诺语"
-
-#~ msgid "Lahnda"
-#~ msgstr "拉亨达语"
-
-#~ msgid "Lamba"
-#~ msgstr "兰巴语"
-
-#~ msgid "Lao"
-#~ msgstr "老挝语"
-
-#~ msgid "Latin"
-#~ msgstr "拉丁语"
-
-#~ msgid "Latvian"
-#~ msgstr "拉脱维亚语"
-
-#~ msgid "Lezghian"
-#~ msgstr "列兹金语"
-
-#~ msgid "Limburgan"
-#~ msgstr "林堡语"
-
-#~ msgid "Lingala"
-#~ msgstr "林加拉语"
-
-#~ msgid "Lithuanian"
-#~ msgstr "立陶宛语"
-
-#~ msgid "Mongo"
-#~ msgstr "芒戈语"
-
-#~ msgid "Lozi"
-#~ msgstr "洛齐语"
-
-#~ msgid "Luxembourgish"
-#~ msgstr "卢森堡语"
-
-#~ msgid "Luba-Lulua"
-#~ msgstr "卢巴-卢拉语"
-
-#~ msgid "Luba-Katanga"
-#~ msgstr "卢巴-加丹加语"
-
-#~ msgid "Ganda"
-#~ msgstr "干达语"
-
-#~ msgid "Luiseno"
-#~ msgstr "卢伊塞诺语"
-
-#~ msgid "Lunda"
-#~ msgstr "隆达语"
-
-#~ msgid "Luo (Kenya and Tanzania)"
-#~ msgstr "卢奥语（肯尼亚和坦桑尼亚）"
-
-#~ msgid "Lushai"
-#~ msgstr "卢萨语"
-
-#~ msgid "Madurese"
-#~ msgstr "马都拉语"
-
-#~ msgid "Magahi"
-#~ msgstr "摩揭陀语"
-
-#~ msgid "Marshallese"
-#~ msgstr "马绍尔语"
-
-#~ msgid "Maithili"
-#~ msgstr "米德勒语"
-
-#~ msgid "Makasar"
-#~ msgstr "望加锡语"
-
-#~ msgid "Malayalam"
-#~ msgstr "马拉雅拉姆语"
-
-#~ msgid "Mandingo"
-#~ msgstr "曼丁哥语"
-
-#~ msgid "Marathi"
-#~ msgstr "马拉地语"
-
-#~ msgid "Masai"
-#~ msgstr "马萨伊语"
-
-#~ msgid "Moksha"
-#~ msgstr "莫克沙语"
-
-#~ msgid "Mandar"
-#~ msgstr "曼达语"
-
-#~ msgid "Mende (Sierra Leone)"
-#~ msgstr "门德语（塞拉利昂）"
-
-#~ msgid "Irish; Middle (900-1200)"
-#~ msgstr "爱尔兰语（中古，900-1200）"
-
-#~ msgid "Mi'kmaq"
-#~ msgstr "米克马克语"
-
-#~ msgid "Minangkabau"
-#~ msgstr "米南卡保语"
-
-#~ msgid "Uncoded languages"
-#~ msgstr "未被编码的语言"
-
-#~ msgid "Macedonian"
-#~ msgstr "马其顿语"
-
-#~ msgid "Malagasy"
-#~ msgstr "马达加斯加语"
-
-#~ msgid "Maltese"
-#~ msgstr "马耳他语"
-
-#~ msgid "Manchu"
-#~ msgstr "满语"
-
-#~ msgid "Manipuri"
-#~ msgstr "曼尼普尔语"
-
-#~ msgid "Mohawk"
-#~ msgstr "莫霍克语"
-
-#~ msgid "Mongolian"
-#~ msgstr "蒙古语"
-
-#~ msgid "Mossi"
-#~ msgstr "莫西语"
-
-#~ msgid "Maori"
-#~ msgstr "毛利语"
-
-#~ msgid "Malay (macrolanguage)"
-#~ msgstr "马来语族"
-
-#~ msgid "Multiple languages"
-#~ msgstr "多种语言"
-
-#~ msgid "Creek"
-#~ msgstr "克里克语"
-
-#~ msgid "Mirandese"
-#~ msgstr "米兰德斯语"
-
-#~ msgid "Marwari"
-#~ msgstr "马尔瓦利语"
-
-#~ msgid "Burmese"
-#~ msgstr "缅甸语"
-
-#~ msgid "Erzya"
-#~ msgstr "厄尔兹亚语"
-
-#~ msgid "Neapolitan"
-#~ msgstr "拿坡里语"
-
-#~ msgid "Nauru"
-#~ msgstr "瑙鲁语"
-
-#~ msgid "Navajo"
-#~ msgstr "纳瓦霍语"
-
-#~ msgid "Ndebele; South"
-#~ msgstr "恩德贝勒语（南）"
-
-#~ msgid "Ndebele; North"
-#~ msgstr "恩德贝勒语（北）"
-
-#~ msgid "Ndonga"
-#~ msgstr "恩敦加语"
-
-#~ msgid "German; Low"
-#~ msgstr "撒克逊语（低地）"
-
-#~ msgid "Nepali"
-#~ msgstr "尼泊尔语"
-
-#~ msgid "Bhasa; Nepal"
-#~ msgstr "尼瓦尔语"
-
-#~ msgid "Nias"
-#~ msgstr "尼亚斯语"
-
-#~ msgid "Niuean"
-#~ msgstr "纽埃语"
-
-#~ msgid "Dutch"
-#~ msgstr "荷兰语"
-
-#~ msgid "Norwegian Nynorsk"
-#~ msgstr "新挪威语"
-
-#~ msgid "Norwegian Bokmål"
-#~ msgstr "挪威布克莫尔语"
-
-#~ msgid "Nogai"
-#~ msgstr "诺盖语"
-
-#~ msgid "Norse; Old"
-#~ msgstr "诺尔斯语（古）"
-
-#~ msgid "Norwegian"
-#~ msgstr "挪威语"
-
-#~ msgid "N'Ko"
-#~ msgstr "西非书面语言字母"
-
-#~ msgid "Sotho; Northern"
-#~ msgstr "索托语（北）"
-
-#~ msgid "Newari; Old"
-#~ msgstr "尼瓦尔语（古典）"
-
-#~ msgid "Nyanja"
-#~ msgstr "尼扬贾语"
-
-#~ msgid "Nyamwezi"
-#~ msgstr "尼扬韦齐语"
-
-#~ msgid "Nyankole"
-#~ msgstr "尼扬科勒语"
-
-#~ msgid "Nyoro"
-#~ msgstr "尼奥罗语"
-
-#~ msgid "Nzima"
-#~ msgstr "恩济马语"
-
-#~ msgid "Occitan (post 1500)"
-#~ msgstr "奥克西唐语（1500 后）"
-
-#~ msgid "Ojibwa"
-#~ msgstr "奥吉布瓦语"
-
-#~ msgid "Oriya"
-#~ msgstr "奥利亚语"
-
-#~ msgid "Oromo"
-#~ msgstr "奥罗莫语"
-
-#~ msgid "Osage"
-#~ msgstr "奥萨格语"
-
-#~ msgid "Ossetian"
-#~ msgstr "奥塞梯语"
-
-#~ msgid "Turkish; Ottoman (1500-1928)"
-#~ msgstr "土耳其语（奥斯曼，1500-1928）"
-
-#~ msgid "Pangasinan"
-#~ msgstr "邦阿西楠语"
-
-#~ msgid "Pahlavi"
-#~ msgstr "钵罗钵语"
-
-#~ msgid "Pampanga"
-#~ msgstr "邦板牙语"
-
-#~ msgid "Panjabi"
-#~ msgstr "旁遮普语"
-
-#~ msgid "Papiamento"
-#~ msgstr "帕皮亚门托语"
-
-#~ msgid "Palauan"
-#~ msgstr "帕劳语"
-
-#~ msgid "Persian; Old (ca. 600-400 B.C.)"
-#~ msgstr "波斯语（古，公元前约 600-400）"
-
-#~ msgid "Phoenician"
-#~ msgstr "腓尼基语"
-
-#~ msgid "Pali"
-#~ msgstr "巴利语"
-
-#~ msgid "Polish"
-#~ msgstr "波兰语"
-
-#~ msgid "Pohnpeian"
-#~ msgstr "波纳佩语"
-
-#~ msgid "Portuguese"
-#~ msgstr "葡萄牙语"
-
-#~ msgid "Provençal; Old (to 1500)"
-#~ msgstr "普罗旺斯语（古，至 1500）"
-
-#~ msgid "Pushto"
-#~ msgstr "普什图语"
-
-#~ msgid "Quechua"
-#~ msgstr "克丘亚语"
-
-#~ msgid "Rajasthani"
-#~ msgstr "拉贾斯坦语"
-
-#~ msgid "Rapanui"
-#~ msgstr "拉帕努伊语"
-
-#~ msgid "Maori; Cook Islands"
-#~ msgstr "拉罗汤加语"
-
-#~ msgid "Romansh"
-#~ msgstr "罗曼什语"
-
-#~ msgid "Romany"
-#~ msgstr "罗姆语"
-
-#~ msgid "Romanian"
-#~ msgstr "罗马尼亚语"
-
-#~ msgid "Rundi"
-#~ msgstr "基隆迪语"
-
-#~ msgid "Romanian; Macedo-"
-#~ msgstr "阿罗马尼亚语"
-
-#~ msgid "Russian"
-#~ msgstr "俄语"
-
-#~ msgid "Sandawe"
-#~ msgstr "桑达韦语"
-
-#~ msgid "Sango"
-#~ msgstr "桑戈语"
-
-#~ msgid "Yakut"
-#~ msgstr "雅库特语"
-
-#~ msgid "Aramaic; Samaritan"
-#~ msgstr "阿拉米语（萨马利亚）"
-
-#~ msgid "Sanskrit"
-#~ msgstr "梵语"
-
-#~ msgid "Sasak"
-#~ msgstr "萨萨克语"
-
-#~ msgid "Santali"
-#~ msgstr "桑塔利语"
-
-#~ msgid "Sicilian"
-#~ msgstr "西西里语"
-
-#~ msgid "Scots"
-#~ msgstr "苏格兰语"
-
-#~ msgid "Selkup"
-#~ msgstr "塞尔库普语"
-
-#~ msgid "Irish; Old (to 900)"
-#~ msgstr "爱尔兰语（古，至 900）"
-
-#~ msgid "Shan"
-#~ msgstr "掸语"
-
-#~ msgid "Sidamo"
-#~ msgstr "锡达莫语"
-
-#~ msgid "Sinhala"
-#~ msgstr "僧加罗语"
-
-#~ msgid "Slovak"
-#~ msgstr "斯洛伐克语"
-
-#~ msgid "Slovenian"
-#~ msgstr "斯洛文尼亚语"
-
-#~ msgid "Sami; Southern"
-#~ msgstr "萨米语（南）"
-
-#~ msgid "Sami; Northern"
-#~ msgstr "萨米语（北）"
-
-#~ msgid "Lule Sami"
-#~ msgstr "律勒欧-萨米语"
-
-#~ msgid "Sami; Inari"
-#~ msgstr "伊纳里-萨米语"
-
-#~ msgid "Samoan"
-#~ msgstr "萨摩亚语"
-
-#~ msgid "Sami; Skolt"
-#~ msgstr "斯科特-萨米语"
-
-#~ msgid "Shona"
-#~ msgstr "修纳语"
-
-#~ msgid "Sindhi"
-#~ msgstr "信德语"
-
-#~ msgid "Soninke"
-#~ msgstr "索宁克语"
-
-#~ msgid "Sogdian"
-#~ msgstr "粟特语"
-
-#~ msgid "Somali"
-#~ msgstr "索马里语"
-
-#~ msgid "Sotho; Southern"
-#~ msgstr "索托语（南）"
-
-#~ msgid "Spanish"
-#~ msgstr "西班牙语"
-
-#~ msgid "Albanian"
-#~ msgstr "阿尔巴尼亚语"
-
-#~ msgid "Sardinian"
-#~ msgstr "撒丁语"
-
-#~ msgid "Sranan Tongo"
-#~ msgstr "苏里南汤加语"
-
-#~ msgid "Serbian"
-#~ msgstr "塞尔维亚语"
-
-#~ msgid "Serer"
-#~ msgstr "塞雷尔语"
-
-#~ msgid "Swati"
-#~ msgstr "斯瓦特语"
-
-#~ msgid "Sukuma"
-#~ msgstr "苏库马语"
-
-#~ msgid "Sundanese"
-#~ msgstr "巽他语"
-
-#~ msgid "Susu"
-#~ msgstr "苏苏语"
-
-#~ msgid "Sumerian"
-#~ msgstr "苏美尔语"
-
-#~ msgid "Swahili (macrolanguage)"
-#~ msgstr "斯瓦希里语族"
-
-#~ msgid "Swedish"
-#~ msgstr "瑞典语"
-
-#~ msgid "Syriac; Classical"
-#~ msgstr "叙利亚语（古典）"
-
-#~ msgid "Syriac"
-#~ msgstr "古叙利亚语"
-
-#~ msgid "Tahitian"
-#~ msgstr "塔希提语"
-
-#~ msgid "Tamil"
-#~ msgstr "泰米尔语"
-
-#~ msgid "Tatar"
-#~ msgstr "塔塔尔语"
-
-#~ msgid "Telugu"
-#~ msgstr "泰卢固语"
-
-#~ msgid "Timne"
-#~ msgstr "滕内语"
-
-#~ msgid "Tereno"
-#~ msgstr "特列纳语"
-
-#~ msgid "Tetum"
-#~ msgstr "特塔姆语"
-
-#~ msgid "Tajik"
-#~ msgstr "塔吉克语"
-
-#~ msgid "Tagalog"
-#~ msgstr "塔加洛语"
-
-#~ msgid "Thai"
-#~ msgstr "泰语"
-
-#~ msgid "Tigre"
-#~ msgstr "提格雷语"
-
-#~ msgid "Tigrinya"
-#~ msgstr "提格里尼亚语"
-
-#~ msgid "Tiv"
-#~ msgstr "蒂夫语"
-
-#~ msgid "Tokelau"
-#~ msgstr "托克劳语"
-
-#~ msgid "Klingon"
-#~ msgstr "克林贡语"
-
-#~ msgid "Tlingit"
-#~ msgstr "特林吉特语"
-
-#~ msgid "Tamashek"
-#~ msgstr "塔马舍克语"
-
-#~ msgid "Tonga (Nyasa)"
-#~ msgstr "汤加语 (尼亚萨)"
-
-#~ msgid "Tonga (Tonga Islands)"
-#~ msgstr "汤加语（汤加岛）"
-
-#~ msgid "Tok Pisin"
-#~ msgstr "托克皮辛语"
-
-#~ msgid "Tsimshian"
-#~ msgstr "钦西安语"
-
-#~ msgid "Tswana"
-#~ msgstr "茨瓦纳语"
-
-#~ msgid "Tsonga"
-#~ msgstr "聪加语"
-
-#~ msgid "Turkmen"
-#~ msgstr "土库曼语"
-
-#~ msgid "Tumbuka"
-#~ msgstr "奇图姆布卡语"
-
-#~ msgid "Turkish"
-#~ msgstr "土耳其语"
-
-#~ msgid "Tuvalu"
-#~ msgstr "图瓦卢语"
-
-#~ msgid "Twi"
-#~ msgstr "契维语"
-
-#~ msgid "Tuvinian"
-#~ msgstr "图瓦语"
-
-#~ msgid "Udmurt"
-#~ msgstr "乌德穆尔特语"
-
-#~ msgid "Ugaritic"
-#~ msgstr "乌加里特语"
-
-#~ msgid "Uighur"
-#~ msgstr "维吾尔语"
-
-#~ msgid "Ukrainian"
-#~ msgstr "乌克兰语"
-
-#~ msgid "Umbundu"
-#~ msgstr "翁本杜语"
-
-#~ msgid "Undetermined"
-#~ msgstr "未确定的语言"
-
-#~ msgid "Urdu"
-#~ msgstr "乌尔都语"
-
-#~ msgid "Uzbek"
-#~ msgstr "乌兹别克语"
-
-#~ msgid "Vai"
-#~ msgstr "瓦伊语"
-
-#~ msgid "Venda"
-#~ msgstr "文达语"
-
-#~ msgid "Vietnamese"
-#~ msgstr "越南语"
-
-#~ msgid "Volapük"
-#~ msgstr "沃拉普克语"
-
-#~ msgid "Votic"
-#~ msgstr "沃提克语"
-
-#~ msgid "Wolaytta"
-#~ msgstr "瓦拉莫语"
-
-#~ msgid "Waray (Philippines)"
-#~ msgstr "瓦赖语（菲律宾）"
-
-#~ msgid "Washo"
-#~ msgstr "瓦肖语"
-
-#~ msgid "Walloon"
-#~ msgstr "瓦龙语"
-
-#~ msgid "Wolof"
-#~ msgstr "沃洛夫语"
-
-#~ msgid "Kalmyk"
-#~ msgstr "卡尔梅克语"
-
-#~ msgid "Xhosa"
-#~ msgstr "科萨语"
-
-#~ msgid "Yao"
-#~ msgstr "瑶语"
-
-#~ msgid "Yapese"
-#~ msgstr "雅浦语"
-
-#~ msgid "Yiddish"
-#~ msgstr "依地语"
-
-#~ msgid "Yoruba"
-#~ msgstr "约鲁巴语"
-
-#~ msgid "Zapotec"
-#~ msgstr "萨波特克语"
-
-#~ msgid "Blissymbols"
-#~ msgstr "布利斯符号"
-
-#~ msgid "Zenaga"
-#~ msgstr "哲纳加语"
-
-#~ msgid "Zhuang"
-#~ msgstr "壮语"
-
-#~ msgid "Chinese"
-#~ msgstr "中文"
-
-#~ msgid "Zulu"
-#~ msgstr "祖鲁语"
-
-#~ msgid "Zuni"
-#~ msgstr "祖尼语"
-
-#~ msgid "No linguistic content"
-#~ msgstr ""
-
-#~ msgid "Zaza"
-#~ msgstr "扎扎其语"
-
-#~ msgid "Failed to create path for cover %(path)s (Permission denied)."
-#~ msgstr ""
-
-#~ msgid "Failed to store cover-file %(cover)s."
-#~ msgstr ""
-
-#~ msgid "Cover-file is not a valid image file"
-#~ msgstr ""
-
-#~ msgid "Cover is not a jpg file, can't save"
-#~ msgstr "封面不是一个jpg文件，无法保存"
-
-#~ msgid "Preparing document for printing..."
-#~ msgstr ""
-
-#~ msgid "Using your another device, visit"
-#~ msgstr "使用您的另一个设备访问"
-
-#~ msgid "and log in"
-#~ msgstr "和登录"
-
-#~ msgid "Using your another device, login and visit "
-#~ msgstr ""
-
-#~ msgid "Newest Books"
-#~ msgstr "最新书籍"
-
-#~ msgid "Oldest Books"
-#~ msgstr "最旧书籍"
-
-#~ msgid "Books (A-Z)"
-#~ msgstr "书籍 (A-Z)"
-
-#~ msgid "Books (Z-A)"
-#~ msgstr "书籍 (Z-A)"
-
-#~ msgid "Error opening eBook. Fileformat is not supported."
-#~ msgstr ""
-
-#~ msgid "File %(title)s"
-#~ msgstr ""
-
-#~ msgid "Show sorted books"
-#~ msgstr "显示已排序书籍"
-
-#~ msgid "Sorted Books"
-#~ msgstr "已排序书籍"
-
-#~ msgid "Sort By"
-#~ msgstr "排序"
-
-#~ msgid "Newest"
-#~ msgstr "最新"
-
-#~ msgid "Oldest"
-#~ msgstr "最旧"
-
-#~ msgid "Ascending"
-#~ msgstr "升序"
-
-#~ msgid "Descending"
-#~ msgstr "降序"
-
-#~ msgid "PDF.js viewer"
-#~ msgstr "PDF.js 查看器"
-
-#~ msgid "Please enter a LDAP provider and a DN"
-#~ msgstr ""
-
-#~ msgid "successfully deleted shelf %(name)s"
-#~ msgstr "成功删除书架 %(name)s"
-
-#~ msgid "LDAP Provider URL"
+#~ msgid "Kindle E-Mail"
 #~ msgstr ""
 
-#~ msgid "Register with %s, "
-#~ msgstr ""
-
-#~ msgid "Import of optional Google Drive requirements missing"
-#~ msgstr "可选的Google Drive依赖导入缺失"
-
-#~ msgid "client_secrets.json is missing or not readable"
-#~ msgstr "client_secrets.json文件缺失或不可读"
-
-#~ msgid "client_secrets.json is not configured for web application"
-#~ msgstr "没有为web应用配置client_secrets.json"
-
-#~ msgid "Keyfile location is not valid, please enter correct path"
-#~ msgstr "key文件位置无效，请输入正确路径"
-
-#~ msgid "Certfile location is not valid, please enter correct path"
-#~ msgstr "证书文件位置无效，请输入正确路径"
-
-#~ msgid "Please enter a LDAP provider, port, DN and user object identifier"
-#~ msgstr ""
-
-#~ msgid "Please enter a LDAP service account and password"
-#~ msgstr ""
-
-#~ msgid "Please enter Github oauth credentials"
-#~ msgstr ""
-
-#~ msgid "Please enter Google oauth credentials"
-#~ msgstr ""
-
-#~ msgid "Logfile location is not valid, please enter correct path"
-#~ msgstr "日志文件位置无效，请输入正确路径"
-
-#~ msgid "Access Logfile location is not valid, please enter correct path"
-#~ msgstr ""
-
-#~ msgid "DB location is not valid, please enter correct path"
-#~ msgstr "DB位置无效，请输入正确路径"
-
-#~ msgid "Excecution permissions missing"
-#~ msgstr "可执行权限缺失"
-
-#~ msgid "not configured"
-#~ msgstr "未配置"
-
-#~ msgid "Error excecuting UnRar"
-#~ msgstr "执行UnRar时出错"
-
-#~ msgid "Unrar binary file not found"
-#~ msgstr "找不到Unrar二进制文件"
-
-#~ msgid "Use GitHub OAuth"
-#~ msgstr ""
-
-#~ msgid "Use Google OAuth"
-#~ msgstr ""
-
-#~ msgid "Obtain GitHub OAuth Credential"
-#~ msgstr ""
-
-#~ msgid "GitHub OAuth Client Id"
-#~ msgstr ""
-
-#~ msgid "GitHub OAuth Client Secret"
-#~ msgstr ""
-
-#~ msgid "Obtain Google OAuth Credential"
-#~ msgstr ""
-
-#~ msgid "Google OAuth Client Id"
-#~ msgstr ""
-
-#~ msgid "Google OAuth Client Secret"
-#~ msgstr ""
-
-#~ msgid "Use"
-#~ msgstr "使用"
-
-#~ msgid "Play / pause"
-#~ msgstr "播放 / 暂停"
-
-#~ msgid "volume"
-#~ msgstr "音量"
-
-#~ msgid "unknown"
-#~ msgstr "未知"
-
-#~ msgid "New Books"
-#~ msgstr "新书"
-
-#~ msgid "Show Calibre-Web log"
-#~ msgstr "显示Calibre-Web日志"
-
-#~ msgid "Show access log"
-#~ msgstr "显示访问日志"
-
diff --git a/cps/ub.py b/cps/ub.py
index ac43b89f..21dc6e3c 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -57,12 +57,12 @@ def get_sidebar_config(kwargs=None):
                     "visibility": constants.SIDEBAR_RECENT, 'public': True, "page": "root",
                     "show_text": _('Show recent books'), "config_show":True})
     sidebar.append({"glyph": "glyphicon-fire", "text": _('Hot Books'), "link": 'web.books_list', "id": "hot",
-                    "visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot", "show_text": _('Show hot books'),
+                    "visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot", "show_text": _('Show Hot Books'),
                     "config_show":True})
     sidebar.append(
-        {"glyph": "glyphicon-star", "text": _('Best rated Books'), "link": 'web.books_list', "id": "rated",
+        {"glyph": "glyphicon-star", "text": _('Top Rated Books'), "link": 'web.books_list', "id": "rated",
          "visibility": constants.SIDEBAR_BEST_RATED, 'public': True, "page": "rated",
-         "show_text": _('Show best rated books'), "config_show":True})
+         "show_text": _('Show Top Rated Books'), "config_show":True})
     sidebar.append({"glyph": "glyphicon-eye-open", "text": _('Read Books'), "link": 'web.books_list', "id": "read",
                     "visibility": constants.SIDEBAR_READ_AND_UNREAD, 'public': (not g.user.is_anonymous), "page": "read",
                     "show_text": _('Show read and unread'), "config_show": content})
diff --git a/cps/web.py b/cps/web.py
index 56e17d2e..35cc5d97 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -505,7 +505,7 @@ def books_list(data, sort, book_id, page):
             entries, random, pagination = fill_indexpage(page, db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
                                                          order)
             return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                         id=book_id, title=_(u"Best rated books"), page="rated")
+                                         id=book_id, title=_(u"Top Rated Books"), page="rated")
         else:
             abort(404)
     elif data == "discover":
@@ -513,7 +513,7 @@ def books_list(data, sort, book_id, page):
             entries, __, pagination = fill_indexpage(page, db.Books, True, [func.randomblob(2)])
             pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
             return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
-                                         title=_(u"Random Books"), page="discover")
+                                         title=_(u"Discover (Random Books)"), page="discover")
         else:
             abort(404)
     elif data == "unread":
@@ -566,7 +566,7 @@ def render_hot_books(page):
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (most downloaded)"), page="hot")
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
     else:
         abort(404)
 
@@ -577,7 +577,7 @@ def render_author_books(page, author_id, order):
                                              [order[0], db.Series.name, db.Books.series_index],
                                              db.books_series_link, db.Series)
     if entries is None or not len(entries):
-        flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
         return redirect(url_for("web.index"))
 
     author = db.session.query(db.Authors).get(author_id)
@@ -680,7 +680,7 @@ def author_list():
         for entry in entries:
             entry.Authors.name = entry.Authors.name.replace('|', ',')
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=u"Author list", page="authorlist", data='author')
+                                     title=u"Authors", page="authorlist", data='author')
     else:
         abort(404)
 
@@ -696,7 +696,7 @@ def publisher_list():
             .join(db.books_publishers_link).join(db.Books).filter(common_filters()) \
             .group_by(func.upper(func.substr(db.Publishers.name,1,1))).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=_(u"Publisher list"), page="publisherlist", data="publisher")
+                                     title=_(u"Publishers"), page="publisherlist", data="publisher")
     else:
         abort(404)
 
@@ -712,7 +712,7 @@ def series_list():
             .join(db.books_series_link).join(db.Books).filter(common_filters()) \
             .group_by(func.upper(func.substr(db.Series.sort,1,1))).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=_(u"Series list"), page="serieslist", data="series")
+                                     title=_(u"Series"), page="serieslist", data="series")
     else:
         abort(404)
 
@@ -767,7 +767,7 @@ def language_overview():
                                         func.count('books_languages_link.book').label('bookcount')).group_by(
             text('books_languages_link.lang_code')).all()
         return render_title_template('languages.html', languages=languages, lang_counter=lang_counter,
-                                     charlist=charlist, title=_(u"Available languages"), page="langlist",
+                                     charlist=charlist, title=_(u"Languages"), page="langlist",
                                      data="language")
     else:
         abort(404)
@@ -784,7 +784,7 @@ def category_list():
             .join(db.books_tags_link).join(db.Books).filter(common_filters()) \
             .group_by(func.upper(func.substr(db.Tags.name,1,1))).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=_(u"Category list"), page="catlist", data="category")
+                                     title=_(u"Categories"), page="catlist", data="category")
     else:
         abort(404)
 
diff --git a/messages.pot b/messages.pot
index 6daee03e..e77b1411 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: 2020-02-23 10:55+0100\n"
+"POT-Creation-Date: 2020-02-23 20:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,177 +25,186 @@ msgstr ""
 msgid "not installed"
 msgstr ""
 
-#: cps/about.py:84
+#: cps/about.py:87
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:88
+#: cps/admin.py:89
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:90
+#: cps/admin.py:91
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:109 cps/editbooks.py:410 cps/editbooks.py:419
+#: cps/admin.py:110 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
 #: cps/updater.py:456 cps/uploader.py:96 cps/uploader.py:107
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:128
+#: cps/admin.py:129
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:147 cps/templates/admin.html:115
+#: cps/admin.py:151
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:184 cps/admin.py:411
+#: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:441 cps/templates/admin.html:114
+#: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
+#: cps/templates/modal_restriction.html:29
+msgid "Deny"
+msgstr ""
+
+#: cps/admin.py:436 cps/admin.py:442 cps/admin.py:453 cps/admin.py:464
+#: cps/templates/modal_restriction.html:28
+msgid "Allow"
+msgstr ""
+
+#: cps/admin.py:667
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:464 cps/web.py:1092
+#: cps/admin.py:691 cps/web.py:1089
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
-#: cps/templates/admin.html:38
+#: cps/admin.py:694 cps/admin.py:706 cps/admin.py:712 cps/admin.py:730
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:475 cps/web.py:1317
+#: cps/admin.py:703 cps/web.py:1318
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:481 cps/admin.py:492
+#: cps/admin.py:710 cps/admin.py:725
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:488
+#: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:508
+#: cps/admin.py:740
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/admin.py:534
+#: cps/admin.py:766
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:537
+#: cps/admin.py:769
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:539
+#: cps/admin.py:771
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:541
+#: cps/admin.py:773
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:570
+#: cps/admin.py:803
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:573
+#: cps/admin.py:806
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:611 cps/web.py:1358
+#: cps/admin.py:842 cps/web.py:1361
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#: cps/admin.py:852 cps/admin.py:867 cps/admin.py:887 cps/web.py:1336
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:621 cps/web.py:1326
+#: cps/admin.py:858 cps/web.py:1328
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:636
+#: cps/admin.py:874
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:639
+#: cps/admin.py:877
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/admin.py:656
+#: cps/admin.py:900
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+#: cps/admin.py:903 cps/web.py:1114 cps/web.py:1170
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:662 cps/web.py:1058
+#: cps/admin.py:906 cps/web.py:1055
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:674
+#: cps/admin.py:918
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:957
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:714
+#: cps/admin.py:958
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:715
+#: cps/admin.py:959
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:716
+#: cps/admin.py:960
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:717
+#: cps/admin.py:961
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:718
+#: cps/admin.py:962
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:719
+#: cps/admin.py:963
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+#: cps/admin.py:964 cps/admin.py:965 cps/admin.py:966 cps/admin.py:967
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+#: cps/admin.py:964 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+#: cps/admin.py:965 cps/updater.py:284 cps/updater.py:471
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+#: cps/admin.py:966 cps/updater.py:286 cps/updater.py:473
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+#: cps/admin.py:967 cps/updater.py:288 cps/updater.py:475
 msgid "General error"
 msgstr ""
 
@@ -388,42 +397,50 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:643
+#: cps/helper.py:657
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:645
+#: cps/helper.py:659
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:647
+#: cps/helper.py:661
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:649
+#: cps/helper.py:663
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:665
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:656
+#: cps/helper.py:670
 msgid "E-mail: "
 msgstr ""
 
-#: cps/helper.py:658 cps/helper.py:662
+#: cps/helper.py:672 cps/helper.py:676
 msgid "Convert: "
 msgstr ""
 
-#: cps/helper.py:660
+#: cps/helper.py:674
 msgid "Upload: "
 msgstr ""
 
-#: cps/helper.py:664
+#: cps/helper.py:678
 msgid "Unknown Task: "
 msgstr ""
 
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr ""
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:150
+msgid "Kobo Setup"
+msgstr ""
+
 #: cps/oauth_bb.py:74
 #, python-format
 msgid "Register with %(provider)s"
@@ -552,16 +569,20 @@ msgstr ""
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:299
+#: cps/shelf.py:301
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:302
+#: cps/shelf.py:304
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/shelf.py:336
+#: cps/shelf.py:342
+msgid "Hidden Book"
+msgstr ""
+
+#: cps/shelf.py:347
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
@@ -579,19 +600,19 @@ msgid "Hot Books"
 msgstr ""
 
 #: cps/ub.py:60
-msgid "Show hot books"
+msgid "Show Hot Books"
 msgstr ""
 
-#: cps/templates/index.xml:24 cps/ub.py:63
-msgid "Best rated Books"
+#: cps/templates/index.xml:24 cps/ub.py:63 cps/web.py:508
+msgid "Top Rated Books"
 msgstr ""
 
 #: cps/ub.py:65
-msgid "Show best rated books"
+msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
-#: cps/web.py:1008
+#: cps/web.py:1005
 msgid "Read Books"
 msgstr ""
 
@@ -600,7 +621,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
-#: cps/web.py:1012
+#: cps/web.py:1009
 msgid "Unread Books"
 msgstr ""
 
@@ -616,7 +637,7 @@ msgstr ""
 msgid "Show random books"
 msgstr ""
 
-#: cps/templates/index.xml:75 cps/ub.py:76
+#: cps/templates/index.xml:75 cps/ub.py:76 cps/web.py:787
 msgid "Categories"
 msgstr ""
 
@@ -625,7 +646,7 @@ msgid "Show category selection"
 msgstr ""
 
 #: cps/templates/book_edit.html:69 cps/templates/index.xml:82
-#: cps/templates/search_form.html:53 cps/ub.py:79
+#: cps/templates/search_form.html:53 cps/ub.py:79 cps/web.py:715
 msgid "Series"
 msgstr ""
 
@@ -641,7 +662,7 @@ msgstr ""
 msgid "Show author selection"
 msgstr ""
 
-#: cps/templates/index.xml:68 cps/ub.py:86
+#: cps/templates/index.xml:68 cps/ub.py:86 cps/web.py:699
 msgid "Publishers"
 msgstr ""
 
@@ -650,6 +671,7 @@ msgid "Show publisher selection"
 msgstr ""
 
 #: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+#: cps/web.py:770
 msgid "Languages"
 msgstr ""
 
@@ -702,216 +724,201 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:485
+#: cps/web.py:480
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:513
-msgid "Best rated books"
-msgstr ""
-
-#: cps/templates/index.xml:38 cps/web.py:521
-msgid "Random Books"
+#: cps/templates/index.html:5 cps/web.py:516
+msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:547
+#: cps/web.py:542
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:574
-msgid "Hot Books (most downloaded)"
+#: cps/web.py:569
+msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:585 cps/web.py:1381 cps/web.py:1477
-msgid "Error opening eBook. File does not exist or file is not accessible:"
+#: cps/web.py:580
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:598
+#: cps/web.py:593
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:610
+#: cps/web.py:605
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:621
+#: cps/web.py:616
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:632
+#: cps/web.py:627
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:643
+#: cps/web.py:638
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:655
+#: cps/web.py:650
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:672
+#: cps/web.py:667
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/web.py:704
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:720
-msgid "Series list"
-msgstr ""
-
-#: cps/web.py:734
+#: cps/web.py:729
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:747
+#: cps/web.py:742
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:775
-msgid "Available languages"
-msgstr ""
-
-#: cps/web.py:792
-msgid "Category list"
-msgstr ""
-
-#: cps/templates/layout.html:73 cps/web.py:806
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:801
 msgid "Tasks"
 msgstr ""
 
-#: cps/templates/feed.xml:33 cps/templates/layout.html:44
-#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+#: cps/templates/book_edit.html:212 cps/templates/feed.xml:33
+#: cps/templates/layout.html:44 cps/templates/layout.html:47
+#: cps/templates/search_form.html:170 cps/web.py:821 cps/web.py:823
 msgid "Search"
 msgstr ""
 
-#: cps/web.py:878
+#: cps/web.py:873
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:885
+#: cps/web.py:880
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:899
+#: cps/web.py:894
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:901
+#: cps/web.py:896
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:967 cps/web.py:979
+#: cps/web.py:962 cps/web.py:976
 msgid "search"
 msgstr ""
 
-#: cps/web.py:1063
+#: cps/web.py:1060
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1067
+#: cps/web.py:1064
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1069
+#: cps/web.py:1066
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:1086
+#: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
-#: cps/web.py:1127 cps/web.py:1131
+#: cps/web.py:1084 cps/web.py:1090 cps/web.py:1115 cps/web.py:1119
+#: cps/web.py:1124 cps/web.py:1128
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1120
+#: cps/web.py:1117
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1123
+#: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1123
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1140
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1153 cps/web.py:1280
+#: cps/web.py:1150 cps/web.py:1277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1158
+#: cps/web.py:1155
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1162 cps/web.py:1185
+#: cps/web.py:1159 cps/web.py:1182
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1169
+#: cps/web.py:1166
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1175
+#: cps/web.py:1172
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1181
+#: cps/web.py:1178
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1188 cps/web.py:1212
+#: cps/web.py:1185 cps/web.py:1209
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1224 cps/web.py:1258
+#: cps/web.py:1221 cps/web.py:1255
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:1233 cps/web.py:1266
+#: cps/web.py:1230 cps/web.py:1263
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:1242
+#: cps/web.py:1239
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#: cps/web.py:1320 cps/web.py:1365 cps/web.py:1371
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1364
+#: cps/web.py:1367
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
-#: cps/web.py:1411
+#: cps/web.py:1384 cps/web.py:1480
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr ""
+
+#: cps/web.py:1396 cps/web.py:1399 cps/web.py:1402 cps/web.py:1409
+#: cps/web.py:1414
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1422
+#: cps/web.py:1425
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -926,23 +933,26 @@ msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
 #: cps/templates/admin.html:9
-msgid "User list"
+msgid "Users"
 msgstr ""
 
-#: cps/templates/admin.html:12
-msgid "Nickname"
+#: cps/templates/admin.html:12 cps/templates/login.html:8
+#: cps/templates/login.html:9 cps/templates/register.html:7
+#: cps/templates/user_edit.html:8
+msgid "Username"
 msgstr ""
 
-#: cps/templates/admin.html:13
-msgid "E-mail"
+#: cps/templates/admin.html:13 cps/templates/register.html:11
+#: cps/templates/user_edit.html:13
+msgid "E-mail Address"
 msgstr ""
 
-#: cps/templates/admin.html:14
-msgid "Kindle"
+#: cps/templates/admin.html:14 cps/templates/user_edit.html:26
+msgid "Send to Kindle E-mail Address"
 msgstr ""
 
 #: cps/templates/admin.html:15
-msgid "DLS"
+msgid "Downloads"
 msgstr ""
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:76
@@ -956,7 +966,7 @@ msgid "Download"
 msgstr ""
 
 #: cps/templates/admin.html:18
-msgid "View Ebooks"
+msgid "View eBooks"
 msgstr ""
 
 #: cps/templates/admin.html:19 cps/templates/layout.html:65
@@ -967,28 +977,32 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+#: cps/templates/admin.html:38
+msgid "Add New User"
+msgstr ""
+
 #: cps/templates/admin.html:44
-msgid "SMTP e-mail server settings"
+msgid "E-mail Server Settings"
 msgstr ""
 
 #: cps/templates/admin.html:47 cps/templates/email_edit.html:11
-msgid "SMTP hostname"
+msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:48
-msgid "SMTP port"
+#: cps/templates/admin.html:48 cps/templates/email_edit.html:15
+msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:49
-msgid "SSL"
+#: cps/templates/admin.html:49 cps/templates/email_edit.html:19
+msgid "Encryption"
 msgstr ""
 
 #: cps/templates/admin.html:50 cps/templates/email_edit.html:27
-msgid "SMTP login"
+msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:51
-msgid "From mail"
+#: cps/templates/admin.html:51 cps/templates/email_edit.html:35
+msgid "From E-mail"
 msgstr ""
 
 #: cps/templates/admin.html:61
@@ -1000,63 +1014,71 @@ msgid "Configuration"
 msgstr ""
 
 #: cps/templates/admin.html:70
-msgid "Calibre DB dir"
+msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:74
-msgid "Log level"
+#: cps/templates/admin.html:74 cps/templates/config_edit.html:122
+msgid "Log Level"
 msgstr ""
 
 #: cps/templates/admin.html:78
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:23
-msgid "Books per page"
+#: cps/templates/admin.html:84 cps/templates/config_view_edit.html:27
+msgid "Books per Page"
 msgstr ""
 
 #: cps/templates/admin.html:88
-msgid "Uploading"
+msgid "Uploads"
 msgstr ""
 
 #: cps/templates/admin.html:92
-msgid "Anonymous browsing"
+msgid "Anonymous Browsing"
 msgstr ""
 
 #: cps/templates/admin.html:96
-msgid "Public registration"
+msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
-msgid "Remote login"
+#: cps/templates/admin.html:100
+msgid "Magic Link Remote Login"
 msgstr ""
 
 #: cps/templates/admin.html:104
-msgid "Reverse proxy login"
+msgid "Reverse Proxy Login"
 msgstr ""
 
 #: cps/templates/admin.html:109
 msgid "Reverse proxy header name"
 msgstr ""
 
+#: cps/templates/admin.html:114
+msgid "Edit Basic Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:115
+msgid "Edit UI Configuration"
+msgstr ""
+
 #: cps/templates/admin.html:121
 msgid "Administration"
 msgstr ""
 
 #: cps/templates/admin.html:122
-msgid "View Logfiles"
+msgid "View Logs"
 msgstr ""
 
 #: cps/templates/admin.html:123
-msgid "Reconnect to Calibre DB"
+msgid "Reconnect Calibre Database"
 msgstr ""
 
 #: cps/templates/admin.html:124
-msgid "Restart Calibre-Web"
+msgid "Restart"
 msgstr ""
 
 #: cps/templates/admin.html:125
-msgid "Stop Calibre-Web"
+msgid "Shutdown"
 msgstr ""
 
 #: cps/templates/admin.html:131
@@ -1076,7 +1098,7 @@ msgid "Current version"
 msgstr ""
 
 #: cps/templates/admin.html:148
-msgid "Check for update"
+msgid "Check for Update"
 msgstr ""
 
 #: cps/templates/admin.html:149
@@ -1084,30 +1106,29 @@ msgid "Perform Update"
 msgstr ""
 
 #: cps/templates/admin.html:161
-msgid "Do you really want to restart Calibre-Web?"
+msgid "Are you sure you want to restart?"
 msgstr ""
 
 #: cps/templates/admin.html:166 cps/templates/admin.html:180
 #: cps/templates/admin.html:200 cps/templates/shelf.html:72
-msgid "Ok"
+msgid "OK"
 msgstr ""
 
 #: cps/templates/admin.html:167 cps/templates/admin.html:181
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:331 cps/templates/config_view_edit.html:147
+#: cps/templates/config_edit.html:346 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
-#: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
-#: cps/templates/user_edit.html:131
-msgid "Back"
+#: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
+#: cps/templates/user_edit.html:137
+msgid "Cancel"
 msgstr ""
 
 #: cps/templates/admin.html:179
-msgid "Do you really want to stop Calibre-Web?"
+msgid "Are you sure you want to shutdown?"
 msgstr ""
 
 #: cps/templates/admin.html:191
-msgid "Updating, please do not reload page"
+msgid "Updating, please do not reload this page"
 msgstr ""
 
 #: cps/templates/author.html:15
@@ -1143,7 +1164,8 @@ msgid "Delete formats:"
 msgstr ""
 
 #: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
-#: cps/templates/email_edit.html:91
+#: cps/templates/email_edit.html:91 cps/templates/user_edit.html:65
+#: cps/templates/user_edit.html:177
 msgid "Delete"
 msgstr ""
 
@@ -1186,7 +1208,7 @@ msgid "Tags"
 msgstr ""
 
 #: cps/templates/book_edit.html:73
-msgid "Series id"
+msgid "Series ID"
 msgstr ""
 
 #: cps/templates/book_edit.html:77
@@ -1194,15 +1216,15 @@ msgid "Rating"
 msgstr ""
 
 #: cps/templates/book_edit.html:81
-msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
 #: cps/templates/book_edit.html:85
-msgid "Upload Cover from local drive"
+msgid "Upload Cover from Local Disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
-msgid "Publishing date"
+#: cps/templates/book_edit.html:90
+msgid "Published Date"
 msgstr ""
 
 #: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
@@ -1211,7 +1233,8 @@ msgstr ""
 msgid "Publisher"
 msgstr ""
 
-#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:101 cps/templates/detail.html:123
+#: cps/templates/user_edit.html:31
 msgid "Language"
 msgstr ""
 
@@ -1224,22 +1247,21 @@ msgid "No"
 msgstr ""
 
 #: cps/templates/book_edit.html:158
-msgid "Upload format"
+msgid "Upload Format"
 msgstr ""
 
 #: cps/templates/book_edit.html:167
-msgid "view book after edit"
+msgid "View Book on Save"
 msgstr ""
 
 #: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
-msgid "Get metadata"
+msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:329
-#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
-#: cps/templates/search_form.html:170 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:129
-msgid "Submit"
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:343
+#: cps/templates/config_view_edit.html:150 cps/templates/email_edit.html:38
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:135
+msgid "Save"
 msgstr ""
 
 #: cps/templates/book_edit.html:185
@@ -1247,11 +1269,11 @@ msgid "Are you really sure?"
 msgstr ""
 
 #: cps/templates/book_edit.html:188
-msgid "Book will be deleted from Calibre database"
+msgid "This book will be permanently erased from database"
 msgstr ""
 
 #: cps/templates/book_edit.html:189
-msgid "and from hard disk"
+msgid "and hard disk"
 msgstr ""
 
 #: cps/templates/book_edit.html:209
@@ -1262,10 +1284,6 @@ msgstr ""
 msgid " Search keyword "
 msgstr ""
 
-#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
-msgid "Go!"
-msgstr ""
-
 #: cps/templates/book_edit.html:216
 msgid "Click the cover to load metadata to the form"
 msgstr ""
@@ -1274,8 +1292,9 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
-#: cps/templates/layout.html:224
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:191
+#: cps/templates/layout.html:223 cps/templates/modal_restriction.html:34
+#: cps/templates/user_edit.html:164
 msgid "Close"
 msgstr ""
 
@@ -1296,7 +1315,7 @@ msgid "Library Configuration"
 msgstr ""
 
 #: cps/templates/config_edit.html:19
-msgid "Location of Calibre database"
+msgid "Location of Calibre Database"
 msgstr ""
 
 #: cps/templates/config_edit.html:25
@@ -1348,7 +1367,7 @@ msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
 #: cps/templates/config_edit.html:99
-msgid "Update channel"
+msgid "Update Channel"
 msgstr ""
 
 #: cps/templates/config_edit.html:101
@@ -1371,10 +1390,6 @@ msgstr ""
 msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:122
-msgid "Log Level"
-msgstr ""
-
 #: cps/templates/config_edit.html:131
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
@@ -1392,255 +1407,271 @@ msgid "Feature Configuration"
 msgstr ""
 
 #: cps/templates/config_edit.html:158
-msgid "Enable uploading"
+msgid "Enable Uploads"
 msgstr ""
 
 #: cps/templates/config_edit.html:162
-msgid "Enable anonymous browsing"
+msgid "Enable Anonymous Browsing"
 msgstr ""
 
 #: cps/templates/config_edit.html:166
-msgid "Enable public registration"
+msgid "Enable Public Registration"
 msgstr ""
 
 #: cps/templates/config_edit.html:170
-msgid "Enable remote login (\"magic link\")"
+msgid "Enable Magic Link Remote Login"
 msgstr ""
 
 #: cps/templates/config_edit.html:175
+msgid "Enable Kobo sync"
+msgstr ""
+
+#: cps/templates/config_edit.html:180
+msgid "Proxy unknown requests to Kobo Store"
+msgstr ""
+
+#: cps/templates/config_edit.html:187
 msgid "Use Goodreads"
 msgstr ""
 
-#: cps/templates/config_edit.html:176
-msgid "Obtain an API Key"
+#: cps/templates/config_edit.html:188
+msgid "Create an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:180
+#: cps/templates/config_edit.html:192
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:184
+#: cps/templates/config_edit.html:196
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:191
+#: cps/templates/config_edit.html:203
 msgid "Login type"
 msgstr ""
 
-#: cps/templates/config_edit.html:193
-msgid "Use standard Authentication"
+#: cps/templates/config_edit.html:205
+msgid "Use Standard Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:207
 msgid "Use LDAP Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:198
+#: cps/templates/config_edit.html:210
 msgid "Use OAuth"
 msgstr ""
 
-#: cps/templates/config_edit.html:205
+#: cps/templates/config_edit.html:217
 msgid "LDAP Server Host Name or IP Address"
 msgstr ""
 
-#: cps/templates/config_edit.html:209
+#: cps/templates/config_edit.html:221
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
-msgid "LDAP schema (ldap or ldaps)"
+#: cps/templates/config_edit.html:225
+msgid "LDAP Schema (LDAP or LPAPS)"
 msgstr ""
 
-#: cps/templates/config_edit.html:217
-msgid "LDAP Admin username"
+#: cps/templates/config_edit.html:229
+msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:221
-msgid "LDAP Admin password"
+#: cps/templates/config_edit.html:233
+msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:226
-msgid "LDAP Server use SSL"
+#: cps/templates/config_edit.html:238
+msgid "LDAP Server Enable SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:230
-msgid "LDAP Server use TLS"
+#: cps/templates/config_edit.html:242
+msgid "LDAP Server Enable TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:234
+#: cps/templates/config_edit.html:246
 msgid "LDAP Server Certificate"
 msgstr ""
 
-#: cps/templates/config_edit.html:238
+#: cps/templates/config_edit.html:250
 msgid "LDAP SSL Certificate Path"
 msgstr ""
 
-#: cps/templates/config_edit.html:243
+#: cps/templates/config_edit.html:255
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:247
-msgid "LDAP User object filter"
+#: cps/templates/config_edit.html:259
+msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:252
+#: cps/templates/config_edit.html:264
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:272
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:263
+#: cps/templates/config_edit.html:275
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:267
+#: cps/templates/config_edit.html:279
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:276
+#: cps/templates/config_edit.html:288
 msgid "Allow Reverse Proxy Authentication"
 msgstr ""
 
-#: cps/templates/config_edit.html:280
+#: cps/templates/config_edit.html:292
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:292
+#: cps/templates/config_edit.html:304
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:300
-msgid "No converter"
+#: cps/templates/config_edit.html:312
+msgid "No Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:302
+#: cps/templates/config_edit.html:314
 msgid "Use Kindlegen"
 msgstr ""
 
-#: cps/templates/config_edit.html:304
+#: cps/templates/config_edit.html:316
 msgid "Use calibre's ebook converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:308
+#: cps/templates/config_edit.html:320
 msgid "E-Book converter settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:312
+#: cps/templates/config_edit.html:324
 msgid "Path to convertertool"
 msgstr ""
 
-#: cps/templates/config_edit.html:318
+#: cps/templates/config_edit.html:330
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
-#: cps/templates/login.html:4
+#: cps/templates/config_edit.html:349 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:12
+#: cps/templates/config_view_edit.html:16
 msgid "View Configuration"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:23 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:27
-msgid "No. of random books to show"
+#: cps/templates/config_view_edit.html:31
+msgid "No. of Random Books to Display"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:31
-msgid "No. of authors to show before hiding (0=disable hiding)"
+#: cps/templates/config_view_edit.html:35
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+#: cps/templates/config_view_edit.html:39 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:37
+#: cps/templates/config_view_edit.html:41
 msgid "Standard Theme"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:38
-msgid "caliBlur! Dark Theme"
-msgstr ""
-
 #: cps/templates/config_view_edit.html:42
-msgid "Regular expression for ignoring columns"
+msgid "caliBlur! Dark Theme"
 msgstr ""
 
 #: cps/templates/config_view_edit.html:46
-msgid "Link read/unread status to Calibre column"
+msgid "Regular Expression for Ignoring Columns"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:55
-msgid "Regular expression for title sorting"
+#: cps/templates/config_view_edit.html:50
+msgid "Link Read/Unread Status to Calibre Column"
 msgstr ""
 
 #: cps/templates/config_view_edit.html:59
-msgid "Tags for Mature Content"
+msgid "View Restrictions based on Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:61 cps/templates/email_edit.html:21
+msgid "None"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:68
+msgid "Regular Expression for Title Sorting"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:73
-msgid "Default settings for new users"
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
-msgid "Admin user"
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:92
+msgid "Admin User"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:97
 msgid "Allow Downloads"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
-msgid "Allow book viewer"
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:101
+msgid "Allow eBook Viewer"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+#: cps/templates/config_view_edit.html:100 cps/templates/user_edit.html:105
 msgid "Allow Uploads"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+#: cps/templates/config_view_edit.html:104 cps/templates/user_edit.html:109
 msgid "Allow Edit"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
-msgid "Allow Delete books"
+#: cps/templates/config_view_edit.html:108 cps/templates/user_edit.html:113
+msgid "Allow Delete Books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:118
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122
 msgid "Allow Editing Public Shelfs"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:119
-msgid "Default visibilities for new users"
+#: cps/templates/config_view_edit.html:126
+msgid "Default Visibilities for New Users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
-msgid "Show random books in detail view"
+#: cps/templates/config_view_edit.html:142
+msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
-msgid "Show mature content"
+#: cps/templates/config_view_edit.html:144
+msgid "Add Allowed/Denied Tags"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:145
+msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
 #: cps/templates/detail.html:59
-msgid "Read in browser"
+msgid "Read in Browser"
 msgstr ""
 
 #: cps/templates/detail.html:72
-msgid "Listen in browser"
+msgid "Listen in Browser"
 msgstr ""
 
 #: cps/templates/detail.html:117
@@ -1651,8 +1682,8 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: cps/templates/detail.html:123
-msgid "language"
+#: cps/templates/detail.html:165
+msgid "Published"
 msgstr ""
 
 #: cps/templates/detail.html:200
@@ -1676,19 +1707,7 @@ msgid "Add to shelf"
 msgstr ""
 
 #: cps/templates/detail.html:286
-msgid "Edit metadata"
-msgstr ""
-
-#: cps/templates/email_edit.html:15
-msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
-
-#: cps/templates/email_edit.html:19
-msgid "Encryption"
-msgstr ""
-
-#: cps/templates/email_edit.html:21
-msgid "None"
+msgid "Edit Metadata"
 msgstr ""
 
 #: cps/templates/email_edit.html:22
@@ -1700,23 +1719,15 @@ msgid "SSL/TLS"
 msgstr ""
 
 #: cps/templates/email_edit.html:31
-msgid "SMTP password"
-msgstr ""
-
-#: cps/templates/email_edit.html:35
-msgid "From e-mail"
-msgstr ""
-
-#: cps/templates/email_edit.html:38
-msgid "Save settings"
+msgid "SMTP Password"
 msgstr ""
 
 #: cps/templates/email_edit.html:39
-msgid "Save settings and send Test E-Mail"
+msgid "Save and Send Test E-mail"
 msgstr ""
 
 #: cps/templates/email_edit.html:43
-msgid "Allowed domains for registering"
+msgid "Allowed Domains (Whitelist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
@@ -1732,27 +1743,31 @@ msgid "Enter domainname"
 msgstr ""
 
 #: cps/templates/email_edit.html:60
-msgid "Denied domains for registering"
+msgid "Denied Domains (Blacklist)"
 msgstr ""
 
 #: cps/templates/email_edit.html:90
-msgid "Do you really want to delete this domain rule?"
+msgid "Are you sure you want to delete this domain?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+#: cps/templates/feed.xml:21 cps/templates/layout.html:175
 msgid "Next"
 msgstr ""
 
-#: cps/templates/http_error.html:37
-msgid "Create issue"
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
-#: cps/templates/http_error.html:44
-msgid "Back to home"
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Please note that every visit to this current page invalidates any previously generated Authentication url for this user."
 msgstr ""
 
-#: cps/templates/index.html:5
-msgid "Discover (Random Books)"
+#: cps/templates/http_error.html:38
+msgid "Create Issue"
+msgstr ""
+
+#: cps/templates/http_error.html:45
+msgid "Return to Home"
 msgstr ""
 
 #: cps/templates/index.html:64
@@ -1779,7 +1794,11 @@ msgstr ""
 msgid "The latest Books"
 msgstr ""
 
-#: cps/templates/index.xml:42
+#: cps/templates/index.xml:38
+msgid "Random Books"
+msgstr ""
+
+#: cps/templates/index.xml:42 cps/templates/user_edit.html:80
 msgid "Show Random Books"
 msgstr ""
 
@@ -1807,7 +1826,7 @@ msgstr ""
 msgid "Books ordered by file formats"
 msgstr ""
 
-#: cps/templates/index.xml:103 cps/templates/layout.html:137
+#: cps/templates/index.xml:103 cps/templates/layout.html:136
 msgid "Public Shelves"
 msgstr ""
 
@@ -1815,7 +1834,7 @@ msgstr ""
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:111 cps/templates/layout.html:141
+#: cps/templates/index.xml:111 cps/templates/layout.html:140
 msgid "Your Shelves"
 msgstr ""
 
@@ -1827,8 +1846,17 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#: cps/templates/layout.html:28 cps/templates/shelf_order.html:32
+#: cps/templates/user_edit.html:178
+msgid "Back"
+msgstr ""
+
 #: cps/templates/layout.html:34
-msgid "Toggle navigation"
+msgid "Toggle Navigation"
+msgstr ""
+
+#: cps/templates/layout.html:45
+msgid "Search Library"
 msgstr ""
 
 #: cps/templates/layout.html:55
@@ -1852,70 +1880,65 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: cps/templates/layout.html:116 cps/templates/layout.html:223
+#: cps/templates/layout.html:116 cps/templates/layout.html:222
 msgid "Uploading..."
 msgstr ""
 
 #: cps/templates/layout.html:117
-msgid "please don't refresh the page"
+msgid "Please do not refresh the page"
 msgstr ""
 
 #: cps/templates/layout.html:127
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:146
+#: cps/templates/layout.html:145
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/templates/layout.html:147 cps/templates/stats.html:3
+#: cps/templates/layout.html:146 cps/templates/stats.html:3
 msgid "About"
 msgstr ""
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:160
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:188
+#: cps/templates/layout.html:187
 msgid "Book Details"
 msgstr ""
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:221
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:225
+#: cps/templates/layout.html:224
 msgid "Error"
 msgstr ""
 
-#: cps/templates/login.html:8 cps/templates/login.html:9
-#: cps/templates/register.html:7 cps/templates/user_edit.html:8
-msgid "Username"
-msgstr ""
-
 #: cps/templates/login.html:12 cps/templates/login.html:13
 #: cps/templates/user_edit.html:21
 msgid "Password"
 msgstr ""
 
 #: cps/templates/login.html:17
-msgid "Remember me"
+msgid "Remember Me"
 msgstr ""
 
 #: cps/templates/login.html:22
-msgid "Forgot password"
+msgid "Forgot Password?"
 msgstr ""
 
 #: cps/templates/login.html:25
-msgid "Log in with magic link"
+msgid "Log in with Magic Link"
 msgstr ""
 
 #: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web log: "
+msgid "Show Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
-msgid "Calibre-Web log: "
+msgid "Calibre-Web Log: "
 msgstr ""
 
 #: cps/templates/logviewer.html:8
@@ -1923,11 +1946,35 @@ msgid "Stream output, can't be displayed"
 msgstr ""
 
 #: cps/templates/logviewer.html:12
-msgid "Show access log: "
+msgid "Show Access Log: "
+msgstr ""
+
+#: cps/templates/modal_restriction.html:6
+msgid "Select allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:7
+msgid "Select allowed/denied Custom Column values"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:8
+msgid "Select allowed/denied Tags of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:9
+msgid "Select allowed/denied Custom Column values of user"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:15
+msgid "Enter Tag"
+msgstr ""
+
+#: cps/templates/modal_restriction.html:24
+msgid "Add View Restriction"
 msgstr ""
 
 #: cps/templates/osd.xml:5
-msgid "Calibre-Web ebook catalog"
+msgid "Calibre-Web eBook Catalog"
 msgstr ""
 
 #: cps/templates/read.html:74
@@ -2039,39 +2086,39 @@ msgid "Basic txt Reader"
 msgstr ""
 
 #: cps/templates/register.html:4
-msgid "Register a new account"
+msgid "Register New Account"
 msgstr ""
 
 #: cps/templates/register.html:8
 msgid "Choose a username"
 msgstr ""
 
-#: cps/templates/register.html:11 cps/templates/user_edit.html:13
-msgid "E-mail address"
-msgstr ""
-
 #: cps/templates/register.html:12
 msgid "Your email address"
 msgstr ""
 
+#: cps/templates/remote_login.html:4
+msgid "Magic Link - Authorise New Device"
+msgstr ""
+
 #: cps/templates/remote_login.html:6
-msgid "Use your other device, login and visit "
+msgid "On another device, login and visit:"
 msgstr ""
 
-#: cps/templates/remote_login.html:9
-msgid "Once you do so, you will automatically get logged in on this device."
+#: cps/templates/remote_login.html:10
+msgid "Once verified, you will automatically be logged in on this device."
 msgstr ""
 
-#: cps/templates/remote_login.html:12
-msgid "The link will expire after 10 minutes."
+#: cps/templates/remote_login.html:13
+msgid "This verification link will expire in 10 minutes."
 msgstr ""
 
 #: cps/templates/search.html:5
-msgid "No Results for:"
+msgid "No Results Found"
 msgstr ""
 
 #: cps/templates/search.html:6
-msgid "Please try a different search"
+msgid "Search Term:"
 msgstr ""
 
 #: cps/templates/search.html:8
@@ -2079,11 +2126,11 @@ msgid "Results for:"
 msgstr ""
 
 #: cps/templates/search_form.html:19
-msgid "Publishing date from"
+msgid "Published Date From"
 msgstr ""
 
 #: cps/templates/search_form.html:26
-msgid "Publishing date to"
+msgid "Published Date To"
 msgstr ""
 
 #: cps/templates/search_form.html:43
@@ -2107,11 +2154,11 @@ msgid "Exclude Extensions"
 msgstr ""
 
 #: cps/templates/search_form.html:117
-msgid "Rating bigger than"
+msgid "Rating Above"
 msgstr ""
 
 #: cps/templates/search_form.html:121
-msgid "Rating less than"
+msgid "Rating Below"
 msgstr ""
 
 #: cps/templates/shelf.html:10
@@ -2127,23 +2174,23 @@ msgid "Change order"
 msgstr ""
 
 #: cps/templates/shelf.html:67
-msgid "Do you really want to delete the shelf?"
+msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
 #: cps/templates/shelf.html:70
-msgid "Shelf will be lost for everybody and forever!"
+msgid "Shelf will be deleted for all users"
 msgstr ""
 
 #: cps/templates/shelf_edit.html:13
-msgid "should the shelf be public?"
+msgid "Share with Everyone"
 msgstr ""
 
 #: cps/templates/shelf_order.html:5
-msgid "Drag 'n drop to rearrange order"
+msgid "Drag to Rearrange Order"
 msgstr ""
 
 #: cps/templates/stats.html:7
-msgid "Calibre library statistics"
+msgid "Library Statistics"
 msgstr ""
 
 #: cps/templates/stats.html:12
@@ -2163,21 +2210,17 @@ msgid "Series in this Library"
 msgstr ""
 
 #: cps/templates/stats.html:28
-msgid "Linked libraries"
+msgid "Linked Libraries"
 msgstr ""
 
 #: cps/templates/stats.html:32
-msgid "Program library"
+msgid "Program Library"
 msgstr ""
 
 #: cps/templates/stats.html:33
 msgid "Installed Version"
 msgstr ""
 
-#: cps/templates/tasks.html:7
-msgid "Tasks list"
-msgstr ""
-
 #: cps/templates/tasks.html:12
 msgid "User"
 msgstr ""
@@ -2195,11 +2238,11 @@ msgid "Progress"
 msgstr ""
 
 #: cps/templates/tasks.html:17
-msgid "Runtime"
+msgid "Run Time"
 msgstr ""
 
 #: cps/templates/tasks.html:18
-msgid "Starttime"
+msgid "Start Time"
 msgstr ""
 
 #: cps/templates/tasks.html:24
@@ -2214,16 +2257,12 @@ msgstr ""
 msgid "Reset user Password"
 msgstr ""
 
-#: cps/templates/user_edit.html:26
-msgid "Kindle E-Mail"
-msgstr ""
-
 #: cps/templates/user_edit.html:41
-msgid "Show books with language"
+msgid "Language of Books"
 msgstr ""
 
 #: cps/templates/user_edit.html:43
-msgid "Show all"
+msgid "Show All"
 msgstr ""
 
 #: cps/templates/user_edit.html:52
@@ -2238,11 +2277,35 @@ msgstr ""
 msgid "Unlink"
 msgstr ""
 
-#: cps/templates/user_edit.html:123
-msgid "Delete this user"
+#: cps/templates/user_edit.html:62
+msgid "Kobo Sync Token"
 msgstr ""
 
-#: cps/templates/user_edit.html:138
+#: cps/templates/user_edit.html:64
+msgid "Create/View"
+msgstr ""
+
+#: cps/templates/user_edit.html:83
+msgid "Add allowed/denied Tags"
+msgstr ""
+
+#: cps/templates/user_edit.html:84
+msgid "Add allowed/denied custom column values"
+msgstr ""
+
+#: cps/templates/user_edit.html:129
+msgid "Delete User"
+msgstr ""
+
+#: cps/templates/user_edit.html:144
 msgid "Recent Downloads"
 msgstr ""
 
+#: cps/templates/user_edit.html:160
+msgid "Generate Kobo Auth URL"
+msgstr ""
+
+#: cps/templates/user_edit.html:176
+msgid "Do you really want to delete the Kobo Token?"
+msgstr ""
+