From 05d78f5cb59ecca1acde183ecca8e9f2e488e42c Mon Sep 17 00:00:00 2001
From: ElQuimm <50202052+ElQuimm@users.noreply.github.com>
Date: Wed, 15 Apr 2020 10:59:08 +0200
Subject: [PATCH 01/17] Update italian version of message.po

Have a nice day!
---
 cps/translations/it/LC_MESSAGES/messages.po | 42 ++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 86e3c917..a713051a 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -53,7 +53,7 @@ msgstr "Configurazione dell'interfaccia utente"
 
 #: cps/admin.py:187 cps/admin.py:637
 msgid "Calibre-Web configuration updated"
-msgstr "Aggiornamento della configurazione di Calibre-Web"
+msgstr "La configurazione di Calibre-Web è aggiornata"
 
 #: cps/admin.py:434 cps/admin.py:440 cps/admin.py:451 cps/admin.py:462
 #: cps/templates/modal_restriction.html:29
@@ -88,7 +88,7 @@ msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 #: cps/admin.py:721
 #, python-format
 msgid "User '%(user)s' created"
-msgstr "Utente '%(user)s' creato"
+msgstr "Creato l'utente '%(user)s'"
 
 #: cps/admin.py:740
 msgid "Edit e-mail server settings"
@@ -211,7 +211,7 @@ msgstr "Errore generale"
 
 #: cps/admin.py:968
 msgid "Update File Could Not be Saved in Temp Dir"
-msgstr ""
+msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
 #: cps/converter.py:31
 msgid "not configured"
@@ -237,7 +237,7 @@ msgstr "Il file da caricare deve avere un'estensione"
 #: cps/editbooks.py:337 cps/editbooks.py:607
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "Impossibile creare il percorso %(path)s (autorizzazione negata)."
+msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
 #: cps/editbooks.py:342
 #, python-format
@@ -400,7 +400,7 @@ msgstr "Non ho trovato la cartella %(path)s del libro su Google Drive"
 
 #: cps/helper.py:511
 msgid "Failed to create path for cover"
-msgstr "Errore nel creare il percorso per la copertina"
+msgstr "Errore nel creare la cartella per la copertina"
 
 #: cps/helper.py:516
 msgid "Cover-file is not a valid image file"
@@ -566,12 +566,12 @@ msgstr "Spiacente, ma non sei autorizzato a togliere libri dallo scaffale: %(sna
 #: cps/shelf.py:215 cps/shelf.py:252
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "Uno scaffale pubblico denominato '%(title)s' esiste già."
 
 #: cps/shelf.py:222 cps/shelf.py:260
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+msgstr "Uno scaffale privato denominato '%(title)s' esiste già."
 
 #: cps/shelf.py:228
 #, python-format
@@ -768,7 +768,7 @@ msgstr "I libri più richiesti"
 
 #: cps/web.py:580
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr "Oops! Errore durante l'apertura del libro selezionato. Il file non esiste o il file non è accessibile"
+msgstr "Errore durante l'apertura del libro selezionato. Il file non esiste o il file non è accessibile"
 
 #: cps/web.py:593
 #, python-format
@@ -857,7 +857,7 @@ msgstr "Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
 #: cps/web.py:1066
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
-msgstr "Per favore configura dapprima il tuo indirizzo e-mail di Kindle..."
+msgstr "Per favore aggiorna il tuo profilo con un indirizzo e-mail Kindle a cui inviare i libri."
 
 #: cps/web.py:1083
 msgid "E-Mail server is not configured, please contact your administrator!"
@@ -870,7 +870,7 @@ msgstr "registra"
 
 #: 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"
+msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
 #: cps/web.py:1120
 msgid "Confirmation e-mail was send to your e-mail account."
@@ -1638,7 +1638,7 @@ msgstr "Nessuna"
 
 #: cps/templates/config_view_edit.html:68
 msgid "Regular Expression for Title Sorting"
-msgstr "Espressione regolare per ordinare la visualizzazione del titolo"
+msgstr "Espressione regolare per ordinare la visualizzazione dei titoli"
 
 #: cps/templates/config_view_edit.html:80
 msgid "Default Settings for New Users"
@@ -1690,7 +1690,7 @@ msgstr "Aggiungi categorie permesse/negate"
 
 #: cps/templates/config_view_edit.html:145
 msgid "Add Allowed/Denied custom column values"
-msgstr "Aggiungi valori personali nelle colonne permessi/negati"
+msgstr "Aggiungi valori personali permetti/nega nelle colonne"
 
 #: cps/templates/detail.html:59
 msgid "Read in Browser"
@@ -1758,7 +1758,7 @@ msgstr "Dominii autorizzati alla registrazione (Whitelist)"
 
 #: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
 msgid "Add Domain"
-msgstr "Aggiungi il dominio"
+msgstr "Aggiungi dominio"
 
 #: cps/templates/email_edit.html:49 cps/templates/email_edit.html:75
 msgid "Add"
@@ -1774,7 +1774,7 @@ msgstr "Dominii bloccati per la registrazione (Blacklist)"
 
 #: cps/templates/email_edit.html:90
 msgid "Are you sure you want to delete this domain?"
-msgstr "Vuoi veramente eliminare questa regola di dominio?"
+msgstr "Se sicuro di voler eliminare questo dominio?"
 
 #: cps/templates/feed.xml:21 cps/templates/layout.html:173
 msgid "Next"
@@ -1783,7 +1783,7 @@ msgstr "Prossimo"
 #: cps/templates/feed.xml:79 cps/templates/layout.html:136
 #: cps/templates/layout.html:140
 msgid "(Public)"
-msgstr ""
+msgstr "(Pubblico)"
 
 #: cps/templates/generate_kobo_auth_url.html:5
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
@@ -1859,11 +1859,11 @@ msgstr "Libri ordinati per formato"
 
 #: cps/templates/index.xml:111 cps/templates/layout.html:134
 msgid "Shelves"
-msgstr ""
+msgstr "Scaffali"
 
 #: cps/templates/index.xml:115
 msgid "Books organized in shelves"
-msgstr ""
+msgstr "Libri organizzati in scaffali"
 
 #: cps/templates/layout.html:28
 msgid "Home"
@@ -1978,7 +1978,7 @@ msgstr "Seleziona le categorie consentite/negate"
 
 #: cps/templates/modal_restriction.html:7
 msgid "Select Allowed/Denied Custom Column Values"
-msgstr "Seleziona i valori personali per le colonne consentiti/negati"
+msgstr "Seleziona i valori personali consentiti/negati per le colonne"
 
 #: cps/templates/modal_restriction.html:8
 msgid "Select Allowed/Denied Tags of User"
@@ -1986,7 +1986,7 @@ msgstr "Seleziona le categorie consentite/negate per l'utente"
 
 #: cps/templates/modal_restriction.html:9
 msgid "Select Allowed/Denied Custom Column Values of User"
-msgstr "Seleziona i valori personali per le colonne consentiti/negati per l'utente"
+msgstr "Seleziona i valori personali consentiti/negati per le colonne dell'utente"
 
 #: cps/templates/modal_restriction.html:15
 msgid "Enter Tag"
@@ -2310,7 +2310,7 @@ msgstr "Crea/Visualizza"
 
 #: cps/templates/user_edit.html:84
 msgid "Add allowed/Denied Custom Column Values"
-msgstr "Aggiungi valori personali nelle colonne permessi/negati"
+msgstr "Aggiungi valori personali permessi/negati nelle colonne"
 
 #: cps/templates/user_edit.html:129
 msgid "Delete User"
@@ -2326,5 +2326,5 @@ msgstr "Genera un URL di autenticazione per Kobo"
 
 #: cps/templates/user_edit.html:176
 msgid "Do you really want to delete the Kobo Token?"
-msgstr "Vuoi veramente eliminare questo token di Kobo?"
+msgstr "Vuoi veramente eliminare il token di Kobo?"
 

From cd6272a1c9dfc6a93ba00947f21d11b2b0986992 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 16 Apr 2020 22:00:39 +0200
Subject: [PATCH 02/17] Update teststatus

---
 test/Calibre-Web TestSummary.html | 237 +++++++++++++++++-------------
 1 file changed, 135 insertions(+), 102 deletions(-)
 mode change 100755 => 100644 test/Calibre-Web TestSummary.html

diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
old mode 100755
new mode 100644
index 4138e113..460f9aea
--- a/test/Calibre-Web TestSummary.html	
+++ b/test/Calibre-Web TestSummary.html	
@@ -36,17 +36,17 @@
       <div class="col-xs-12 col-sm-6">
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
-            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-15 20:58:24</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-16 21:05:16</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-15 21:44:34</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-16 21:53:03</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>2409.70 s</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>41:12 min</p>
         </div>
       </div>
       </div>
@@ -1006,9 +1006,9 @@
                         <pre class="text-left">Traceback (most recent call last):
   File "/home/matthias/Entwicklung/calibre-web-test/test/test_kobo_sync.py", line 89, in test_check_sync
     self.assertEqual(r.json()['Resources']['image_url_quality_template'], self.kobo_adress+"/{ImageId}/{width}/{height}/image.jpg")
-AssertionError: 'http[35 chars]4304a11f244beb23c60f4b7b0/{ImageId}/image.jpg' != 'http[35 chars]4304a11f244beb23c60f4b7b0/{ImageId}/{width}/{height}/image.jpg'
-- http://192.168.188.33:8083/kobo/1b4c3e84304a11f244beb23c60f4b7b0/{ImageId}/image.jpg
-+ http://192.168.188.33:8083/kobo/1b4c3e84304a11f244beb23c60f4b7b0/{ImageId}/{width}/{height}/image.jpg
+AssertionError: 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg' != 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/{width}/{height}/image.jpg'
+- http://192.168.188.33:8083/kobo/0c877fb4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg
++ http://192.168.188.33:8083/kobo/0c877fb4dd7bb34f15173d3cfcccd48b/{ImageId}/{width}/{height}/image.jpg
 ?                                                                            +++++++++++++++++</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -1309,6 +1309,39 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
 
 
+    <tr class="result['header']['style']">
+        <td>test_oauth.test_outh_login</td>
+        <td class="text-center">2</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c12', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_oauth_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_visible_oauth</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr class="result['header']['style']">
         <td>test_opds_feed.test_opds_feed</td>
         <td class="text-center">20</td>
@@ -1317,13 +1350,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 20)">Detail</a>
+            <a onclick="showClassDetail('c13', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds</div>
             </td>
@@ -1332,7 +1365,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_author</div>
             </td>
@@ -1341,7 +1374,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_calibre_companion</div>
             </td>
@@ -1350,7 +1383,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_cover</div>
             </td>
@@ -1359,7 +1392,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_download_book</div>
             </td>
@@ -1368,7 +1401,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_formats</div>
             </td>
@@ -1377,7 +1410,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt13.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_guest_user</div>
             </td>
@@ -1386,7 +1419,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt13.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_hot</div>
             </td>
@@ -1395,7 +1428,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt13.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_language</div>
             </td>
@@ -1404,7 +1437,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt13.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_non_admin</div>
             </td>
@@ -1413,7 +1446,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt13.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_publisher</div>
             </td>
@@ -1422,7 +1455,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt13.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_random</div>
             </td>
@@ -1431,7 +1464,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt13.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_ratings</div>
             </td>
@@ -1440,7 +1473,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt13.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_read_unread</div>
             </td>
@@ -1449,7 +1482,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt13.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_search</div>
             </td>
@@ -1458,7 +1491,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt13.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_series</div>
             </td>
@@ -1467,7 +1500,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt13.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_shelf_access</div>
             </td>
@@ -1476,7 +1509,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt13.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_tags</div>
             </td>
@@ -1485,7 +1518,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.19' class='hiddenRow bg-success'>
+        <tr id='pt13.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_opds_top_rated</div>
             </td>
@@ -1494,7 +1527,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt12.20' class='hiddenRow bg-success'>
+        <tr id='pt13.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_recently_added</div>
             </td>
@@ -1512,13 +1545,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 6)">Detail</a>
+            <a onclick="showClassDetail('c14', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_forgot_password</div>
             </td>
@@ -1527,7 +1560,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_limit_domain</div>
             </td>
@@ -1536,7 +1569,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_register_no_server</div>
             </td>
@@ -1545,7 +1578,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_registering_user</div>
             </td>
@@ -1554,7 +1587,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_registering_user_fail</div>
             </td>
@@ -1563,7 +1596,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_change_password</div>
             </td>
@@ -1581,13 +1614,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 8)">Detail</a>
+            <a onclick="showClassDetail('c15', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_arrange_shelf</div>
             </td>
@@ -1596,7 +1629,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_delete_book_of_shelf</div>
             </td>
@@ -1605,7 +1638,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_private_shelf</div>
             </td>
@@ -1614,7 +1647,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_public_private_shelf</div>
             </td>
@@ -1623,7 +1656,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_public_shelf</div>
             </td>
@@ -1632,7 +1665,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_rename_shelf</div>
             </td>
@@ -1641,19 +1674,19 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='st14.7' class='none bg-warning'>
+        <tr id='st15.7' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st14.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st15.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st14.7' class="popup_window test_output" style="display:none;">
+                <div id='div_st15.7' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st14.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st15.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1667,7 +1700,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_shelf_long_name</div>
             </td>
@@ -1685,13 +1718,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 7)">Detail</a>
+            <a onclick="showClassDetail('c16', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_nightly_errors</div>
             </td>
@@ -1700,7 +1733,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_nightly_request_errors</div>
             </td>
@@ -1709,7 +1742,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_stable_errors</div>
             </td>
@@ -1718,7 +1751,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_check_update_stable_versions</div>
             </td>
@@ -1727,7 +1760,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_perform_update</div>
             </td>
@@ -1736,7 +1769,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_perform_update_stable_errors</div>
             </td>
@@ -1745,19 +1778,19 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='st15.7' class='none bg-warning'>
+        <tr id='st16.7' class='none bg-warning'>
             <td>
                 <div class='testcase'>test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st15.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st16.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id='div_st15.7' class="popup_window test_output" style="display:none;">
+                <div id='div_st16.7' class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick="document.getElementById('div_st15.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st16.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1780,13 +1813,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 17)">Detail</a>
+            <a onclick="showClassDetail('c17', 17)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_column_restriction</div>
             </td>
@@ -1795,7 +1828,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_tag_restriction</div>
             </td>
@@ -1804,7 +1837,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_author_user_template</div>
             </td>
@@ -1813,7 +1846,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_best_user_template</div>
             </td>
@@ -1822,7 +1855,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_category_user_template</div>
             </td>
@@ -1831,7 +1864,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_deny_column_restriction</div>
             </td>
@@ -1840,7 +1873,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_deny_tag_restriction</div>
             </td>
@@ -1849,7 +1882,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.8' class='hiddenRow bg-success'>
+        <tr id='pt17.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_detail_random_user_template</div>
             </td>
@@ -1858,7 +1891,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id='pt17.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_hot_user_template</div>
             </td>
@@ -1867,7 +1900,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.10' class='hiddenRow bg-success'>
+        <tr id='pt17.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_language_user_template</div>
             </td>
@@ -1876,7 +1909,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.11' class='hiddenRow bg-success'>
+        <tr id='pt17.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_limit_book_languages</div>
             </td>
@@ -1885,7 +1918,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.12' class='hiddenRow bg-success'>
+        <tr id='pt17.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_publisher_user_template</div>
             </td>
@@ -1894,7 +1927,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.13' class='hiddenRow bg-success'>
+        <tr id='pt17.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_random_user_template</div>
             </td>
@@ -1903,7 +1936,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.14' class='hiddenRow bg-success'>
+        <tr id='pt17.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_read_user_template</div>
             </td>
@@ -1912,7 +1945,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.15' class='hiddenRow bg-success'>
+        <tr id='pt17.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_recent_user_template</div>
             </td>
@@ -1921,7 +1954,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id='pt17.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_series_user_template</div>
             </td>
@@ -1930,7 +1963,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt16.17' class='hiddenRow bg-success'>
+        <tr id='pt17.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_ui_language_settings</div>
             </td>
@@ -1948,13 +1981,13 @@ AssertionError: False is not true : logfile config value is not empty after rese
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 23)">Detail</a>
+            <a onclick="showClassDetail('c18', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_about</div>
             </td>
@@ -1963,7 +1996,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_SMTP_Settings</div>
             </td>
@@ -1972,7 +2005,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_add_user</div>
             </td>
@@ -1981,7 +2014,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_password</div>
             </td>
@@ -1990,7 +2023,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_authors</div>
             </td>
@@ -1999,7 +2032,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_category</div>
             </td>
@@ -2008,7 +2041,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_file_formats</div>
             </td>
@@ -2017,7 +2050,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt18.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_hot</div>
             </td>
@@ -2026,7 +2059,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt18.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_language</div>
             </td>
@@ -2035,7 +2068,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.10' class='hiddenRow bg-success'>
+        <tr id='pt18.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_publisher</div>
             </td>
@@ -2044,7 +2077,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.11' class='hiddenRow bg-success'>
+        <tr id='pt18.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_rated</div>
             </td>
@@ -2053,7 +2086,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.12' class='hiddenRow bg-success'>
+        <tr id='pt18.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_rating</div>
             </td>
@@ -2062,7 +2095,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.13' class='hiddenRow bg-success'>
+        <tr id='pt18.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_read</div>
             </td>
@@ -2071,7 +2104,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.14' class='hiddenRow bg-success'>
+        <tr id='pt18.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_admin_change_visibility_series</div>
             </td>
@@ -2080,7 +2113,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.15' class='hiddenRow bg-success'>
+        <tr id='pt18.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_columns</div>
             </td>
@@ -2089,7 +2122,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.16' class='hiddenRow bg-success'>
+        <tr id='pt18.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_allow_tags</div>
             </td>
@@ -2098,7 +2131,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.17' class='hiddenRow bg-success'>
+        <tr id='pt18.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_checked_logged_in</div>
             </td>
@@ -2107,7 +2140,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.18' class='hiddenRow bg-success'>
+        <tr id='pt18.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_random_books_available</div>
             </td>
@@ -2116,7 +2149,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.19' class='hiddenRow bg-success'>
+        <tr id='pt18.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_restrict_columns</div>
             </td>
@@ -2125,7 +2158,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.20' class='hiddenRow bg-success'>
+        <tr id='pt18.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_restrict_tags</div>
             </td>
@@ -2134,7 +2167,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.21' class='hiddenRow bg-success'>
+        <tr id='pt18.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_search_functions</div>
             </td>
@@ -2143,7 +2176,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.22' class='hiddenRow bg-success'>
+        <tr id='pt18.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_email_available</div>
             </td>
@@ -2152,7 +2185,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
     
     
     
-        <tr id='pt17.23' class='hiddenRow bg-success'>
+        <tr id='pt18.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>test_user_visibility_sidebar</div>
             </td>
@@ -2163,8 +2196,8 @@ AssertionError: False is not true : logfile config value is not empty after rese
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>183</td>
-        <td>174</td>
+        <td>185</td>
+        <td>176</td>
         <td>2</td>
         <td>0</td>
         <td>7</td>
@@ -2315,7 +2348,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
 </div>
 
 <script>
-    drawCircle(174, 2, 0, 7);
+    drawCircle(176, 2, 0, 7);
 </script>
 
 </div>

From 81a329f1e77c687d94cf54bd9526345da27465d5 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 17 Apr 2020 18:16:21 +0200
Subject: [PATCH 03/17] Fix for #1087 ( Caliblur! Theme button alignment)

---
 cps/admin.py                   | 12 ++++++++----
 cps/config_sql.py              |  4 +---
 cps/constants.py               |  5 ++++-
 cps/services/simpleldap.py     | 16 +++++++++++-----
 cps/templates/config_edit.html | 24 +++++++++++++++++-------
 optional-requirements.txt      |  8 ++++----
 6 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 69316e8f..4003027d 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -547,7 +547,7 @@ def _configuration_update_helper():
     if config.config_login_type == constants.LOGIN_LDAP:
         reboot_required |= _config_string("config_ldap_provider_url")
         reboot_required |= _config_int("config_ldap_port")
-        # _config_string("config_ldap_schema")
+        reboot_required |= _config_int("config_ldap_authentication")
         reboot_required |= _config_string("config_ldap_dn")
         reboot_required |= _config_string("config_ldap_serv_username")
         reboot_required |= _config_string("config_ldap_user_object")
@@ -569,9 +569,13 @@ def _configuration_update_helper():
                 return _configuration_result(_('Please Enter a LDAP Provider, '
                                              'Port, DN and User Object Identifier'), gdriveError)
 
-
-        if not config.config_ldap_serv_username or not bool(config.config_ldap_serv_password):
-            return _configuration_result('Please Enter a LDAP Service Account and Password', gdriveError)
+        if config.config_ldap_authentication > constants.LDAP_AUTH_ANONYMOUS:
+            if config.config_ldap_authentication > constants.LDAP_AUTH_UNAUTHENTICATE:
+                if not config.config_ldap_serv_username:
+                    return _configuration_result('Please Enter a LDAP Service Account', gdriveError)
+            else:
+                if not config.config_ldap_serv_username or not bool(config.config_ldap_serv_password):
+                    return _configuration_result('Please Enter a LDAP Service Account and Password', gdriveError)
 
         #_config_checkbox("config_ldap_use_ssl")
         #_config_checkbox("config_ldap_use_tls")
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 7fc99a91..a6c82213 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -97,12 +97,10 @@ class _Settings(_Base):
 
     config_ldap_provider_url = Column(String, default='example.org')
     config_ldap_port = Column(SmallInteger, default=389)
-    # config_ldap_schema = Column(String, default='ldap')
+    config_ldap_authentication = Column(SmallInteger, default=constants.LDAP_AUTH_SIMPLE)
     config_ldap_serv_username = Column(String, default='cn=admin,dc=example,dc=org')
     config_ldap_serv_password = Column(String, default="")
     config_ldap_encryption = Column(SmallInteger, default=0)
-    # config_ldap_use_tls = Column(Boolean, default=False)
-    # config_ldap_require_cert = Column(Boolean, default=False)
     config_ldap_cert_path = Column(String, default="")
     config_ldap_dn = Column(String, default='dc=example,dc=org')
     config_ldap_user_object = Column(String, default='uid=%s')
diff --git a/cps/constants.py b/cps/constants.py
index 8301800b..d1fc299a 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -92,7 +92,10 @@ AUTO_UPDATE_NIGHTLY = 1 << 2
 LOGIN_STANDARD      = 0
 LOGIN_LDAP          = 1
 LOGIN_OAUTH         = 2
-# LOGIN_OAUTH_GOOGLE  = 3
+
+LDAP_AUTH_ANONYMOUS      = 0
+LDAP_AUTH_UNAUTHENTICATE = 1
+LDAP_AUTH_SIMPLE         = 0
 
 DEFAULT_MAIL_SERVER = "mail.example.org"
 
diff --git a/cps/services/simpleldap.py b/cps/services/simpleldap.py
index 841f61e1..05574af1 100644
--- a/cps/services/simpleldap.py
+++ b/cps/services/simpleldap.py
@@ -42,11 +42,17 @@ def init_app(app, config):
         app.config['LDAP_SCHEMA'] = 'ldaps'
     else:
         app.config['LDAP_SCHEMA'] = 'ldap'
-    # app.config['LDAP_SCHEMA'] = config.config_ldap_schema
-    app.config['LDAP_USERNAME'] = config.config_ldap_serv_username
-    if config.config_ldap_serv_password is None:
-        config.config_ldap_serv_password = ''
-    app.config['LDAP_PASSWORD'] = base64.b64decode(config.config_ldap_serv_password)
+    if config.config_ldap_authentication > constants.LDAP_AUTH_ANONYMOUS:
+        if config.config_ldap_authentication > constants.LDAP_AUTH_UNAUTHENTICATE:
+            if config.config_ldap_serv_password is None:
+                config.config_ldap_serv_password = ''
+            app.config['LDAP_PASSWORD'] = base64.b64decode(config.config_ldap_serv_password)
+        else:
+            app.config['LDAP_PASSWORD'] = base64.b64decode("''")
+        app.config['LDAP_USERNAME'] = config.config_ldap_serv_username
+    else:
+        app.config['LDAP_USERNAME'] = "''"
+        app.config['LDAP_PASSWORD'] = base64.b64decode("''")
     if bool(config.config_ldap_cert_path):
         app.config['LDAP_REQUIRE_CERT'] = True
         app.config['LDAP_CERT_PATH'] = config.config_ldap_cert_path
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index e9abdfde..553be036 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -233,7 +233,6 @@
           <input type="number" min="1" max="65535" 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" required>
         </div>
         <div class="form-group">
-          <label for="config_ldap_encryption">{{_('LDAP Encryption')}}</label>
           <label for="config_ldap_encryption">{{_('LDAP Encryption')}}</label>
             <select name="config_ldap_encryption" id="config_ldap_encryption" class="form-control" data-controlall="ldap-cert-settings">
                 <option value="0" {% if config.config_ldap_encryption == 0 %}selected{% endif %}>{{ _('None') }}</option>
@@ -247,14 +246,25 @@
             <input type="text" class="form-control" id="config_ldap_cert_path" name="config_ldap_cert_path" value="{% if config.config_ldap_cert_path != None %}{{ config.config_ldap_cert_path }}{% endif %}" autocomplete="off">
           </div>
         </div>
-
         <div class="form-group">
-          <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">
+          <label for="config_ldap_authentication">{{_('LDAP Authentication')}}</label>
+            <select name="config_ldap_authentication" id="config_ldap_authentication" class="form-control" data-control="ldap-auth-password" data-controlall="ldap-auth-settings">
+                <option value="0" {% if config.config_ldap_authentication == 0 %}selected{% endif %}>{{ _('Anonymous') }}</option>
+                <option value="1" {% if config.config_ldap_authentication == 1 %}selected{% endif %}>{{ _('Unauthenticated') }}</option>
+                <option value="2" {% if config.config_ldap_authentication == 2 %}selected{% endif %}>{{ _('Simple') }}</option>
+            </select>
         </div>
-        <div class="form-group">
-          <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="" autocomplete="off">
+        <div data-related="ldap-auth-settings">
+          <div class="form-group">
+            <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>
+        <div data-related="ldap-auth-password-2">
+          <div class="form-group">
+            <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="" autocomplete="off">
+          </div>
         </div>
         <div class="form-group">
           <label for="config_ldap_dn">{{_('LDAP Distinguished Name (DN)')}}</label>
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 3c10b52d..f705114d 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -17,12 +17,12 @@ goodreads>=0.3.2,<0.4.0
 python-Levenshtein>=0.12.0,<0.13.0
 
 # ldap login
-python_ldap>=3.0.0,<3.3.0
-flask-simpleldap>=1.4.0,<1.5.0
+python-ldap>=3.0.0,<3.3.0
+Flask-SimpleLDAP>=1.4.0,<1.5.0
 
 #oauth
-flask-dance>=1.4.0,<3.1.0
-sqlalchemy_utils>=0.33.5,<0.37.0
+Flask-Dance>=1.4.0,<3.1.0
+SQLAlchemy-Utils>=0.33.5,<0.37.0
 
 # extracting metadata
 lxml>=3.8.0,<4.6.0

From 195845ab0c1569572846823be4d3f164db687e8a Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 17 Apr 2020 18:17:35 +0200
Subject: [PATCH 04/17] Fix

---
 cps/templates/list.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cps/templates/list.html b/cps/templates/list.html
index de7989c4..b1f2b9e1 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -5,17 +5,17 @@
     <div class="filterheader hidden-xs hidden-sm">
       {% if entries.__len__() %}
        {% if entries[0][0].sort %}
-        <button id="sort_name" class="btn btn-success"><b>B,A <-> A B</b></button>
+        <button id="sort_name" class="btn btn-primary"><b>B,A <-> A B</b></button>
        {% endif %}
       {% endif %}
-      <button id="desc" class="btn btn-success"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
-      <button id="asc" class="btn btn-success"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
+      <button id="desc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet"></span></button>
+      <button id="asc" class="btn btn-primary"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></button>
       {% if charlist|length %}
-      <button id="all" class="btn btn-success">{{_('All')}}</button>
+      <button id="all" class="btn btn-primary">{{_('All')}}</button>
       {% endif %}
       <div class="btn-group character" role="group">
         {% for char in charlist%}
-        <button class="btn btn-success char">{{char.char}}</button>
+        <button class="btn btn-primary char">{{char.char}}</button>
         {% endfor %}
       </div>
     </div>

From 06fde4fcd00fcd067a58939e1d9eabee62a86913 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 18 Apr 2020 11:47:44 +0200
Subject: [PATCH 05/17] Fix #1311 (Enable LDAP Anonymous Login)

---
 cps/admin.py                                  |   6 +-
 cps/services/simpleldap.py                    |   8 +-
 cps/translations/cs/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/de/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/es/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/fi/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/fr/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/hu/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/it/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/ja/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/km/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/nl/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/pl/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/ru/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/sv/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 cps/translations/uk/LC_MESSAGES/messages.po   | 160 ++++++++++--------
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 160 ++++++++++--------
 cps/web.py                                    |   2 +-
 messages.pot                                  | 160 ++++++++++--------
 test/Calibre-Web TestSummary.html             |  59 +++++--
 20 files changed, 1462 insertions(+), 1173 deletions(-)
 mode change 100644 => 100755 test/Calibre-Web TestSummary.html

diff --git a/cps/admin.py b/cps/admin.py
index 4003027d..41f3b1db 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -571,11 +571,11 @@ def _configuration_update_helper():
 
         if config.config_ldap_authentication > constants.LDAP_AUTH_ANONYMOUS:
             if config.config_ldap_authentication > constants.LDAP_AUTH_UNAUTHENTICATE:
-                if not config.config_ldap_serv_username:
-                    return _configuration_result('Please Enter a LDAP Service Account', gdriveError)
-            else:
                 if not config.config_ldap_serv_username or not bool(config.config_ldap_serv_password):
                     return _configuration_result('Please Enter a LDAP Service Account and Password', gdriveError)
+            else:
+                if not config.config_ldap_serv_username:
+                    return _configuration_result('Please Enter a LDAP Service Account', gdriveError)
 
         #_config_checkbox("config_ldap_use_ssl")
         #_config_checkbox("config_ldap_use_tls")
diff --git a/cps/services/simpleldap.py b/cps/services/simpleldap.py
index 05574af1..b6fd0ac2 100644
--- a/cps/services/simpleldap.py
+++ b/cps/services/simpleldap.py
@@ -48,11 +48,11 @@ def init_app(app, config):
                 config.config_ldap_serv_password = ''
             app.config['LDAP_PASSWORD'] = base64.b64decode(config.config_ldap_serv_password)
         else:
-            app.config['LDAP_PASSWORD'] = base64.b64decode("''")
+            app.config['LDAP_PASSWORD'] = base64.b64decode("")
         app.config['LDAP_USERNAME'] = config.config_ldap_serv_username
     else:
-        app.config['LDAP_USERNAME'] = "''"
-        app.config['LDAP_PASSWORD'] = base64.b64decode("''")
+        app.config['LDAP_USERNAME'] = ""
+        app.config['LDAP_PASSWORD'] = base64.b64decode("")
     if bool(config.config_ldap_cert_path):
         app.config['LDAP_REQUIRE_CERT'] = True
         app.config['LDAP_CERT_PATH'] = config.config_ldap_cert_path
@@ -96,7 +96,7 @@ def bind_user(username, password):
             log.debug("LDAP login '%s': %r", username, result)
             return result is not None, None
         return None, None       # User not found
-    except (TypeError, AttributeError) as ex:
+    except (TypeError, AttributeError, KeyError) as ex:
         error = ("LDAP bind_user: %s" % ex)
         return None, error
     except LDAPException as ex:
diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 21458caf..b08ffa4a 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2020-01-08 11:37+0000\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
@@ -59,7 +59,7 @@ msgstr "Stránka správce"
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
@@ -89,185 +89,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Změnit nastavení e-mailového serveru"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, 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:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "Toto uživatelské jméno je již použito"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Došlo k neznámé chybě."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 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:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1240,7 +1240,7 @@ msgstr "OK"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1382,7 +1382,7 @@ msgstr "zobrazit knihu po úpravě"
 msgid "Fetch Metadata"
 msgstr "Získat metadata"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1602,107 +1602,123 @@ msgstr "Název hostitele serveru LDAP nebo IP adresa"
 msgid "LDAP Server Port"
 msgstr "LDAP Server Port"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Žádné"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "Uživatelské jméno správce LDAP"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "Heslo správce LDAP"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Rozlišující název LDAP (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "Filtr objektu uživatele LDAP"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Server LDAP je OpenLDAP?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Obtain %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Klient Id"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Klient Tajemství"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Externí binární soubory"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Žádný převaděč"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Použít Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Použít calibre převaděč eknih"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Nastavení převaděče eknih"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Cesta k převaděči"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Umístění Unrar binarních souborů"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Přihlásit"
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index dbba3fbe..e5469054 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2020-04-03 19:49+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -60,7 +60,7 @@ msgstr "Admin Seite"
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
@@ -90,185 +90,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Einstellungen des E-Mail-Servers bearbeiten"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 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:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
@@ -1241,7 +1241,7 @@ msgstr "OK"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1383,7 +1383,7 @@ msgstr "Buch nach Bearbeitung ansehen"
 msgid "Fetch Metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1603,107 +1603,123 @@ msgstr "LDAP-Server Hostname oder IP-Adresse"
 msgid "LDAP Server Port"
 msgstr "LDAP Server Port"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Keine"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "LDAP Administrator Benutzername"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "LDAP Administrator Passwort"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Ist der LDAP-Server ein OpenLDAP-Server?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Erhalte %(provider)s OAuth Berechtigungen"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Externe Programme"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Kein Konverter"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Kindlegen benutzen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Benutze Calibres Ebook-Konverter"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Einstellungen des E-Book Konverters"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Pfad zu Konvertertool"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Pfad zur UnRar-Binärdatei"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Login"
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index e97f4739..2936a36b 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2019-07-26 11:44+0100\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -62,7 +62,7 @@ msgstr "Página de administración"
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz del usuario"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
@@ -92,185 +92,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "¡Por favor completar todos los campos!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un nombre de dominio válido"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Editar los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, 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:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede eliminar usuario"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 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:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Ocurrió un error inesperado."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 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:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Remplazando ficheros"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Los conexiones de base datos están cerradas"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Parando servidor"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 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:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Fallo al actualizar"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1243,7 +1243,7 @@ msgstr "Ok"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1385,7 +1385,7 @@ msgstr "ver libro tras la edición"
 msgid "Fetch Metadata"
 msgstr "Obtener metadatos"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1605,107 +1605,123 @@ msgstr "Nombre de host o dirección IP del servidor LDAP"
 msgid "LDAP Server Port"
 msgstr "Puerto del servidor LDAP"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ninguno"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "Nombre de usuario de administrador LDAP"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "Contraseña de administrador LDAP"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Nombre distinguido LDAP (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "Filtro de objetos de usuario LDAP"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "¿El servidor LDAP es OpenLDAP?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Obtener la Credencial OAuth de %(proveedor)"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "Id. de cliente de OAuth de %(provider)"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "Secreto OAuth de Cliente de %(provider)"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Binarios externos"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "No convertir"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Utilizar Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Utilizar el convertidor de libros de Calibre"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Ajustes del convertidos E-Book"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Ruta para convertertool"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Ubicación del binario de Unrar"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Inicio de sesión"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 5276767c..df9df98b 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -60,7 +60,7 @@ msgstr "Ylläpitosivu"
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
@@ -90,185 +90,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Muuta sähköpostipalvelimen asetuksia"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testisähköposti lähetetty onnistuneesti osoitteeseen %(kindlemail)s"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 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:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 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:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Tapahtui tuntematon virhe."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 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:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1241,7 +1241,7 @@ msgstr "Ok"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1383,7 +1383,7 @@ msgstr "katso kirjaa muokkauksen jälkeen"
 msgid "Fetch Metadata"
 msgstr "Hae metadata"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1603,107 +1603,123 @@ msgstr "LDAP palvelimen nimi tai IP osoite"
 msgid "LDAP Server Port"
 msgstr "LDAP Palveimen portti"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ei mitään"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "LDAP pääkäyttäjän käyttäjänimi"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "LDAP pääkäyttäjän salasana"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP DN"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "LDAP käyttäjä suodin (object filter)"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP palvelin on OpenLDAP?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Hanki %(provider)s OAuth valtuutus"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth asiakas Id"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth asiakas salaisuus"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Ulkoiset binäärit"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Ei muuntajaa"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Käytä Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Käytä calibren e-kirjamuuntajaa"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "E-kirjamuuntajan asetukset"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Polku muunnintyökaluun"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Unrar binäärin paikka"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Kirjaudu sisään"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index f3ad250f..f8e498e6 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2019-08-21 15:20+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -73,7 +73,7 @@ msgstr "Page administrateur"
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
@@ -103,185 +103,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, 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:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 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:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, 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:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable…"
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Demander une mise à jour"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Téléchargement la mise à jour"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Connexion à la base de donnée fermée"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 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:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1254,7 +1254,7 @@ msgstr "Oui"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1396,7 +1396,7 @@ msgstr "voir le livre après l'édition"
 msgid "Fetch Metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1616,107 +1616,123 @@ msgstr ""
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Aucun"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Configuration des outils de conversion externes"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Pas de convertisseur"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Utiliser Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Utiliser Calibre ebook-convert"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Paramètres de la commande de conversion de livres"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Chemin d’accès à la commande de conversion"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Chemin d’accès à la commande UnRar"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Connexion"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 85e5cd3c..cc58e56c 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -60,7 +60,7 @@ msgstr "Rendszergazda oldala"
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
@@ -90,185 +90,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Az e-mail kiszolgáló beállításainak módosítása"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, 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:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 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:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Ismeretlen hiba történt."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, 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:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 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:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 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:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 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:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1241,7 +1241,7 @@ msgstr "OK"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1383,7 +1383,7 @@ msgstr "Könyv megnézése szerkesztés után"
 msgid "Fetch Metadata"
 msgstr "Metaadatok beszerzése"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1603,107 +1603,123 @@ msgstr ""
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Nincs"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Külső futtatható fájlok"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Átalakítás nélkül"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Kindlegen használata"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Calibre e-könyv átalakító használata"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "E-könyv átalakító beállításai"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Elérési út az átalakító-eszközhöz"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Az Unrar futtatási állományának helye"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Belépés"
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 1420ebe6..7bf16a4a 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -59,7 +59,7 @@ msgstr "Pagina di amministrazione"
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è aggiornata"
 
@@ -89,185 +89,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Creato l'utente '%(user)s'"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Modifica la configurazione del server e-mail"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, 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:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utente '%(nick)s' eliminato"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 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:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica utente %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utente '%(nick)s' aggiornato"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Si è verificato un errore imprevisto."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Aggiornamento fallito:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
@@ -1240,7 +1240,7 @@ msgstr "Ok"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1382,7 +1382,7 @@ msgstr "visualizza il libro dopo la modifica"
 msgid "Fetch Metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1602,107 +1602,123 @@ msgstr "Nome o indirizzo IP del server LDAP"
 msgid "LDAP Server Port"
 msgstr "Porta del server LDAP"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Nessuna"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "Nome di utente dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "Password dell'amministratore LDAP"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "LDAP User object filter"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Il server LDAP è un server OpenLDAP?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Ottieni le credenziali OAuth di %(provider)s"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Files binari esterni"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Nessun convertitore"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Utilizza Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Utilizza il convertitore di Calibre"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Configurazione del convertitore di libri"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Percorso del convertitore"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Percorso di UnRar"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Accesso"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index cb8997b8..381c6e1d 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -60,7 +60,7 @@ msgstr "管理者ページ"
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
@@ -90,185 +90,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "メールサーバの設定を編集"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "テストメールが %(kindlemail)s に送信されました"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "不明なエラーが発生しました。"
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1241,7 +1241,7 @@ msgstr ""
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1383,7 +1383,7 @@ msgstr ""
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1603,107 +1603,123 @@ msgstr ""
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "なし"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "外部バイナリ"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Kindlegenを使う"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "calibreのebook converterを使う"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "E-Book converterの設定"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "convertertoolのパス"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Unrarバイナリのパス"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "ログイン"
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 0c24ec3e..5e2d3227 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -61,7 +61,7 @@ msgstr "ទំព័ររដ្ឋបាល"
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -91,185 +91,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1242,7 +1242,7 @@ msgstr "បាទ/ចាស"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1384,7 +1384,7 @@ msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 msgid "Fetch Metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1604,107 +1604,123 @@ msgstr ""
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "គ្មាន"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "គ្មានកម្មវិធីបម្លែង"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "ប្រើ Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "ប្រើកម្មវិធីបម្លែង eBook របស់ Calibre"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "ការកំណត់របស់កម្មវិធីបម្លែង eBook"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "ទីតាំងរបស់កម្មវិធីបម្លែង"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 398652c9..db1c5ff2 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: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2020-03-06 19:28+0100\n"
 "Last-Translator: Ed Driesen <ed.driesen@telenet.be>\n"
 "Language: nl\n"
@@ -61,7 +61,7 @@ msgstr "Systeembeheer"
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
@@ -91,185 +91,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Nieuwe gebruiker toevoegen"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "E-mailserverinstellingen bewerken"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-mail verstuurd naar %(kindlemail)s"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "E-mailserverinstellingen bijgewerkt"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' is verwijderd"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is reeds ingenomen door iemand"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Bezig met opvragen van updatepakket"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Bezig met downloaden van updatepakket"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Bezig met uitpakken van updatepakket"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Bezig met bestandsvervanging"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Databankverbindingen zijn gesloten"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Bezig met stoppen van server"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid; klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1242,7 +1242,7 @@ msgstr "Oké"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1384,7 +1384,7 @@ msgstr "Boek inkijken na bewerking"
 msgid "Fetch Metadata"
 msgstr "Metagegevens ophalen"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1604,107 +1604,123 @@ msgstr "LDAP Server hostnaam of IP-adres"
 msgid "LDAP Server Port"
 msgstr "LDAP Server Poort"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Geen"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "LDAP Administrator naam"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "LDAP Administrator wachtwoord"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP Server is OpenLDAP?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Verkrijg %(provider)s OAuth Verificatiegegevens"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client geheim"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Externe programma's"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Geen conversieprogramma"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "KindleGen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Calibre's e-boekconversie gebruiken"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Conversie-instellingen"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Locatie van conversieprogramma"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Locatie van Unrar-programma"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Inloggen"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 41df9131..d47dee81 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2020-03-31 21:50+0200\n"
 "Last-Translator: Jerzy Piątek <jerzy.piatek@gmail.com>\n"
 "Language: pl\n"
@@ -62,7 +62,7 @@ msgstr "Panel administratora"
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
@@ -92,187 +92,187 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Konfiguracja podstawowa"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub pseudonimu."
 
-#: cps/admin.py:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Edycja ustawień serwera e-mail"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testowy e-mail pomyślnie przesłany do %(kindlemail)s"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 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:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
 # ???
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1250,7 +1250,7 @@ msgstr "OK"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1395,7 +1395,7 @@ msgstr "Po zapisaniu wyświetl szczegóły książki"
 msgid "Fetch Metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1617,107 +1617,123 @@ msgstr "Nazwa hosta lub adres IP serwera LDAP"
 msgid "LDAP Server Port"
 msgstr "Port serwera LDAP"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Brak"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "Nazwa administratora LDAP"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "Hasło administratora LDAP"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "LDAP User Object Filter"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Serwer LDAP to OpenLDAP?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Uzyskaj %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth Client Id"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Client Secret"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Zewnętrzne pliki"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Brak konwertera"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Użyj konwertera Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Użyj konwertera książek Calibre"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Ustawienia konwertera e-booków (dodatkowe parametry)"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Lokalizacja pliku konwertera"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Lokalizacja pliku binarnego Unrar"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Zaloguj się"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 17155811..6380c24b 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2020-03-07 11:12+0100\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -61,7 +61,7 @@ msgstr "Администрирование"
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
@@ -91,185 +91,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Изменить настройки e-mail сервера"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Тестовое письмо успешно отправлено на %(kindlemail)s"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP"
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1242,7 +1242,7 @@ msgstr "Ok"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1384,7 +1384,7 @@ msgstr "смотреть книгу после редактирования"
 msgid "Fetch Metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1604,107 +1604,123 @@ msgstr "Имя хоста или IP-адрес сервера LDAP"
 msgid "LDAP Server Port"
 msgstr "Порт сервера LDAP"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Нет"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "Имя администратора LDAP"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "Пароль администратора LDAP"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "Отличительное имя LDAP (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "Фильтр объектов пользователя LDAP"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "Сервер LDAP - это OpenLDAP ?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Получить %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth ID клиента"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth Секрет клиента"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Внешний бинарный файл"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Нет конвертера"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Использовать Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Использовать конвертер calibre's ebook"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Настройки конвертера E-Book"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Путь к инструменту конвертации"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Расположение бинарного файла Unrar"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Логин"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 34adc474..a80a5158 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2020-03-14 09:30+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -60,7 +60,7 @@ msgstr "Administrationssida"
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
@@ -90,185 +90,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 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:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "Redigera inställningar för e-postserver"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-post skicka till %(kindlemail)s"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, 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:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 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:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Ett okänt fel uppstod."
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1241,7 +1241,7 @@ msgstr "Ok"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1383,7 +1383,7 @@ msgstr "Visa bok vid Spara"
 msgid "Fetch Metadata"
 msgstr "Hämta metadata"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1603,107 +1603,123 @@ msgstr "LDAP-serverns värdnamn eller IP-adress"
 msgid "LDAP Server Port"
 msgstr "LDAP-serverport"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ingen"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "LDAP-adminstratörsanvändarnamn"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "LDAP-adminstratörslösenord"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr "LDAP Distinguished Name (DN)"
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr "LDAP-användarobjektfilter"
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr "LDAP-server är OpenLDAP?"
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "Skaffa %(provider)s OAuth-certifikat"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr "%(provider)s OAuth-klient-id"
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr "%(provider)s OAuth-klient-hemlighet"
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "Externa binärer"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "Ingen konverterare"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "Använd Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "Använd calibres e-bokkonverterare"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "Inställningar för e-bokkonverteraren"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "Sökväg till convertertool"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Plats för Unrar-binär"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Logga in"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 830779ef..f82752e2 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -59,7 +59,7 @@ msgstr "Сторінка адміністратора"
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -89,185 +89,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "Сталась невідома помилка"
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1240,7 +1240,7 @@ msgstr "Ok"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1382,7 +1382,7 @@ msgstr "переглянути книгу після редагування"
 msgid "Fetch Metadata"
 msgstr "Отримати метадані"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1602,107 +1602,123 @@ msgstr ""
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "Ні"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr ""
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr ""
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "Ім'я користувача"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 837071d6..9b250423 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: 2017-01-06 17:00+0000\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -60,7 +60,7 @@ msgstr "管理页"
 msgid "UI Configuration"
 msgstr "UI配置"
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
@@ -90,185 +90,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中'"
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "此邮箱或昵称的账号已经存在。"
 
-#: cps/admin.py:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr "编辑邮箱服务器设置"
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件出错了: %(res)s"
 
-#: cps/admin.py:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置有效的邮箱地址..."
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr "已更新邮件服务器设置"
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr "admin账户不存在，无法删除用户"
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr "找到一个已有账号使用这个邮箱。"
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请按确定并刷新页面"
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1241,7 +1241,7 @@ msgstr "确定"
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1383,7 +1383,7 @@ msgstr "编辑后查看书籍"
 msgid "Fetch Metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1603,107 +1603,123 @@ msgstr "LDAP服务器名称或IP地址"
 msgid "LDAP Server Port"
 msgstr "LDAP服务器端口"
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr "无"
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr "LDAP管理员用户名"
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr "LDAP管理员密码"
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr "获取 %(provider)s OAuth Credential"
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr "外部二进制"
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr "没有转换器"
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr "使用Kindlegen"
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr "使用calibre的电子书转换器"
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr "电子书转换设置"
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr "转换工具路径"
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr "Unrar二进制位置"
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr "登录"
diff --git a/cps/web.py b/cps/web.py
index e67ae9cc..bfb0ec5d 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -285,7 +285,7 @@ def import_ldap_users():
     showtext = {}
     try:
         new_users = services.ldap.get_group_members(config.config_ldap_group_name)
-    except (services.ldap.LDAPException, TypeError, AttributeError) as e:
+    except (services.ldap.LDAPException, TypeError, AttributeError, KeyError) as e:
         log.debug(e)
         showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
         return json.dumps(showtext)
diff --git a/messages.pot b/messages.pot
index 3e540bc8..ad99f51e 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-04-16 20:16+0200\n"
+"POT-Creation-Date: 2020-04-18 11:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:192 cps/admin.py:672
+#: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -89,185 +89,185 @@ msgstr ""
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:583
+#: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:593
+#: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:597
+#: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:645
+#: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:650
+#: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:669
+#: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:702
+#: cps/admin.py:706
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:726 cps/web.py:1162
+#: cps/admin.py:730 cps/web.py:1162
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:729 cps/admin.py:741 cps/admin.py:747 cps/admin.py:765
+#: cps/admin.py:733 cps/admin.py:745 cps/admin.py:751 cps/admin.py:769
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:738 cps/web.py:1409
+#: cps/admin.py:742 cps/web.py:1409
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:745 cps/admin.py:760
+#: cps/admin.py:749 cps/admin.py:764
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:756
+#: cps/admin.py:760
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:775
+#: cps/admin.py:779
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/admin.py:801
+#: cps/admin.py:805
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:804
+#: cps/admin.py:808
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:810
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:808
+#: cps/admin.py:812
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:838
+#: cps/admin.py:842
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:841
+#: cps/admin.py:845
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:877 cps/web.py:1452
+#: cps/admin.py:881 cps/web.py:1452
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:887 cps/admin.py:902 cps/admin.py:922 cps/web.py:1427
+#: cps/admin.py:891 cps/admin.py:906 cps/admin.py:926 cps/web.py:1427
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:893 cps/web.py:1419
+#: cps/admin.py:897 cps/web.py:1419
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:909
+#: cps/admin.py:913
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:912
+#: cps/admin.py:916
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/admin.py:935
+#: cps/admin.py:939
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:938 cps/web.py:1187 cps/web.py:1251
+#: cps/admin.py:942 cps/web.py:1187 cps/web.py:1251
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:941 cps/web.py:1128
+#: cps/admin.py:945 cps/web.py:1128
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:953
+#: cps/admin.py:957
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:992
+#: cps/admin.py:996
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:993
+#: cps/admin.py:997
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:994
+#: cps/admin.py:998
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:995
+#: cps/admin.py:999
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:996
+#: cps/admin.py:1000
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:997
+#: cps/admin.py:1001
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:998
+#: cps/admin.py:1002
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:999 cps/admin.py:1000 cps/admin.py:1001 cps/admin.py:1002
-#: cps/admin.py:1003
+#: cps/admin.py:1003 cps/admin.py:1004 cps/admin.py:1005 cps/admin.py:1006
+#: cps/admin.py:1007
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:999 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
+#: cps/admin.py:1003 cps/updater.py:319 cps/updater.py:520 cps/updater.py:522
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1000 cps/updater.py:321 cps/updater.py:524
+#: cps/admin.py:1004 cps/updater.py:321 cps/updater.py:524
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1001 cps/updater.py:323 cps/updater.py:526
+#: cps/admin.py:1005 cps/updater.py:323 cps/updater.py:526
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1002 cps/updater.py:325 cps/updater.py:528
+#: cps/admin.py:1006 cps/updater.py:325 cps/updater.py:528
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1003
+#: cps/admin.py:1007
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
@@ -1240,7 +1240,7 @@ msgstr ""
 
 #: cps/templates/admin.html:171 cps/templates/admin.html:185
 #: cps/templates/book_edit.html:172 cps/templates/book_edit.html:194
-#: cps/templates/config_edit.html:355 cps/templates/config_view_edit.html:151
+#: cps/templates/config_edit.html:365 cps/templates/config_view_edit.html:151
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:92
 #: cps/templates/shelf.html:73 cps/templates/shelf_edit.html:19
 #: cps/templates/user_edit.html:137
@@ -1382,7 +1382,7 @@ msgstr ""
 msgid "Fetch Metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:352
+#: cps/templates/book_edit.html:171 cps/templates/config_edit.html:362
 #: 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"
@@ -1602,107 +1602,123 @@ msgstr ""
 msgid "LDAP Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:236 cps/templates/config_edit.html:237
+#: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:239 cps/templates/config_view_edit.html:61
+#: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
 msgid "None"
 msgstr ""
 
-#: cps/templates/config_edit.html:240
+#: cps/templates/config_edit.html:239
 msgid "TLS"
 msgstr ""
 
-#: cps/templates/config_edit.html:241
+#: cps/templates/config_edit.html:240
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/config_edit.html:246
+#: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
 msgstr ""
 
+#: cps/templates/config_edit.html:250
+msgid "LDAP Authentication"
+msgstr ""
+
 #: cps/templates/config_edit.html:252
+msgid "Anonymous"
+msgstr ""
+
+#: cps/templates/config_edit.html:253
+msgid "Unauthenticated"
+msgstr ""
+
+#: cps/templates/config_edit.html:254
+msgid "Simple"
+msgstr ""
+
+#: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
 msgstr ""
 
-#: cps/templates/config_edit.html:256
+#: cps/templates/config_edit.html:265
 msgid "LDAP Administrator Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:260
+#: cps/templates/config_edit.html:270
 msgid "LDAP Distinguished Name (DN)"
 msgstr ""
 
-#: cps/templates/config_edit.html:264
+#: cps/templates/config_edit.html:274
 msgid "LDAP User Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:269
+#: cps/templates/config_edit.html:279
 msgid "LDAP Server is OpenLDAP?"
 msgstr ""
 
-#: cps/templates/config_edit.html:271
+#: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
 msgstr ""
 
-#: cps/templates/config_edit.html:273
+#: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
 msgstr ""
 
-#: cps/templates/config_edit.html:277
+#: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
 msgstr ""
 
-#: cps/templates/config_edit.html:281
+#: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
 msgstr ""
 
-#: cps/templates/config_edit.html:290
+#: cps/templates/config_edit.html:300
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
 msgstr ""
 
-#: cps/templates/config_edit.html:293
+#: cps/templates/config_edit.html:303
 #, python-format
 msgid "%(provider)s OAuth Client Id"
 msgstr ""
 
-#: cps/templates/config_edit.html:297
+#: cps/templates/config_edit.html:307
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:313
+#: cps/templates/config_edit.html:323
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:321
+#: cps/templates/config_edit.html:331
 msgid "No Converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:323
+#: cps/templates/config_edit.html:333
 msgid "Use Kindlegen"
 msgstr ""
 
-#: cps/templates/config_edit.html:325
+#: cps/templates/config_edit.html:335
 msgid "Use calibre's ebook converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:329
+#: cps/templates/config_edit.html:339
 msgid "E-Book converter settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:333
+#: cps/templates/config_edit.html:343
 msgid "Path to convertertool"
 msgstr ""
 
-#: cps/templates/config_edit.html:339
+#: cps/templates/config_edit.html:349
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:358 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:368 cps/templates/layout.html:84
 #: cps/templates/login.html:4 cps/templates/login.html:20
 msgid "Login"
 msgstr ""
diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
old mode 100644
new mode 100755
index 460f9aea..b39857b4
--- a/test/Calibre-Web TestSummary.html	
+++ b/test/Calibre-Web TestSummary.html	
@@ -36,17 +36,17 @@
       <div class="col-xs-12 col-sm-6">
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
-            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-16 21:05:16</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2020-04-18 10:46:25</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-16 21:53:03</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2020-04-18 11:34:54</p>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-6 col-md-6 col-sm-offset-3">
-           <p class='text-justify attribute'><strong>Duration: </strong>41:12 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>41:54 min</p>
         </div>
       </div>
       </div>
@@ -1006,9 +1006,9 @@
                         <pre class="text-left">Traceback (most recent call last):
   File "/home/matthias/Entwicklung/calibre-web-test/test/test_kobo_sync.py", line 89, in test_check_sync
     self.assertEqual(r.json()['Resources']['image_url_quality_template'], self.kobo_adress+"/{ImageId}/{width}/{height}/image.jpg")
-AssertionError: 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg' != 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/{width}/{height}/image.jpg'
-- http://192.168.188.33:8083/kobo/0c877fb4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg
-+ http://192.168.188.33:8083/kobo/0c877fb4dd7bb34f15173d3cfcccd48b/{ImageId}/{width}/{height}/image.jpg
+AssertionError: 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/image.jpg' != 'http[35 chars]65c2703d57c660b93b6ebdafa/{ImageId}/{width}/{height}/image.jpg'
+- http://192.168.188.33:8083/kobo/8e590a265c2703d57c660b93b6ebdafa/{ImageId}/image.jpg
++ http://192.168.188.33:8083/kobo/8e590a265c2703d57c660b93b6ebdafa/{ImageId}/{width}/{height}/image.jpg
 ?                                                                            +++++++++++++++++</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -1040,13 +1040,13 @@ AssertionError: 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg' !=
 
     <tr class="result['header']['style']">
         <td>test_ldap.test_ldap_login</td>
-        <td class="text-center">7</td>
-        <td class="text-center">7</td>
+        <td class="text-center">8</td>
+        <td class="text-center">8</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 7)">Detail</a>
+            <a onclick="showClassDetail('c9', 8)">Detail</a>
         </td>
     </tr>
 
@@ -1114,6 +1114,15 @@ AssertionError: 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg' !=
         </tr>
     
     
+    
+        <tr id='pt9.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>test_ldap_authentication</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr class="result['header']['style']">
@@ -1310,7 +1319,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
 
 
     <tr class="result['header']['style']">
-        <td>test_oauth.test_outh_login</td>
+        <td>test_oauth.test_OAuth_login</td>
         <td class="text-center">2</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
@@ -2196,8 +2205,8 @@ AssertionError: False is not true : logfile config value is not empty after rese
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>185</td>
-        <td>176</td>
+        <td>186</td>
+        <td>177</td>
         <td>2</td>
         <td>0</td>
         <td>7</td>
@@ -2340,6 +2349,30 @@ AssertionError: False is not true : logfile config value is not empty after rese
               <td>test_kobo_sync</td>
             </tr>
           
+            <tr>
+              <th>Flask-SimpleLDAP</th>
+              <td>1.4.0</td>
+              <td>test_ldap_login</td>
+            </tr>
+          
+            <tr>
+              <th>python-ldap</th>
+              <td>3.2.0</td>
+              <td>test_ldap_login</td>
+            </tr>
+          
+            <tr>
+              <th>Flask-Dance</th>
+              <td>3.0.0</td>
+              <td>test_OAuth_login</td>
+            </tr>
+          
+            <tr>
+              <th>SQLAlchemy-Utils</th>
+              <td>0.36.3</td>
+              <td>test_OAuth_login</td>
+            </tr>
+          
           </tbody>
         </table>
       </div>
@@ -2348,7 +2381,7 @@ AssertionError: False is not true : logfile config value is not empty after rese
 </div>
 
 <script>
-    drawCircle(176, 2, 0, 7);
+    drawCircle(177, 2, 0, 7);
 </script>
 
 </div>

From c04b1464866bc2d0adf7a6d8ae55fcc165fd5e30 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 18 Apr 2020 21:15:02 +0200
Subject: [PATCH 06/17] Fix #1309 (fix duplicate shelf names in book detail
 view)

---
 cps/templates/detail.html | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 00510a2b..03628559 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -225,18 +225,6 @@
             <span class="caret"></span>
           </button>
           <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
-            {% for shelf in g.user.shelf %}
-              {% if not shelf.id in books_shelfs and shelf.is_public != 1 %}
-                <li>
-                  <a href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                     data-remove-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                     data-shelf-action="add"
-                  >
-                    {{shelf.name}}
-                  </a>
-                </li>
-              {% endif %}
-            {%endfor%}
             {% for shelf in g.shelves_access %}
               {% if not shelf.id in books_shelfs %}
                 <li>
@@ -253,16 +241,6 @@
         </div>
         <div id="remove-from-shelves" class="btn-group" role="group" aria-label="Remove from shelves">
           {% if books_shelfs %}
-            {% for shelf in g.user.shelf %}
-              {% if shelf.id in books_shelfs and shelf.is_public != 1 %}
-                <a href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                   data-add-href="{{ url_for('shelf.add_to_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
-                   class="btn btn-sm btn-default" role="button" data-shelf-action="remove"
-                >
-                  <span class="glyphicon glyphicon-remove"></span> {{shelf.name}}
-                </a>
-              {% endif %}
-            {%endfor%}
             {% for shelf in g.shelves_access %}
               {% if shelf.id in books_shelfs %}
                 <a href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"

From 902685a1970fd2ba0229ace345ede50af4370079 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 18 Apr 2020 21:30:28 +0200
Subject: [PATCH 07/17] Fix text in user config section (random books in Detail
 View)

---
 cps/templates/user_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index cb473f38..6adae1e7 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -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')}}</label>
+          <label for="Show_detail_random">{{_('Show Random Books in Detail View')}}</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>

From f1b1ebe29ea1ee63cebb8e210be9232ae19c0961 Mon Sep 17 00:00:00 2001
From: ElQuimm <50202052+ElQuimm@users.noreply.github.com>
Date: Sun, 19 Apr 2020 16:38:30 +0200
Subject: [PATCH 08/17] Updated italian version of messages.po

---
 cps/translations/it/LC_MESSAGES/messages.po | 90 ++++++++++-----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 7bf16a4a..d381f6ce 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -39,11 +39,11 @@ msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
 #: cps/admin.py:102
 msgid "Reconnect successful"
-msgstr ""
+msgstr "Ricollegato con successo"
 
 #: cps/admin.py:105
 msgid "Unknown command"
-msgstr ""
+msgstr "Comando sconosciuto"
 
 #: cps/admin.py:115 cps/editbooks.py:410 cps/editbooks.py:419
 #: cps/editbooks.py:539 cps/editbooks.py:541 cps/editbooks.py:594
@@ -61,7 +61,7 @@ msgstr "Configurazione dell'interfaccia utente"
 
 #: cps/admin.py:192 cps/admin.py:676
 msgid "Calibre-Web configuration updated"
-msgstr "La configurazione di Calibre-Web è aggiornata"
+msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
 #: cps/admin.py:439 cps/admin.py:445 cps/admin.py:456 cps/admin.py:467
 #: cps/templates/modal_restriction.html:29
@@ -75,53 +75,53 @@ msgstr "Permetti"
 
 #: cps/admin.py:510
 msgid "client_secrets.json Is Not Configured For Web Application"
-msgstr ""
+msgstr "client_secrets.json non è configurato per Web Application"
 
 #: cps/admin.py:526
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "La posizione del Keyfile non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:530
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "La posizione del Certfile non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:569
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
-msgstr ""
+msgstr "Per favore digita un Provider LDAP, porta, DN e User Object Identifier"
 
 #: cps/admin.py:587
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
-msgstr ""
+msgstr "LDAP Group Object Filter deve avere un \"%s\" Format Identifier"
 
 #: cps/admin.py:590
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
-msgstr ""
+msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
 #: cps/admin.py:594
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
-msgstr ""
+msgstr "LDAP User Object Filter deve avere un \"%s\" Format Identifier"
 
 #: cps/admin.py:597
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
-msgstr ""
+msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
 #: cps/admin.py:601
 msgid "LDAP Certificate Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "La posizione del certificato LDAP non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:649
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "La posizione del Logfile non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:654
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "La posizione dell'Access Logfile non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:673
 msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "La posizione del DB non è valida, per favore indica il percorso corretto"
 
 #: cps/admin.py:706
 msgid "Basic Configuration"
@@ -549,26 +549,26 @@ msgstr "ora sei connesso come: '%(nickname)s'"
 #: cps/oauth_bb.py:235
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
-msgstr ""
+msgstr "Collegamento a %(oauth)s avvenuto con successo"
 
 #: cps/oauth_bb.py:241
 msgid "Login failed, No User Linked With OAuth Account"
-msgstr ""
+msgstr "Accesso fallito, non c'è un utente collegato all'account OAuth"
 
 #: cps/oauth_bb.py:283
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
-msgstr ""
+msgstr "Scollegamento da  %(oauth)s avvenuto con successo"
 
 #: cps/oauth_bb.py:287
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
-msgstr ""
+msgstr "Scollegamento da  %(oauth)s fallito"
 
 #: cps/oauth_bb.py:290
 #, python-format
 msgid "Not Linked to %(oauth)s."
-msgstr ""
+msgstr "Non collegato a %(oauth)s."
 
 #: cps/oauth_bb.py:318
 msgid "GitHub Oauth error, please retry later."
@@ -799,7 +799,7 @@ msgstr "Dati inattesi durante il processo di aggiornamento"
 
 #: cps/updater.py:301 cps/updater.py:412
 msgid "No update available. You already have the latest version installed"
-msgstr "Nessun aggiornamento disponibile. L'ultima versione è già installata"
+msgstr "Nessun aggiornamento disponibile. Hai già installata l'ultima versione disponibile"
 
 #: cps/updater.py:333
 msgid "A new update is available. Click on the button below to update to the latest version."
@@ -825,23 +825,23 @@ msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
 #: cps/web.py:290
 #, python-format
 msgid "Error: %(ldaperror)s"
-msgstr ""
+msgstr "Errore: %(ldaperror)s"
 
 #: cps/web.py:294
 msgid "Error: No user returned in response of LDAP server"
-msgstr ""
+msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
 #: cps/web.py:342
 msgid "Failed to Create at Least One LDAP User"
-msgstr ""
+msgstr "Fallita la creazione di almeno un utente LDAP"
 
 #: cps/web.py:345
 msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
+msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
 #: cps/web.py:347
 msgid "User Successfully Imported"
-msgstr ""
+msgstr "Utente importato con successo"
 
 #: cps/web.py:549
 msgid "Recently Added Books"
@@ -980,12 +980,12 @@ msgstr "Non posso attivare l'autenticazione LDAP"
 #: cps/web.py:1230
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
-msgstr ""
+msgstr "Login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
 #: cps/web.py:1236
 #, python-format
 msgid "Could not login: %(message)s"
-msgstr ""
+msgstr "Non posso accedere: %(message)s"
 
 #: cps/web.py:1240 cps/web.py:1264
 msgid "Wrong Username or Password"
@@ -1103,7 +1103,7 @@ msgstr "Aggiungi un nuovo utente"
 
 #: cps/templates/admin.html:40 cps/templates/admin.html:41
 msgid "Import LDAP Users"
-msgstr ""
+msgstr "Importa gli utenti LDAP"
 
 #: cps/templates/admin.html:48
 msgid "E-mail Server Settings"
@@ -1111,11 +1111,11 @@ msgstr "Configurazione server SMTP"
 
 #: cps/templates/admin.html:51 cps/templates/email_edit.html:11
 msgid "SMTP Hostname"
-msgstr "indirizzo server SMTP"
+msgstr "Indirizzo server SMTP"
 
 #: cps/templates/admin.html:52 cps/templates/email_edit.html:15
 msgid "SMTP Port"
-msgstr "porta SMTP"
+msgstr "Porta SMTP"
 
 #: cps/templates/admin.html:53 cps/templates/email_edit.html:19
 msgid "Encryption"
@@ -1123,7 +1123,7 @@ msgstr "SSL"
 
 #: cps/templates/admin.html:54 cps/templates/email_edit.html:27
 msgid "SMTP Login"
-msgstr "login SMTP"
+msgstr "Login SMTP"
 
 #: cps/templates/admin.html:55 cps/templates/email_edit.html:35
 msgid "From E-mail"
@@ -1604,7 +1604,7 @@ msgstr "Porta del server LDAP"
 
 #: cps/templates/config_edit.html:236
 msgid "LDAP Encryption"
-msgstr ""
+msgstr "Cifratura LDAP"
 
 #: cps/templates/config_edit.html:238 cps/templates/config_view_edit.html:61
 #: cps/templates/email_edit.html:21
@@ -1613,31 +1613,31 @@ msgstr "Nessuna"
 
 #: cps/templates/config_edit.html:239
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: cps/templates/config_edit.html:240
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: cps/templates/config_edit.html:245
 msgid "LDAP Certificate Path"
-msgstr ""
+msgstr "Cartella del certificato LDAP"
 
 #: cps/templates/config_edit.html:250
 msgid "LDAP Authentication"
-msgstr ""
+msgstr "Autenticazione LDAP"
 
 #: cps/templates/config_edit.html:252
 msgid "Anonymous"
-msgstr ""
+msgstr "Anonimo"
 
 #: cps/templates/config_edit.html:253
 msgid "Unauthenticated"
-msgstr ""
+msgstr "Non autenticato"
 
 #: cps/templates/config_edit.html:254
 msgid "Simple"
-msgstr ""
+msgstr "Semplice"
 
 #: cps/templates/config_edit.html:259
 msgid "LDAP Administrator Username"
@@ -1661,19 +1661,19 @@ msgstr "Il server LDAP è un server OpenLDAP?"
 
 #: cps/templates/config_edit.html:281
 msgid "Following Settings are Needed For User Import"
-msgstr ""
+msgstr "I seguenti parametri sono necessari per importare utenti"
 
 #: cps/templates/config_edit.html:283
 msgid "LDAP Group Object Filter"
-msgstr ""
+msgstr "LDAP Group Object Filter"
 
 #: cps/templates/config_edit.html:287
 msgid "LDAP Group Name"
-msgstr ""
+msgstr "LDAP Group Name"
 
 #: cps/templates/config_edit.html:291
 msgid "LDAP Group Members Field"
-msgstr ""
+msgstr "LDAP Group Members Field"
 
 #: cps/templates/config_edit.html:300
 #, python-format
@@ -1873,7 +1873,7 @@ msgstr "SSL/TLS"
 
 #: cps/templates/email_edit.html:31
 msgid "SMTP Password"
-msgstr "password SMTP"
+msgstr "Password SMTP"
 
 #: cps/templates/email_edit.html:39
 msgid "Save and Send Test E-mail"

From 3939ec28ba9cabee34d79e0501a7ab720bd7314e Mon Sep 17 00:00:00 2001
From: iz <iz7iz7iz@protonmail.ch>
Date: Thu, 23 Apr 2020 22:37:35 +0300
Subject: [PATCH 09/17] Add turkish language names

---
 cps/iso_language_names.py | 519 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 519 insertions(+)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index f6a9e8eb..7cae2a98 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -6731,5 +6731,524 @@ LANGUAGE_NAMES = {
         "zun": "Zuni",
         "zxx": "No linguistic content",
         "zza": "Zaza"
+    },
+    "tr": {
+        "aar": "Afar dili",
+        "abk": "Abhazca",
+        "ace": "Açece",
+        "ach": "Açoli",
+        "ada": "Adangme dili",
+        "ady": "Adigece",
+        "afa": "Afro-Asyatik diller",
+        "afh": "Afrihili",
+        "afr": "Afrikanca",
+        "ain": "Ainu",
+        "aka": "Akan",
+        "akk": "Akkadca",
+        "alb": "Arnavutça",
+        "ale": "Aleutça",
+        "alg": "Algonkin dilleri",
+        "alt": "Güney Altay",
+        "amh": "Amharca",
+        "ang": "Eski İngilizce (yakl. 450-1100)",
+        "anp": "Angika",
+        "apa": "Apaçi dilleri",
+        "ara": "Arapça",
+        "arc": "Resmi Aramice İmparatorluk Aramicesi (MÖ 700-300)",
+        "arg": "Aragonca",
+        "arm": "Ermenice",
+        "arn": "Mapudungun; Mapuçe",
+        "arp": "Arapaho dili",
+        "art": "Yapay diller",
+        "arw": "Arawak dili",
+        "asm": "Assamca",
+        "ast": "Asturyasça; Bable; Leonese; Asturleonese",
+        "ath": "Atabaşkan dilleri",
+        "aus": "Avustralya dilleri",
+        "ava": "Avarca",
+        "ave": "Avesta dili",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Azerice",
+        "bad": "Banda dilleri",
+        "bai": "Bamileke dilleri",
+        "bak": "Başkırtça",
+        "bal": "Beluci dili",
+        "bam": "Bambara dili",
+        "ban": "Bali dili",
+        "baq": "Baskça",
+        "bas": "Basa dili",
+        "bat": "Baltık dilleri",
+        "bej": "Beja dili; Bedawiyet",
+        "bel": "Beyaz Rusça",
+        "bem": "Bemba",
+        "ben": "Bengalce",
+        "ber": "Berberi dilleri",
+        "bho": "Arayanice",
+        "bih": "Bihari dilleri",
+        "bik": "Bikol",
+        "bin": "Bini; Edo",
+        "bis": "Bislama dili",
+        "bla": "Siksika dili",
+        "bnt": "Bantu dilleri",
+        "bos": "Boşnakça",
+        "bra": "Braj dili",
+        "bre": "Bretonca",
+        "btk": "Batak dilleri",
+        "bua": "Buryat",
+        "bug": "Bugis",
+        "bul": "Bulgarca",
+        "bur": "Burma dili",
+        "byn": "Blin; Bilin",
+        "cad": "Caddo",
+        "cai": "Orta Amerika Yerli dilleri",
+        "car": "Karib dili",
+        "cat": "Katalanca",
+        "cau": "Kafkas dilleri",
+        "ceb": "Cebuano",
+        "cel": "Keltik diller",
+        "cha": "Chamorro",
+        "chb": "Chibcha",
+        "che": "Çeçence",
+        "chg": "Çağatayca",
+        "chi": "Çince",
+        "chk": "Chuukese (Truk)",
+        "chm": "Mari",
+        "chn": "Chinook jargon",
+        "cho": "Choctaw",
+        "chp": "Chipewyan; Dene Suline",
+        "chr": "Çeroki dili",
+        "chu": "Kilise Slavcası; Eski Slavonca, Kilise Slavoncası, Eski Bulgarca, Eski Kilise Slavoncası",
+        "chv": "Çuvaşça",
+        "chy": "Şayen dili",
+        "ckb": "Central Kurdish (Sorani)",
+        "cmc": "Chamic dilleri",
+        "cmn": "Mandarin Çincesi",
+        "cnr": "Montenegrin",
+        "cop": "Kıptice",
+        "cor": "Kernevekçe",
+        "cos": "Korsika dili",
+        "cpe": "Creole ve Pidgin dilleri, İngilizce tabanlı",
+        "cpf": "Creole ve Pidgin dilleri, Fransızca tabanlı",
+        "cpp": "Creole ve Pidgin dilleri, Portekizce tabanlı",
+        "cre": "Cree",
+        "crh": "Kırım Türkçesi; Kırım Tatarcası",
+        "crp": "Creole ve Pidgin dilleri",
+        "csb": "Kashubian",
+        "cus": "Kuşitik diller",
+        "cze": "Çekçe",
+        "dak": "Dakota",
+        "dan": "Danca",
+        "dar": "Dargince",
+        "day": "Dayak dilleri",
+        "del": "Delaware",
+        "den": "Slavey (Atabaşkan)",
+        "dgr": "Dogrib",
+        "din": "Dinka",
+        "div": "Divehi; Dhivehi; Maldivce",
+        "doi": "Dogri",
+        "dra": "Dravid dilleri",
+        "dsb": "Aşağı Sorbça",
+        "dua": "Duala",
+        "dum": "Orta Felemenkçe (yakl. 1050-1350)",
+        "dut": "Felemenkçe",
+        "dyu": "Dyula",
+        "dzo": "Butan dili",
+        "efi": "Efik",
+        "egl": "Emilian",
+        "egy": "Eski Mısır dili",
+        "eka": "Ekajuk",
+        "elx": "Elam",
+        "eng": "İngilizce",
+        "enm": "Orta İngilizce (yakl. 1100-1500)",
+        "epo": "Esperanto",
+        "est": "Estonca",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang",
+        "fao": "Faroe dili",
+        "fat": "Fanti",
+        "fij": "Fiji dili",
+        "fil": "Filipino; Filipince",
+        "fin": "Fince",
+        "fit": "Meänkieli / Tournedalen Fincesi",
+        "fiu": "Fin-Ugor dilleri",
+        "fkv": "Kvensk",
+        "fon": "Fon",
+        "fre": "Fransızca",
+        "frm": "Orta Fransızca (yakl. 1400-1600)",
+        "fro": "Eski Fransızca (yakl. 842-1400)",
+        "frr": "Kuzey Frizce",
+        "frs": "Doğu Frizce",
+        "fry": "Batı Frizce",
+        "ful": "Fulah",
+        "fur": "Friulian",
+        "gaa": "Ga",
+        "gay": "Gayo",
+        "gba": "Gbaya",
+        "gem": "Cermen dilleri",
+        "geo": "Gürcüce",
+        "ger": "Almanca",
+        "gez": "Etiyopyaca (Geez)",
+        "gil": "Kiribati Dili",
+        "gla": "İskoç Galcesi",
+        "gle": "İrlandaca",
+        "glg": "Galiçyaca",
+        "glv": "Man dili",
+        "gmh": "Orta Yüksek Almanca (yakl. 1050-1500)",
+        "goh": "Eski Yüksek Almanca (yakl. 750-1050)",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "Gotça",
+        "grb": "Grebo",
+        "grc": "Antik Yunanca (1453’e kadar)",
+        "gre": "Modern Yunanca (1453-)",
+        "grn": "Guarani",
+        "gsw": "İsviçre Almancası, Alemannic",
+        "guj": "Gujarati",
+        "gwi": "Gwich’in",
+        "hai": "Haida",
+        "hat": "Haiti Fransız Creole dili",
+        "hau": "Hausa",
+        "haw": "Hawaii dili",
+        "heb": "İbranice",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "him": "Himachali dilleri; Batı Pahari dilleri",
+        "hin": "Hintçe",
+        "hit": "Hititçe",
+        "hmn": "Hmong; Mong",
+        "hmo": "Hiri Motu",
+        "hrv": "Hırvatça",
+        "hsb": "Yukarı Sorbca",
+        "hun": "Macarca",
+        "hup": "Hupa",
+        "iba": "İban dili",
+        "ibo": "İgbo dili",
+        "ice": "İzlandaca",
+        "ido": "Ido",
+        "iii": "Sichuan Yi; Nuosu",
+        "ijo": "İjo dilleri",
+        "iku": "Inuktitut",
+        "ile": "Interlingue; Occidental",
+        "ilo": "Iloko",
+        "ina": "Interlingua (Uluslararası Yapay Dil Derneği)",
+        "inc": "Hint dilleri",
+        "ind": "Endonezce",
+        "ine": "Hint-Avrupa dilleri",
+        "inh": "İnguşça",
+        "ipk": "Inupiaq",
+        "ira": "İran dilleri",
+        "iro": "Iroquoia dilleri",
+        "ita": "İtalyanca",
+        "jav": "Cava dili",
+        "jbo": "Lojban",
+        "jpn": "Japonca",
+        "jpr": "Yahudi Farsçası",
+        "jrb": "Yahudi Arapçası",
+        "kaa": "Kara-Kalpakça",
+        "kab": "Kabile",
+        "kac": "Kaçin",
+        "kal": "Grönlandca",
+        "kam": "Kamba",
+        "kan": "Kannada",
+        "kar": "Karen dilleri",
+        "kas": "Keşmirce",
+        "kau": "Kanuri",
+        "kaw": "Kawi",
+        "kaz": "Kazakça",
+        "kbd": "Kabardeyce",
+        "kdr": "Karayca",
+        "kha": "Kaşi",
+        "khi": "Hoisan dilleri",
+        "khm": "Orta Kmerce",
+        "kho": "Khotanese; Saka dili",
+        "kik": "Kikuyu; Gikuyu",
+        "kin": "Ruandaca",
+        "kir": "Kırgızca",
+        "kmb": "Kimbundu",
+        "kok": "Konkani",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kor": "Korece",
+        "kos": "Kosraean (Caroline Adaları)",
+        "kpe": "Kpelle",
+        "krc": "Karaçay-Balkar",
+        "krl": "Karelyaca",
+        "kro": "Kru dilleri",
+        "kru": "Kurukh",
+        "kua": "Kuanyama",
+        "kum": "Kumukça",
+        "kur": "Kürtçe",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "Lao dili",
+        "lat": "Latince",
+        "lav": "Letonca",
+        "lez": "Lezgice",
+        "lij": "Ligurian",
+        "lim": "Limburg dili",
+        "lin": "Lingala",
+        "lit": "Litvanca",
+        "lmo": "Lombard",
+        "lol": "Mongo",
+        "loz": "Lozi",
+        "ltz": "Lüksemburgca",
+        "lua": "Luba-Lulua",
+        "lub": "Luba-Katanga",
+        "lug": "Ganda",
+        "lui": "Luiseno",
+        "lun": "Lunda",
+        "luo": "Luo (Kenya ve Tanzanya)",
+        "lus": "Lushai",
+        "mac": "Makedonca",
+        "mad": "Madura dili",
+        "mag": "Magahi",
+        "mah": "Marshall Adası Dili",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mal": "Malayalam",
+        "man": "Mandingo",
+        "mao": "Maori",
+        "map": "Avustronezya dilleri",
+        "mar": "Marathi",
+        "mas": "Masai",
+        "may": "Malay",
+        "mdf": "Mokşa",
+        "mdr": "Mandar",
+        "men": "Mende",
+        "mga": "Orta İrlandaca (yakl. 1100-1550)",
+        "mic": "Mi’kmaq; Micmac",
+        "min": "Minangkabau",
+        "mis": "Kodlanmamış çeşitli diller",
+        "mkh": "Mon-Kmer dilleri",
+        "mlg": "Malagasy",
+        "mlt": "Malta dili",
+        "mnc": "Mançuca",
+        "mni": "Manipuri",
+        "mno": "Manobo dilleri",
+        "moh": "Mohawk",
+        "mol": "Moldovaca",
+        "mon": "Moğolca",
+        "mos": "Mossi",
+        "mul": "Birden fazla dil",
+        "mun": "Munda dilleri",
+        "mus": "Creek",
+        "mwf": "Murrinh-Patha",
+        "mwl": "Miranda dili",
+        "mwr": "Marwari",
+        "myn": "Maya dilleri",
+        "myv": "Erzya",
+        "nah": "Nahuatl dilleri",
+        "nai": "Kuzey Amerika Yerli dilleri",
+        "nap": "Napolice",
+        "nau": "Nauru dili",
+        "nav": "Navajo",
+        "nbl": "Güney Ndebele",
+        "nde": "Kuzey Ndebele",
+        "ndo": "Ndonga",
+        "nds": "Aşağı Almanca; Aşağı Saksonca",
+        "nep": "Nepalce",
+        "new": "Newari; Nepal Bhasa",
+        "nia": "Nias",
+        "nic": "Nijer-Kordofan dilleri",
+        "niu": "Niuean",
+        "nno": "Norveççe Nynorsk",
+        "nob": "Norveççe Bokmål",
+        "nog": "Nogayca",
+        "non": "Eski Nor dili",
+        "nor": "Norveççe",
+        "nqo": "N’Ko",
+        "nrf": "Guernésiais, Jèrriais",
+        "nso": "Pedi; Sepedi; Kuzey Sotho",
+        "nub": "Nubia dilleri",
+        "nwc": "Klasik Newari; Eski Newari; Klasik Nepal Bhasa",
+        "nya": "Chichewa; Chewa; Nyanja",
+        "nym": "Nyamwezi",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Oksitanca (1500 sonrası)",
+        "odt": "Eski Felemenkçe / Eski Aşağı Frankonyan (yak. 400-",
+        "oji": "Ojibwa",
+        "omq": "Oto-Manguean dilleri",
+        "ori": "Oriya",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Osetçe",
+        "ota": "Türkçe, Osmanlıca",
+        "oto": "Otomian dilleri",
+        "paa": "Papua dilleri",
+        "pag": "Pangasinan",
+        "pal": "Pehlevice",
+        "pam": "Pampanga; Kapampanga dili",
+        "pan": "Pencapça",
+        "pap": "Papiamento",
+        "pau": "Palau dili",
+        "peo": "Eski Farsça (yakl. 600-400)",
+        "per": "Farsça",
+        "pes": "İran Farsçası; Persçe",
+        "phi": "Filipin dilleri",
+        "phn": "Fenike dili",
+        "pli": "Pali",
+        "pms": "Piedmontese",
+        "pol": "Lehçe",
+        "pon": "Ponapeian",
+        "por": "Portekizce",
+        "pra": "Prakrit dilleri",
+        "pro": "Eski Provensçe (1500’e kadar); Eski Oksitanca (1500’e kadar)",
+        "prs": "Dari; Afgan Farsçası",
+        "pus": "Peştuca",
+        "qar": "Aranezce",
+        "qav": "Valensiyaca",
+        "qlk": "Lemko",
+        "qls": "Neutral Latin American Spanish",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "rar": "Rarotongan; Cook Adaları Maori",
+        "rcf": "Réunion Creole French",
+        "rgn": "Romagnol",
+        "roa": "Roman dilleri",
+        "roh": "Romanşça",
+        "rom": "Romanca",
+        "rum": "Rumence",
+        "run": "Rundi",
+        "rup": "Makedo-Romanca",
+        "rus": "Rusça",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "sah": "Yakutça",
+        "sai": "Güney Amerika Yerli dilleri",
+        "sal": "Salishan dilleri",
+        "sam": "Samarit Aramicesi",
+        "san": "Sanskritçe",
+        "sas": "Sasak",
+        "sat": "Santali",
+        "scc": "Sırpça",
+        "scn": "Sicilyaca",
+        "sco": "İskoçça (Cermen)",
+        "scr": "Hırvatça",
+        "sdc": "Sassarese",
+        "sdn": "Gallurese",
+        "sel": "Selkup",
+        "sem": "Sami dilleri",
+        "sga": "Eski İrlandaca (1100’e kadar)",
+        "sgn": "Sign dilleri",
+        "shn": "Shan",
+        "sid": "Sidamo",
+        "sin": "Sinhala dili",
+        "sio": "Siouan dilleri",
+        "sit": "Çin-Tibet dilleri",
+        "sla": "Slav dilleri",
+        "slo": "Slovakça",
+        "slv": "Slovence",
+        "sma": "Güney Sami",
+        "sme": "Kuzey Sami",
+        "smi": "Sami dilleri [Ural dil ailesi]",
+        "smj": "Lule Sami",
+        "smn": "Inari Sami",
+        "smo": "Samoan",
+        "sms": "Skolt Sami",
+        "sna": "Shona",
+        "snd": "Sintçe",
+        "snk": "Soninke",
+        "sog": "Sogdca",
+        "som": "Somalice",
+        "son": "Songhai dilleri",
+        "sot": "Sotho; Sesotho",
+        "spa": "İspanyolca",
+        "srd": "Sardinya dili",
+        "srn": "Sranan Tongo",
+        "sro": "Campidanese",
+        "srp": "Sırpça",
+        "srr": "Serer",
+        "ssa": "Nil-Sahra dilleri",
+        "ssw": "Swazi; Swati",
+        "suk": "Sukuma",
+        "sun": "Sudanca",
+        "sus": "Susu",
+        "sux": "Sümerce",
+        "swa": "Swahili",
+        "swe": "İsveççe",
+        "syc": "Klasik Süryanice",
+        "syr": "Süryanice",
+        "tah": "Tahitice",
+        "tai": "Tay dilleri",
+        "tam": "Tamilce",
+        "tat": "Tatarca",
+        "tel": "Telugu",
+        "tem": "Temne; Time",
+        "ter": "Terena",
+        "tet": "Tetum",
+        "tgk": "Tacikçe",
+        "tgl": "Tagalog",
+        "tha": "Tayca",
+        "tib": "Tibetçe",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tiv": "Tiv",
+        "tkl": "Tokelauan",
+        "tlh": "Klingon; tlhIngan-Hol",
+        "tli": "Tlingit",
+        "tmh": "Tamashek",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tongan",
+        "tpi": "Tok Pisin",
+        "tsi": "Tsimshian",
+        "tsn": "Tswana",
+        "tso": "Tsonga",
+        "tuk": "Türkmence",
+        "tum": "Tumbuka",
+        "tup": "Tupi dilleri",
+        "tur": "Türkçe",
+        "tut": "Altay dilleri",
+        "tvl": "Tuvalu dili",
+        "twi": "Twi",
+        "tyv": "Tuvaca",
+        "tzo": "Tzotzil",
+        "udm": "Udmurtça",
+        "uga": "Ugarit dili",
+        "uig": "Uygurca",
+        "ukr": "Ukraynaca",
+        "umb": "Umbundu",
+        "und": "Bilinmeyen dil",
+        "urd": "Urdu dili",
+        "uzb": "Özbekçe",
+        "vai": "Vai",
+        "vec": "Venetian/Venetan",
+        "ven": "Venda",
+        "vie": "Vietnamca",
+        "vol": "Volapük",
+        "vot": "Votic",
+        "wak": "Wakashan dilleri",
+        "wal": "Wolaitta; Wolaytta",
+        "war": "Waray",
+        "was": "Washo",
+        "wel": "Galce",
+        "wen": "Sorb dilleri",
+        "wln": "Valonca",
+        "wol": "Wolof",
+        "xal": "Kalmıkça",
+        "xho": "Xhosa",
+        "xuu": "Khwedam, Kxoe",
+        "yao": "Yao",
+        "yap": "Yapese",
+        "yid": "Yidiş",
+        "yor": "Yoruba",
+        "ypk": "Yupik dilleri",
+        "yue": "Kanton Çincesi",
+        "zap": "Zapotec",
+        "zbl": "Blissymbols; Blissymbolics; Bliss",
+        "zen": "Zenaga",
+        "zgh": "Zhuang; Chuang",
+        "zha": "Standart Fas Berbericesi (Tamazight)",
+        "znd": "Zande dilleri",
+        "zul": "Zulu",
+        "zun": "Zuni",
+        "zxx": "Dilsel içerik yok",
+        "zza": "Zazaca; Dimilkî; Kirdkî; Kirmançki; Zazaki",
     }
 }
\ No newline at end of file

From 4239f2ed71864019adc313e0ae6bc6cb1f87ab87 Mon Sep 17 00:00:00 2001
From: iz <iz7iz7iz@protonmail.ch>
Date: Thu, 23 Apr 2020 22:37:44 +0300
Subject: [PATCH 10/17] Add turkish translation

---
 cps/translations/tr/LC_MESSAGES/messages.mo |  Bin 0 -> 40000 bytes
 cps/translations/tr/LC_MESSAGES/messages.po | 2298 +++++++++++++++++++
 2 files changed, 2298 insertions(+)
 create mode 100644 cps/translations/tr/LC_MESSAGES/messages.mo
 create mode 100644 cps/translations/tr/LC_MESSAGES/messages.po

diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0ae14a6d353d8f5963f031c30c07acac5d770288
GIT binary patch
literal 40000
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
Xg<h)6*;J+uox$Tim-OX+y0-W~hDQbR

literal 0
HcmV?d00001

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..72b02707
--- /dev/null
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -0,0 +1,2298 @@
+# German translations for Calibre-Web.
+# Copyright (C) 2016 Ozzie Isaacs
+# This file is distributed under the same license as the Calibre-Web
+# project.
+# FIRST AUTHOR OzzieIsaacs, 2016.
+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"
+"PO-Revision-Date: 2020-04-23 21:23+0300\n"
+"Last-Translator: Ozzie Isaacs\n"
+"Language-Team: \n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Generated-By: Babel 2.8.0\n"
+"X-Generator: Poedit 2.3\n"
+
+#: cps/about.py:42
+msgid "installed"
+msgstr "yüklü"
+
+#: cps/about.py:44
+msgid "not installed"
+msgstr "yüklü değil"
+
+#: cps/about.py:84
+msgid "Statistics"
+msgstr "İstatistikler"
+
+#: cps/admin.py:88
+msgid "Server restarted, please reload page"
+msgstr "Sunucu yeniden başlatıldı, lütfen sayfayı yeniden yükleyin"
+
+#: cps/admin.py:90
+msgid "Performing shutdown of server, please close window"
+msgstr "Sunucu kapatıyor, lütfen pencereyi kapatın"
+
+#: cps/admin.py:109 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 "Bilinmeyen"
+
+#: cps/admin.py:128
+msgid "Admin page"
+msgstr "Yönetim sayfası"
+
+#: cps/admin.py:147 cps/templates/admin.html:115
+msgid "UI Configuration"
+msgstr "Arayüz Ayarları"
+
+#: cps/admin.py:184 cps/admin.py:411
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web yapılandırması güncellendi"
+
+#: cps/admin.py:441 cps/templates/admin.html:114
+msgid "Basic Configuration"
+msgstr "Temel Ayarlar"
+
+#: cps/admin.py:464 cps/web.py:1092
+msgid "Please fill out all fields!"
+msgstr "Lütfen tüm alanları doldurun!"
+
+#: cps/admin.py:466 cps/admin.py:477 cps/admin.py:483 cps/admin.py:498
+#: cps/templates/admin.html:38
+msgid "Add new user"
+msgstr "Yeni kullanıcı ekle"
+
+#: cps/admin.py:475 cps/web.py:1317
+msgid "E-mail is not from valid domain"
+msgstr "E-posta izin verilen bir servisten değil"
+
+#: cps/admin.py:481 cps/admin.py:492
+msgid "Found an existing account for this e-mail address or nickname."
+msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
+
+#: cps/admin.py:488
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "'%(user)s' kullanıcısı oluşturuldu"
+
+#: cps/admin.py:508
+msgid "Edit e-mail server settings"
+msgstr "E-posta sunucusu ayarlarını düzenle"
+
+#: cps/admin.py:534
+#, python-format
+msgid "Test e-mail successfully send to %(kindlemail)s"
+msgstr "Deneme e-postası başarıyla %(kindlemail)s adresine gönderildi"
+
+#: cps/admin.py:537
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "Deneme e-postası gönderilirken bir hata oluştu: %(res)s"
+
+#: cps/admin.py:539
+msgid "Please configure your e-mail address first..."
+msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
+
+#: cps/admin.py:541
+msgid "E-mail server settings updated"
+msgstr "E-posta sunucusu ayarları güncellendi"
+
+#: cps/admin.py:570
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "Kullanıcı '%(nick)s' silindi"
+
+#: cps/admin.py:573
+msgid "No admin user remaining, can't delete user"
+msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
+
+#: cps/admin.py:611 cps/web.py:1358
+msgid "Found an existing account for this e-mail address."
+msgstr "Bu e-posta adresi için bir hesap mevcut."
+
+#: cps/admin.py:615 cps/admin.py:629 cps/admin.py:643 cps/web.py:1333
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "%(nick)s kullanıcısını düzenle"
+
+#: cps/admin.py:621 cps/web.py:1326
+msgid "This username is already taken"
+msgstr "Bu kullanıcı adı zaten alındı"
+
+#: cps/admin.py:636
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "'%(nick)s' kullanıcısı güncellendi"
+
+#: cps/admin.py:639
+msgid "An unknown error occured."
+msgstr "Bilinmeyen bir hata oluştu."
+
+#: cps/admin.py:656
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
+
+#: cps/admin.py:659 cps/web.py:1117 cps/web.py:1173
+msgid "An unknown error occurred. Please try again later."
+msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
+
+#: cps/admin.py:662 cps/web.py:1058
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
+
+#: cps/admin.py:674
+msgid "Logfile viewer"
+msgstr "Log dosyası görüntüleyici"
+
+#: cps/admin.py:713
+msgid "Requesting update package"
+msgstr "Güncelleme paketi isteniyor"
+
+#: cps/admin.py:714
+msgid "Downloading update package"
+msgstr "Güncelleme paketi indiriliyor"
+
+#: cps/admin.py:715
+msgid "Unzipping update package"
+msgstr "Güncelleme paketi ayıklanıyor"
+
+#: cps/admin.py:716
+msgid "Replacing files"
+msgstr "Dosyalar değiştiriliyor"
+
+#: cps/admin.py:717
+msgid "Database connections are closed"
+msgstr "Veritabanı bağlantıları kapalı"
+
+#: cps/admin.py:718
+msgid "Stopping server"
+msgstr "Sunucu durduruyor"
+
+#: cps/admin.py:719
+msgid "Update finished, please press okay and reload page"
+msgstr ""
+"Güncelleme tamamlandı, sayfayı yenilemek için lütfen Tamam'a tıklayınız"
+
+#: cps/admin.py:720 cps/admin.py:721 cps/admin.py:722 cps/admin.py:723
+msgid "Update failed:"
+msgstr "Güncelleme başarısız:"
+
+#: cps/admin.py:720 cps/updater.py:282 cps/updater.py:467 cps/updater.py:469
+msgid "HTTP Error"
+msgstr "HTTP Hatası"
+
+#: cps/admin.py:721 cps/updater.py:284 cps/updater.py:471
+msgid "Connection error"
+msgstr "Bağlantı hatası"
+
+#: cps/admin.py:722 cps/updater.py:286 cps/updater.py:473
+msgid "Timeout while establishing connection"
+msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
+
+#: cps/admin.py:723 cps/updater.py:288 cps/updater.py:475
+msgid "General error"
+msgstr "Genel hata"
+
+#: cps/converter.py:31
+msgid "not configured"
+msgstr "ayarlanmadı"
+
+#: cps/editbooks.py:214 cps/editbooks.py:396
+msgid "Error opening eBook. File does not exist or file is not accessible"
+msgstr "eKitap açılırken hata oluştu. Dosya mevcut değil veya erişilemiyor"
+
+#: cps/editbooks.py:242
+msgid "edit metadata"
+msgstr "metaveri düzenle"
+
+#: cps/editbooks.py:321 cps/editbooks.py:569
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "'%(ext)s' uzantılı dosyaların bu sunucuya yüklenmesine izin verilmiyor"
+
+#: cps/editbooks.py:325 cps/editbooks.py:573
+msgid "File to be uploaded must have an extension"
+msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
+
+#: cps/editbooks.py:337 cps/editbooks.py:607
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
+
+#: cps/editbooks.py:342
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s dosyası kaydedilemedi."
+
+#: cps/editbooks.py:359
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "%(book)s kitabına %(ext)s dosya biçimi eklendi"
+
+#: cps/editbooks.py:376
+msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
+msgstr ""
+"Kapak dosyası desteklenen bir resim biçimi (jpg/png/webp) olmadığından "
+"kaydedilemiyor"
+
+#: cps/editbooks.py:451
+msgid "Cover is not a jpg file, can't save"
+msgstr "Kapak dosyası jpg biçiminde olmadığından kaydedilemiyor"
+
+#: cps/editbooks.py:494
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr "%(langname)s geçerli bir dil değil"
+
+#: cps/editbooks.py:525
+msgid "Metadata successfully updated"
+msgstr "Metaveri başarıyla güncellendi"
+
+#: cps/editbooks.py:534
+msgid "Error editing book, please check logfile for details"
+msgstr ""
+"eKitap düzenlenirken hata oluştu, detaylar için lütfen log dosyasını kontrol "
+"edin"
+
+#: cps/editbooks.py:581
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
+
+#: cps/editbooks.py:598
+msgid ""
+"Uploaded book probably exists in the library, consider to change before "
+"upload new: "
+msgstr ""
+"Yüklenen eKitap muhtemelen kitaplıkta zaten var. Yenisini yüklemeden "
+"değiştirmeyi düşünün: "
+
+#: cps/editbooks.py:613
+#, python-format
+msgid "Failed to store file %(file)s (Permission denied)."
+msgstr "%(file)s dosyası kaydedilemedi. (İzin reddedildi)"
+
+#: cps/editbooks.py:619
+#, python-format
+msgid "Failed to delete file %(file)s (Permission denied)."
+msgstr "%(file)s dosyası silinemedi. (İzin reddedildi)"
+
+#: cps/editbooks.py:709
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "%(file)s dosyası yüklendi"
+
+#: cps/editbooks.py:738
+msgid "Source or destination format for conversion missing"
+msgstr "Dönüştürme için kaynak ya da hedef biçimi eksik"
+
+#: cps/editbooks.py:746
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr ""
+"eKitap %(book_format)s formatlarına dönüştürülmek üzere başarıyla sıraya "
+"alındı"
+
+#: cps/editbooks.py:750
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "Bu eKitabı dönüştürürken bir hata oluştu: %(res)s"
+
+#: cps/gdrive.py:61
+msgid ""
+"Google Drive setup not completed, try to deactivate and activate Google "
+"Drive again"
+msgstr ""
+"Google Drive kurulumu tamamlanmadı, Google Drive'ı devre dışı bırakmayı ve "
+"tekrar etkinleştirmeyi deneyin"
+
+#: cps/gdrive.py:103
+msgid ""
+"Callback domain is not verified, please follow steps to verify domain in "
+"google developer console"
+msgstr ""
+"Geri yönlendirme alanı (callback domain) doğrulanamadı, lütfen Google "
+"geliştirici konsolunda alan adını doğrulamak için gerekli adımları izleyin."
+
+#: cps/helper.py:80
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(book)d nolu kitap için %(format)s biçimi bulunamadı"
+
+#: cps/helper.py:92
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(fn)s eKitabı için %(format)s biçimi Google Drive'da bulunamadı"
+
+#: cps/helper.py:99 cps/helper.py:211 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Kindle'a gönder"
+
+#: cps/helper.py:100 cps/helper.py:118 cps/helper.py:213
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
+
+#: cps/helper.py:111
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s bulunamadı: %(fn)s"
+
+#: cps/helper.py:116
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web deneme e-Postası"
+
+#: cps/helper.py:118
+msgid "Test e-mail"
+msgstr "Deneme e-Postası"
+
+#: cps/helper.py:133
+msgid "Get Started with Calibre-Web"
+msgstr "Calibre-Web'i Kullanmaya Başlayın"
+
+#: cps/helper.py:135
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Kullanıcı Kayıt e-Postası: %(name)s"
+
+#: cps/helper.py:149 cps/helper.py:151 cps/helper.py:153 cps/helper.py:161
+#: cps/helper.py:163 cps/helper.py:165
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "%(format)s biçimlerini Kindle'a gönder"
+
+#: cps/helper.py:169 cps/helper.py:173
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "%(orig)s'dan %(format)s biçimine çevir ve Kindle'a gönder"
+
+#: cps/helper.py:213
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "e-Posta: %(book)s"
+
+#: cps/helper.py:215
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "İstenilen dosya okunamadı. Yanlış izinlerden kaynaklanabilir?"
+
+#: cps/helper.py:322
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+"Kitap adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): "
+"%(error)s"
+
+#: cps/helper.py:332
+#, python-format
+msgid ""
+"Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+"Yazar adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): "
+"%(error)s"
+
+#: cps/helper.py:346
+#, python-format
+msgid ""
+"Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+"Dosya adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): "
+"%(error)s"
+
+#: cps/helper.py:372 cps/helper.py:382 cps/helper.py:390
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "%(file)s dosyası Google Drive'da bulunamadı"
+
+#: cps/helper.py:411
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
+
+#: cps/helper.py:643
+msgid "Waiting"
+msgstr "Bekleniyor"
+
+#: cps/helper.py:645
+msgid "Failed"
+msgstr "Başarısız"
+
+#: cps/helper.py:647
+msgid "Started"
+msgstr "Başladı"
+
+#: cps/helper.py:649
+msgid "Finished"
+msgstr "Bitti"
+
+#: cps/helper.py:651
+msgid "Unknown Status"
+msgstr "Bilinmeyen Durum"
+
+#: cps/helper.py:656
+msgid "E-mail: "
+msgstr "e-Posta: "
+
+#: cps/helper.py:658 cps/helper.py:662
+msgid "Convert: "
+msgstr "Dönüştür: "
+
+#: cps/helper.py:660
+msgid "Upload: "
+msgstr "Yükle: "
+
+#: cps/helper.py:664
+msgid "Unknown Task: "
+msgstr "Bilinmeyen Görev: "
+
+#: cps/oauth_bb.py:74
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "%(provider)s ile Kaydol"
+
+#: cps/oauth_bb.py:154
+msgid "Failed to log in with GitHub."
+msgstr "GitHub ile giriş yapılamadı."
+
+#: cps/oauth_bb.py:159
+msgid "Failed to fetch user info from GitHub."
+msgstr "Github'dan kullanıcı bilgileri alınamadı."
+
+#: cps/oauth_bb.py:170
+msgid "Failed to log in with Google."
+msgstr "Google ile giriş yapılamadı."
+
+#: cps/oauth_bb.py:175
+msgid "Failed to fetch user info from Google."
+msgstr "Google'dan kullanıcı bilgileri alınamadı."
+
+#: cps/oauth_bb.py:273
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr "%(oauth)s ile bağlantı başarıyla kaldırıldı."
+
+#: cps/oauth_bb.py:277
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr "%(oauth)s ile bağlantı kaldırılamadı."
+
+#: cps/oauth_bb.py:280
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr "%(oauth)s bağlı değil."
+
+#: cps/oauth_bb.py:308
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth hatası, lütfen tekrar deneyin."
+
+#: cps/oauth_bb.py:327
+msgid "Google Oauth error, please retry later."
+msgstr "Google Oauth hatası, lütfen tekrar deneyin."
+
+#: cps/shelf.py:47 cps/shelf.py:99
+msgid "Invalid shelf specified"
+msgstr "Geçersiz kitaplık seçildi"
+
+#: cps/shelf.py:54
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "Maalesef bu kitaplığa eKitap eklemenize izin verilmiyor: %(shelfname)s"
+
+#: cps/shelf.py:62
+msgid "You are not allowed to edit public shelves"
+msgstr "Genel kitaplıkları düzenleme izniniz yok"
+
+#: cps/shelf.py:71
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "eKitap zaten bu kitaplıkta bulunuyor: %(shelfname)s"
+
+#: cps/shelf.py:85
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "eKitap kitaplığa eklendi: %(sname)s"
+
+#: cps/shelf.py:104
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Bu kitaplığa eKitap eklemenize izin verilmiyor: %(name)s"
+
+#: cps/shelf.py:109
+msgid "User is not allowed to edit public shelves"
+msgstr "Kullanıcının genel kitaplıkları düzenlemesine izin verilmiyor"
+
+#: cps/shelf.py:127
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "eKitaplar zaten bu kitaplıkta bulunuyor: %(name)s"
+
+#: cps/shelf.py:141
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "eKitaplar kitaplığa eklendi: %(sname)s"
+
+#: cps/shelf.py:143
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "eKitaplar kitaplığa eklenemedi: %(sname)s"
+
+#: cps/shelf.py:181
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "eKitap kitaplıktan silindi: %(sname)s"
+
+#: cps/shelf.py:190
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Maalesef bu kitaplıktan eKitap silmenize izin verilmiyor: %(sname)s"
+
+#: cps/shelf.py:211 cps/shelf.py:235
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "'%(title)s' isimli bir kitaplık zaten mevcut."
+
+#: cps/shelf.py:216
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s kitaplığı oluşturuldu."
+
+#: cps/shelf.py:218 cps/shelf.py:246
+msgid "There was an error"
+msgstr "Bir hata oluştu"
+
+#: cps/shelf.py:219 cps/shelf.py:221
+msgid "create a shelf"
+msgstr "kitaplık oluştur"
+
+#: cps/shelf.py:244
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s kitaplığı değiştirildi"
+
+#: cps/shelf.py:247 cps/shelf.py:249
+msgid "Edit a shelf"
+msgstr "Kitaplığı düzenle"
+
+#: cps/shelf.py:299
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Kitaplık: '%(name)s'"
+
+#: cps/shelf.py:302
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr ""
+"Kitaplık açılırken hata oluştu. Kitaplık mevcut değil ya da erişilebilir "
+"değil"
+
+#: cps/shelf.py:336
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
+
+#: cps/ub.py:56
+msgid "Recently Added"
+msgstr "Yeni"
+
+#: cps/ub.py:58
+msgid "Show recent books"
+msgstr "Son eKitapları göster"
+
+#: cps/templates/index.xml:17 cps/ub.py:59
+msgid "Hot Books"
+msgstr "Popüler"
+
+#: cps/ub.py:60
+msgid "Show hot books"
+msgstr "Popüler eKitapları göster"
+
+#: cps/templates/index.xml:24 cps/ub.py:63
+msgid "Best rated Books"
+msgstr "En İyiler"
+
+#: cps/ub.py:65
+msgid "Show best rated books"
+msgstr "En yüksek değerlendirme alan eKitapları göster"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:66
+#: cps/web.py:1008
+msgid "Read Books"
+msgstr "Okunanlar"
+
+#: cps/ub.py:68
+msgid "Show read and unread"
+msgstr "Okunan ve okunmayanları göster"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:70
+#: cps/web.py:1012
+msgid "Unread Books"
+msgstr "Okunmamışlar"
+
+#: cps/ub.py:72
+msgid "Show unread"
+msgstr "Okunmamışları göster"
+
+#: cps/ub.py:73
+msgid "Discover"
+msgstr "Keşfet"
+
+#: cps/ub.py:75
+msgid "Show random books"
+msgstr "Rastgele eKitap göster"
+
+#: cps/templates/index.xml:75 cps/ub.py:76
+msgid "Categories"
+msgstr "Kategoriler"
+
+#: cps/ub.py:78
+msgid "Show category selection"
+msgstr "Kategori seçimini göster"
+
+#: cps/templates/book_edit.html:69 cps/templates/index.xml:82
+#: cps/templates/search_form.html:53 cps/ub.py:79
+msgid "Series"
+msgstr "Seriler"
+
+#: cps/ub.py:81
+msgid "Show series selection"
+msgstr "Seri seçimini göster"
+
+#: cps/templates/index.xml:61 cps/ub.py:82
+msgid "Authors"
+msgstr "Yazarlar"
+
+#: cps/ub.py:84
+msgid "Show author selection"
+msgstr "Yazar seçimini göster"
+
+#: cps/templates/index.xml:68 cps/ub.py:86
+msgid "Publishers"
+msgstr "Yayıncılar"
+
+#: cps/ub.py:88
+msgid "Show publisher selection"
+msgstr "Yayıncı seçimini göster"
+
+#: cps/templates/index.xml:89 cps/templates/search_form.html:74 cps/ub.py:89
+msgid "Languages"
+msgstr "Diller"
+
+#: cps/ub.py:92
+msgid "Show language selection"
+msgstr "Dil seçimini göster"
+
+#: cps/ub.py:93
+msgid "Ratings"
+msgstr "Değerlendirmeler"
+
+#: cps/ub.py:95
+msgid "Show ratings selection"
+msgstr "Değerlendirme seçimini göster"
+
+#: cps/templates/index.xml:96 cps/ub.py:96
+msgid "File formats"
+msgstr "Biçimler"
+
+#: cps/ub.py:98
+msgid "Show file formats selection"
+msgstr "Dosya biçimi seçimini göster"
+
+#: cps/updater.py:262 cps/updater.py:369 cps/updater.py:382
+msgid "Unexpected data while reading update information"
+msgstr "Güncelleme bilgileri okunurken beklenmeyen veri"
+
+#: cps/updater.py:269 cps/updater.py:375
+msgid "No update available. You already have the latest version installed"
+msgstr "Yeni güncelleme mevcut değil. Zaten en son sürüme sahipsiniz."
+
+#: cps/updater.py:295
+msgid ""
+"A new update is available. Click on the button below to update to the latest "
+"version."
+msgstr ""
+"Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdaki düğmeye "
+"tıklayın."
+
+#: cps/updater.py:348
+msgid "Could not fetch update information"
+msgstr "Güncelleme bilgileri alınamadı"
+
+#: cps/updater.py:362
+msgid "No release information available"
+msgstr "Sürüm bilgisi mevcut değil"
+
+#: cps/updater.py:415 cps/updater.py:424
+#, python-format
+msgid ""
+"A new update is available. Click on the button below to update to version: "
+"%(version)s"
+msgstr ""
+"Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdaki düğmeye "
+"tıklayın: %(version)s"
+
+#: cps/updater.py:434
+msgid "Click on the button below to update to the latest stable version."
+msgstr "Son kararlı sürüme güncellemek için aşağıdaki düğmeye tıklayın."
+
+#: cps/web.py:485
+msgid "Recently Added Books"
+msgstr "Yeni Eklenen eKitaplar"
+
+#: cps/web.py:513
+msgid "Best rated books"
+msgstr "En iyi eKitaplar"
+
+#: cps/templates/index.xml:38 cps/web.py:521
+msgid "Random Books"
+msgstr "Rastgele eKitaplar"
+
+#: cps/web.py:547
+msgid "Books"
+msgstr "eKitaplar"
+
+#: cps/web.py:574
+msgid "Hot Books (most downloaded)"
+msgstr "Popüler eKitaplar (En çok indirilen)"
+
+#: 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 "eKitap açılırken hata oluştu. Dosya mevcut değil veya erişilemiyor:"
+
+#: cps/web.py:598
+#, python-format
+msgid "Author: %(name)s"
+msgstr "Yazar: %(name)s"
+
+#: cps/web.py:610
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Yayınevi: %(name)s"
+
+#: cps/web.py:621
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Seri: %(serie)s"
+
+#: cps/web.py:632
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "Değerlendirme: %(rating)s yıldız"
+
+#: cps/web.py:643
+#, python-format
+msgid "File format: %(format)s"
+msgstr "Biçim: %(format)s"
+
+#: cps/web.py:655
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategori: %(name)s"
+
+#: cps/web.py:672
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Dil: %(name)s"
+
+#: cps/web.py:704
+msgid "Publisher list"
+msgstr "Yayınevi listesi"
+
+#: cps/web.py:720
+msgid "Series list"
+msgstr "Seri listesi"
+
+#: cps/web.py:734
+msgid "Ratings list"
+msgstr "Değerlendirme listesi"
+
+#: cps/web.py:747
+msgid "File formats list"
+msgstr "Biçim listesi"
+
+#: cps/web.py:775
+msgid "Available languages"
+msgstr "Geçerli diller"
+
+#: cps/web.py:792
+msgid "Category list"
+msgstr "Kategori listesi"
+
+#: cps/templates/layout.html:73 cps/web.py:806
+msgid "Tasks"
+msgstr "Görevler"
+
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45 cps/web.py:826 cps/web.py:828
+msgid "Search"
+msgstr "Ara"
+
+#: cps/web.py:878
+msgid "Published after "
+msgstr "Yayınlanma (sonra)"
+
+#: cps/web.py:885
+msgid "Published before "
+msgstr "Yayınlanma (önce)"
+
+#: cps/web.py:899
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Değerlendirme <= %(rating)s"
+
+#: cps/web.py:901
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Değerlendirme >= %(rating)s"
+
+#: cps/web.py:967 cps/web.py:979
+msgid "search"
+msgstr "ara"
+
+#: cps/web.py:1063
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "%(kindlemail)s'a gönderilmek üzere başarıyla sıraya alındı"
+
+#: cps/web.py:1067
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr "eKitap gönderilirken hata oluştu: %(res)s"
+
+#: cps/web.py:1069
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Lütfen önce Kindle e-Posta adresinizi ayarlayın..."
+
+#: cps/web.py:1086
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
+
+#: cps/web.py:1087 cps/web.py:1093 cps/web.py:1118 cps/web.py:1122
+#: cps/web.py:1127 cps/web.py:1131
+msgid "register"
+msgstr "kaydol"
+
+#: cps/web.py:1120
+msgid "Your e-mail is not allowed to register"
+msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
+
+#: cps/web.py:1123
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Onay e-Postası hesabınıza gönderildi."
+
+#: cps/web.py:1126
+msgid "This username or e-mail address is already in use."
+msgstr "Kullanıcı adı ya da e-Posta adresi zaten kullanımda."
+
+#: cps/web.py:1143
+msgid "Cannot activate LDAP authentication"
+msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
+
+#: cps/web.py:1153 cps/web.py:1280
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "giriş yaptınız: '%(nickname)s'"
+
+#: cps/web.py:1158
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+"Giriş yapılamıyor. LDAP sunucusu kapalı, lütfen yöneticinizle iletişime "
+"geçin."
+
+#: cps/web.py:1162 cps/web.py:1185
+msgid "Wrong Username or Password"
+msgstr "Yanlış Kullanıcı adı ya da Şifre"
+
+#: cps/web.py:1169
+msgid "New Password was send to your email address"
+msgstr "Yeni şifre e-Posta adresinize gönderildi"
+
+#: cps/web.py:1175
+msgid "Please enter valid username to reset password"
+msgstr ""
+"Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
+
+#: cps/web.py:1181
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "Giriş yaptınız: '%(nickname)s'"
+
+#: cps/web.py:1188 cps/web.py:1212
+msgid "login"
+msgstr "giriş"
+
+#: cps/web.py:1224 cps/web.py:1258
+msgid "Token not found"
+msgstr "Token bulunamadı"
+
+#: cps/web.py:1233 cps/web.py:1266
+msgid "Token has expired"
+msgstr "Token süresi doldu"
+
+#: cps/web.py:1242
+msgid "Success! Please return to your device"
+msgstr "Başarılı! Lütfen cihazınıza dönün"
+
+#: cps/web.py:1319 cps/web.py:1362 cps/web.py:1368
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s Profili"
+
+#: cps/web.py:1364
+msgid "Profile updated"
+msgstr "Profil güncellendi"
+
+#: cps/web.py:1393 cps/web.py:1396 cps/web.py:1399 cps/web.py:1406
+#: cps/web.py:1411
+msgid "Read a Book"
+msgstr "Kitap Oku"
+
+#: cps/web.py:1422
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr "eKitap açılırken hata oluştu. Dosya mevcut değil veya erişilemiyor"
+
+#: cps/worker.py:335
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "eKitap-Dönüştürücü hatası: %(error)s"
+
+#: cps/worker.py:346
+#, python-format
+msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
+msgstr ""
+"Kindlegen %(error)s hatası ile başarısız oldu. Hata mesajı: %(message)s"
+
+#: cps/templates/admin.html:9
+msgid "User list"
+msgstr "Kullanıcı listesi"
+
+#: cps/templates/admin.html:12
+msgid "Nickname"
+msgstr "Kullanıcı adı"
+
+#: cps/templates/admin.html:13
+msgid "E-mail"
+msgstr "e-Posta"
+
+#: cps/templates/admin.html:14
+msgid "Kindle"
+msgstr "Kindle"
+
+#: cps/templates/admin.html:15
+msgid "DLS"
+msgstr "İndirme Sayısı"
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:76
+msgid "Admin"
+msgstr "Yönetim"
+
+#: cps/templates/admin.html:17 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
+msgid "Download"
+msgstr "İndirme"
+
+#: cps/templates/admin.html:18
+msgid "View Ebooks"
+msgstr "Görüntüleme"
+
+#: cps/templates/admin.html:19 cps/templates/layout.html:65
+msgid "Upload"
+msgstr "Yükleme"
+
+#: cps/templates/admin.html:20
+msgid "Edit"
+msgstr "Düzenleme"
+
+#: cps/templates/admin.html:44
+msgid "SMTP e-mail server settings"
+msgstr "SMTP e-Posta sunucusu ayarları"
+
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:11
+msgid "SMTP hostname"
+msgstr "SMTP sunucusu"
+
+#: cps/templates/admin.html:48
+msgid "SMTP port"
+msgstr "SMTP portu"
+
+#: cps/templates/admin.html:49
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/admin.html:50 cps/templates/email_edit.html:27
+msgid "SMTP login"
+msgstr "SMTP girişi"
+
+#: cps/templates/admin.html:51
+msgid "From mail"
+msgstr "Gönderen e-Posta"
+
+#: cps/templates/admin.html:61
+msgid "Change SMTP settings"
+msgstr "SMTP ayarlarını değiştir"
+
+#: cps/templates/admin.html:67
+msgid "Configuration"
+msgstr "Ayarlar"
+
+#: cps/templates/admin.html:70
+msgid "Calibre DB dir"
+msgstr "Calibre Veritabanı klasörü"
+
+#: cps/templates/admin.html:74
+msgid "Log level"
+msgstr "Log seviyesi"
+
+#: 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"
+msgstr "Sayfa başına eKitap"
+
+#: cps/templates/admin.html:88
+msgid "Uploading"
+msgstr "Yükleme"
+
+#: cps/templates/admin.html:92
+msgid "Anonymous browsing"
+msgstr "Anonim Dolaşma"
+
+#: cps/templates/admin.html:96
+msgid "Public registration"
+msgstr "Herkese Açık Kaydolma"
+
+#: cps/templates/admin.html:100 cps/templates/remote_login.html:4
+msgid "Remote login"
+msgstr "Uzantan Giriş"
+
+#: cps/templates/admin.html:104
+msgid "Reverse proxy login"
+msgstr "Ters Proxy Girişi"
+
+#: cps/templates/admin.html:109
+msgid "Reverse proxy header name"
+msgstr "Ters Proxy header adı"
+
+#: cps/templates/admin.html:121
+msgid "Administration"
+msgstr "Yönetim"
+
+#: cps/templates/admin.html:122
+msgid "View Logfiles"
+msgstr "Log dosyalarını görüntüle"
+
+#: cps/templates/admin.html:123
+msgid "Reconnect to Calibre DB"
+msgstr "Calibre Veritabanına tekrar bağlan"
+
+#: cps/templates/admin.html:124
+msgid "Restart Calibre-Web"
+msgstr "Calibre-Web'i yeniden başlat"
+
+#: cps/templates/admin.html:125
+msgid "Stop Calibre-Web"
+msgstr "Calibre-Web'i durdur"
+
+#: cps/templates/admin.html:131
+msgid "Update"
+msgstr "Güncelleme"
+
+#: cps/templates/admin.html:135
+msgid "Version"
+msgstr "Sürüm"
+
+#: cps/templates/admin.html:136
+msgid "Details"
+msgstr "Detaylar"
+
+#: cps/templates/admin.html:142
+msgid "Current version"
+msgstr "Geçerli sürüm"
+
+#: cps/templates/admin.html:148
+msgid "Check for update"
+msgstr "Güncellemeleri kontrol et"
+
+#: cps/templates/admin.html:149
+msgid "Perform Update"
+msgstr "Güncelle"
+
+#: cps/templates/admin.html:161
+msgid "Do you really want to restart Calibre-Web?"
+msgstr "Calibre-Web'i gerçekten yeniden başlatmak istiyor musunuz?"
+
+#: cps/templates/admin.html:166 cps/templates/admin.html:180
+#: cps/templates/admin.html:200 cps/templates/shelf.html:72
+msgid "Ok"
+msgstr "Tamam"
+
+#: 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/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 "Geri"
+
+#: cps/templates/admin.html:179
+msgid "Do you really want to stop Calibre-Web?"
+msgstr "Calibre-Web'i gerçekten durdurmak istiyor musunuz?"
+
+#: cps/templates/admin.html:191
+msgid "Updating, please do not reload page"
+msgstr "Güncelleniyor, lütfen sayfayı yenilemeyin"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "ile"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "Kitaplıkta"
+
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr "Tümü"
+
+#: cps/templates/author.html:58 cps/templates/author.html:110
+#: cps/templates/discover.html:27 cps/templates/index.html:26
+#: cps/templates/index.html:89 cps/templates/search.html:67
+#: cps/templates/shelf.html:36
+msgid "reduce"
+msgstr "azalt"
+
+#: cps/templates/author.html:94
+msgid "More by"
+msgstr "daha fazla"
+
+#: cps/templates/book_edit.html:10
+msgid "Delete Book"
+msgstr "eKitabı Sil"
+
+#: cps/templates/book_edit.html:13
+msgid "Delete formats:"
+msgstr "Biçimleri Sil:"
+
+#: cps/templates/book_edit.html:16 cps/templates/book_edit.html:193
+#: cps/templates/email_edit.html:91
+msgid "Delete"
+msgstr "Sil"
+
+#: cps/templates/book_edit.html:24
+msgid "Convert book format:"
+msgstr "Biçime dönüştür:"
+
+#: cps/templates/book_edit.html:28
+msgid "Convert from:"
+msgstr "Biçimden dönüştür:"
+
+#: cps/templates/book_edit.html:30 cps/templates/book_edit.html:37
+msgid "select an option"
+msgstr "bir seçenek seçin"
+
+#: cps/templates/book_edit.html:35
+msgid "Convert to:"
+msgstr "Dönüştür:"
+
+#: cps/templates/book_edit.html:44
+msgid "Convert book"
+msgstr "eKitabı dönüştür"
+
+#: cps/templates/book_edit.html:53 cps/templates/search_form.html:6
+msgid "Book Title"
+msgstr "Kitap Adı"
+
+#: cps/templates/book_edit.html:57 cps/templates/book_edit.html:253
+#: cps/templates/book_edit.html:271 cps/templates/search_form.html:10
+msgid "Author"
+msgstr "Yazar"
+
+#: cps/templates/book_edit.html:61 cps/templates/book_edit.html:258
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:126
+msgid "Description"
+msgstr "Açıklama"
+
+#: cps/templates/book_edit.html:65 cps/templates/search_form.html:33
+msgid "Tags"
+msgstr "Etiketler"
+
+#: cps/templates/book_edit.html:73
+msgid "Series id"
+msgstr "Seri no"
+
+#: cps/templates/book_edit.html:77
+msgid "Rating"
+msgstr "Değerlendirme"
+
+#: cps/templates/book_edit.html:81
+msgid ""
+"Cover URL (jpg, cover is downloaded and stored in database, field is "
+"afterwards empty again)"
+msgstr ""
+"Kapak URL (jpg, kapak indirilir ve veritabanına kaydedilir, sonrasında bu "
+"alan tekrar temizlenir)"
+
+#: cps/templates/book_edit.html:85
+msgid "Upload Cover from local drive"
+msgstr "Yerel diskten kapak yükle"
+
+#: cps/templates/book_edit.html:90 cps/templates/detail.html:165
+msgid "Publishing date"
+msgstr "Yayınlanma Tarihi"
+
+#: cps/templates/book_edit.html:97 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:272 cps/templates/detail.html:156
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Yayınevi"
+
+#: cps/templates/book_edit.html:101 cps/templates/user_edit.html:31
+msgid "Language"
+msgstr "Dil"
+
+#: cps/templates/book_edit.html:111 cps/templates/search_form.html:137
+msgid "Yes"
+msgstr "Evet"
+
+#: cps/templates/book_edit.html:112 cps/templates/search_form.html:138
+msgid "No"
+msgstr "Hayır"
+
+#: cps/templates/book_edit.html:158
+msgid "Upload format"
+msgstr "Biçim yükle"
+
+#: cps/templates/book_edit.html:167
+msgid "view book after edit"
+msgstr "düzenlemeden sonra eKitabı düzenle"
+
+#: cps/templates/book_edit.html:170 cps/templates/book_edit.html:206
+msgid "Get metadata"
+msgstr "Metaveri getir"
+
+#: 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 "Gönder"
+
+#: cps/templates/book_edit.html:185
+msgid "Are you really sure?"
+msgstr "Emin misiniz?"
+
+#: cps/templates/book_edit.html:188
+msgid "Book will be deleted from Calibre database"
+msgstr "eKitap Calibre veritabanından silinecek"
+
+#: cps/templates/book_edit.html:189
+msgid "and from hard disk"
+msgstr "ve yerel diskten"
+
+#: cps/templates/book_edit.html:209
+msgid "Keyword"
+msgstr "Anahtar Kelime"
+
+#: cps/templates/book_edit.html:210
+msgid " Search keyword "
+msgstr "Anahtar kelime ara"
+
+#: cps/templates/book_edit.html:212 cps/templates/layout.html:47
+msgid "Go!"
+msgstr "Git!"
+
+#: cps/templates/book_edit.html:216
+msgid "Click the cover to load metadata to the form"
+msgstr "Forma metaveri yüklemek için kapağa tıklayın"
+
+#: cps/templates/book_edit.html:228 cps/templates/book_edit.html:268
+msgid "Loading..."
+msgstr "Yükleniyor..."
+
+#: cps/templates/book_edit.html:233 cps/templates/layout.html:192
+#: cps/templates/layout.html:224
+msgid "Close"
+msgstr "Kapak"
+
+#: cps/templates/book_edit.html:260 cps/templates/book_edit.html:274
+msgid "Source"
+msgstr "Kaynak"
+
+#: cps/templates/book_edit.html:269
+msgid "Search error!"
+msgstr "Arama hatası!"
+
+#: cps/templates/book_edit.html:270
+msgid "No Result(s) found! Please try aonther keyword."
+msgstr "Sonuç bulunamadı! Lütfen başka bir anahtar sözcük girin."
+
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr "Kitaplık Ayarları"
+
+#: cps/templates/config_edit.html:19
+msgid "Location of Calibre database"
+msgstr "Calibre veritabanı konumu"
+
+#: cps/templates/config_edit.html:25
+msgid "Use Google Drive?"
+msgstr "Google Drive kullan?"
+
+#: cps/templates/config_edit.html:31
+msgid "Google Drive config problem"
+msgstr "Google Drive ayarlama problemi"
+
+#: cps/templates/config_edit.html:37
+msgid "Authenticate Google Drive"
+msgstr "Google Drive Doğrula"
+
+#: cps/templates/config_edit.html:41
+msgid "Please hit submit to continue with setup"
+msgstr "Kuruluma devam etmek için Gönder'e tıklayın"
+
+#: cps/templates/config_edit.html:44
+msgid "Please finish Google Drive setup after login"
+msgstr "Lütfen giriş yaptıktan sonra Google Drive kurulumunu tamamlayın"
+
+#: cps/templates/config_edit.html:49
+msgid "Google Drive Calibre folder"
+msgstr "Google Drive Calibre klasörü"
+
+#: cps/templates/config_edit.html:57
+msgid "Metadata Watch Channel ID"
+msgstr "Metaveri İzleme Kanalı ID"
+
+#: cps/templates/config_edit.html:60
+msgid "Revoke"
+msgstr "Kaldır"
+
+#: cps/templates/config_edit.html:80
+msgid "Server Configuration"
+msgstr "Sunucu Ayarları"
+
+#: cps/templates/config_edit.html:87
+msgid "Server Port"
+msgstr "Sunucu Port"
+
+#: cps/templates/config_edit.html:91
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL certfile dosyası konumu (SSL olmayan sunucular için boş bırakın)"
+
+#: cps/templates/config_edit.html:95
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL keyfile dosyası konumu (SSL olmayan sunucular için boş bırakın)"
+
+#: cps/templates/config_edit.html:99
+msgid "Update channel"
+msgstr "Güncelleme kanalı"
+
+#: cps/templates/config_edit.html:101
+msgid "Stable"
+msgstr "Kararlı"
+
+#: cps/templates/config_edit.html:102
+msgid "Stable (Automatic)"
+msgstr "Kararlı (otomatik)"
+
+#: cps/templates/config_edit.html:103
+msgid "Nightly"
+msgstr "Gecelik"
+
+#: cps/templates/config_edit.html:104
+msgid "Nightly (Automatic)"
+msgstr "Gecelik (Otomatik)"
+
+#: cps/templates/config_edit.html:115
+msgid "Logfile Configuration"
+msgstr "Log Dosyası Ayarları"
+
+#: cps/templates/config_edit.html:122
+msgid "Log Level"
+msgstr "Log Seviyesi"
+
+#: cps/templates/config_edit.html:131
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "Log dosyası konumu ve adı (girilmemişse calibre-web.log)"
+
+#: cps/templates/config_edit.html:136
+msgid "Enable Access Log"
+msgstr "Erişim Log'unu etkinleştir"
+
+#: cps/templates/config_edit.html:139
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "Erişim dosyası konumu ve adı (girilmemişse access.log)"
+
+#: cps/templates/config_edit.html:150
+msgid "Feature Configuration"
+msgstr "Özellik Yapılandırması"
+
+#: cps/templates/config_edit.html:158
+msgid "Enable uploading"
+msgstr "Dosya yüklemeyi etkinleştir"
+
+#: cps/templates/config_edit.html:162
+msgid "Enable anonymous browsing"
+msgstr "Anonim gezinmeyi etkinleştir"
+
+#: cps/templates/config_edit.html:166
+msgid "Enable public registration"
+msgstr "Herkese açık kayıt olmayı etkinleştir"
+
+#: cps/templates/config_edit.html:170
+msgid "Enable remote login (\"magic link\")"
+msgstr "Uzaktan girişi etkinleştir (Magic Link)"
+
+#: cps/templates/config_edit.html:175
+msgid "Use Goodreads"
+msgstr "Goodreads kullan"
+
+#: cps/templates/config_edit.html:176
+msgid "Obtain an API Key"
+msgstr "API Anahtarı al"
+
+#: cps/templates/config_edit.html:180
+msgid "Goodreads API Key"
+msgstr "Goodreads API Anahtarı"
+
+#: cps/templates/config_edit.html:184
+msgid "Goodreads API Secret"
+msgstr "Goodreads API şifresi"
+
+#: cps/templates/config_edit.html:191
+msgid "Login type"
+msgstr "Giriş türü"
+
+#: cps/templates/config_edit.html:193
+msgid "Use standard Authentication"
+msgstr "Standard kimlik doğrulama kullan"
+
+#: cps/templates/config_edit.html:195
+msgid "Use LDAP Authentication"
+msgstr "LDAP Kimlik Doğrulama kullan"
+
+#: cps/templates/config_edit.html:198
+msgid "Use OAuth"
+msgstr "OAuth kullan"
+
+#: cps/templates/config_edit.html:205
+msgid "LDAP Server Host Name or IP Address"
+msgstr "LDAP Sunucu adı veya IP Adresi"
+
+#: cps/templates/config_edit.html:209
+msgid "LDAP Server Port"
+msgstr "LDAP Sunucu Portu"
+
+#: cps/templates/config_edit.html:213
+msgid "LDAP schema (ldap or ldaps)"
+msgstr "LDAP şeması (ldap ya da ldaps)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Admin username"
+msgstr "LDAP Yönetici kullanıcı adı"
+
+#: cps/templates/config_edit.html:221
+msgid "LDAP Admin password"
+msgstr "LDAP Yönetici şifresi"
+
+#: cps/templates/config_edit.html:226
+msgid "LDAP Server use SSL"
+msgstr "LDAP Sunucusu SSL kullanımı"
+
+#: cps/templates/config_edit.html:230
+msgid "LDAP Server use TLS"
+msgstr "LDAP Sunucusu TSL kullanımı"
+
+#: cps/templates/config_edit.html:234
+msgid "LDAP Server Certificate"
+msgstr "LDAP Sunucusu Sertifikası"
+
+#: cps/templates/config_edit.html:238
+msgid "LDAP SSL Certificate Path"
+msgstr "LDAP SSL Sertifikası Konumu"
+
+#: cps/templates/config_edit.html:243
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP Ayırt Edici Adı (DN)"
+
+#: cps/templates/config_edit.html:247
+msgid "LDAP User object filter"
+msgstr "LDAP Kullanıcı nesnesi filtresi"
+
+#: cps/templates/config_edit.html:252
+msgid "LDAP Server is OpenLDAP?"
+msgstr "LDAP Sunucusu OpenLDAP kullanıyor?"
+
+#: cps/templates/config_edit.html:260
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "%(provider)s OAuth Kimlik Bilgisi Al"
+
+#: cps/templates/config_edit.html:263
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "%(provider)s OAuth Client Id"
+
+#: cps/templates/config_edit.html:267
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth Client Secret"
+
+#: cps/templates/config_edit.html:276
+msgid "Allow Reverse Proxy Authentication"
+msgstr "Ters Proxy Kimlik Doğrulamaya İzin Ver"
+
+#: cps/templates/config_edit.html:280
+msgid "Reverse Proxy Header Name"
+msgstr "Ters Proxy Header Adı"
+
+#: cps/templates/config_edit.html:292
+msgid "External binaries"
+msgstr "Harici Uygulamalar"
+
+#: cps/templates/config_edit.html:300
+msgid "No converter"
+msgstr "Dönüştürücü yok"
+
+#: cps/templates/config_edit.html:302
+msgid "Use Kindlegen"
+msgstr "Kindlegen kullan"
+
+#: cps/templates/config_edit.html:304
+msgid "Use calibre's ebook converter"
+msgstr "Calibre'nin eKitap dönüştürücüsünü kullan"
+
+#: cps/templates/config_edit.html:308
+msgid "E-Book converter settings"
+msgstr "eKitap Dönüştürücü ayarları"
+
+#: cps/templates/config_edit.html:312
+msgid "Path to convertertool"
+msgstr "Dönüştürücü araç konumu"
+
+#: cps/templates/config_edit.html:318
+msgid "Location of Unrar binary"
+msgstr "Unrar aracı konumu"
+
+#: cps/templates/config_edit.html:334 cps/templates/layout.html:84
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Giriş"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr "Yapılandırmayı Göster"
+
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Başlık"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "Gösterilecek rastgele kitap sayısı"
+
+#: cps/templates/config_view_edit.html:31
+msgid "No. of authors to show before hiding (0=disable hiding)"
+msgstr ""
+"Gizlenmeden önce gösterilecen yazar sayısı (0=gizlemeyi devre dışı bırak)"
+
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
+msgid "Theme"
+msgstr "Tema"
+
+#: cps/templates/config_view_edit.html:37
+msgid "Standard Theme"
+msgstr "Standard Tema"
+
+#: cps/templates/config_view_edit.html:38
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! Koyu Teması"
+
+#: cps/templates/config_view_edit.html:42
+msgid "Regular expression for ignoring columns"
+msgstr "Sütunları yoksaymak için düzenli ifade"
+
+#: cps/templates/config_view_edit.html:46
+msgid "Link read/unread status to Calibre column"
+msgstr "okundu/okunmadı durumunu Calibre sütununa bağla"
+
+#: cps/templates/config_view_edit.html:55
+msgid "Regular expression for title sorting"
+msgstr "Kitap adlarını sıralamak için düzenli ifade"
+
+#: cps/templates/config_view_edit.html:59
+msgid "Tags for Mature Content"
+msgstr "Yetişkinlere uygun içerik etiketleri"
+
+#: cps/templates/config_view_edit.html:73
+msgid "Default settings for new users"
+msgstr "Yeni kullanıcılar için varsayılan ayarlar"
+
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:82
+msgid "Admin user"
+msgstr "Yönetici kullanıcı"
+
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:91
+msgid "Allow Downloads"
+msgstr "İndirmeye İzin Ver"
+
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:95
+msgid "Allow book viewer"
+msgstr "eKitap görüntüleyiciye izin ver"
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:99
+msgid "Allow Uploads"
+msgstr "Yüklemeye izin ver"
+
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:103
+msgid "Allow Edit"
+msgstr "Düzenlemeye İzin ver"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:107
+msgid "Allow Delete books"
+msgstr "eKitap silmeye izin ver"
+
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:112
+msgid "Allow Changing Password"
+msgstr "Şifre değiştirmeye izin ver"
+
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:116
+msgid "Allow Editing Public Shelfs"
+msgstr "Genel Kitaplıkları düzenlemeye izin ver"
+
+#: cps/templates/config_view_edit.html:119
+msgid "Default visibilities for new users"
+msgstr "Yeni kullanıcıların varsayılan görünürlüğü"
+
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:74
+msgid "Show random books in detail view"
+msgstr "eKitap detayları görünümünde rastgele kitap göster"
+
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:87
+msgid "Show mature content"
+msgstr "Yetişkinlere Uygun İçerikleri göster"
+
+#: cps/templates/detail.html:59
+msgid "Read in browser"
+msgstr "Tarayıcıda oku"
+
+#: cps/templates/detail.html:72
+msgid "Listen in browser"
+msgstr "Tarayıcıda dinle"
+
+#: cps/templates/detail.html:117
+msgid "Book"
+msgstr "Kitap"
+
+#: cps/templates/detail.html:117
+msgid "of"
+msgstr "için"
+
+#: cps/templates/detail.html:123
+msgid "language"
+msgstr "dil"
+
+#: cps/templates/detail.html:200
+msgid "Mark As Unread"
+msgstr "Okunmadı olarak işaretle"
+
+#: cps/templates/detail.html:200
+msgid "Mark As Read"
+msgstr "Okundu olarak işaretle"
+
+#: cps/templates/detail.html:201
+msgid "Read"
+msgstr "Okudum"
+
+#: cps/templates/detail.html:211
+msgid "Description:"
+msgstr "Açıklama:"
+
+#: cps/templates/detail.html:224 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "Kitaplığa ekle"
+
+#: cps/templates/detail.html:286
+msgid "Edit metadata"
+msgstr "Metaveri düzenle"
+
+#: cps/templates/email_edit.html:15
+msgid ""
+"SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
+msgstr ""
+"SMTP Portu (Genellikle basit SMTP için 25, SSL için 465 ve STARTTLS için 587 "
+"kullanılır)"
+
+#: cps/templates/email_edit.html:19
+msgid "Encryption"
+msgstr "Şifreleme"
+
+#: cps/templates/email_edit.html:21
+msgid "None"
+msgstr "Hiçbiri"
+
+#: cps/templates/email_edit.html:22
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:23
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:31
+msgid "SMTP password"
+msgstr "SMTP şifresi"
+
+#: cps/templates/email_edit.html:35
+msgid "From e-mail"
+msgstr "Gönderici e-Posta adresi"
+
+#: cps/templates/email_edit.html:38
+msgid "Save settings"
+msgstr "Ayarları kaydet"
+
+#: cps/templates/email_edit.html:39
+msgid "Save settings and send Test E-Mail"
+msgstr "Ayarları kaydet ve deneme e-Postası gönder"
+
+#: cps/templates/email_edit.html:43
+msgid "Allowed domains for registering"
+msgstr "Kayıt için izin verilen servisler"
+
+#: cps/templates/email_edit.html:46 cps/templates/email_edit.html:72
+msgid "Add Domain"
+msgstr "Servis ekle"
+
+#: cps/templates/email_edit.html:49 cps/templates/email_edit.html:75
+msgid "Add"
+msgstr "Ekle"
+
+#: cps/templates/email_edit.html:54 cps/templates/email_edit.html:64
+msgid "Enter domainname"
+msgstr "Servis adı girin"
+
+#: cps/templates/email_edit.html:60
+msgid "Denied domains for registering"
+msgstr "Kayıt için izin verilmeyen servisler"
+
+#: cps/templates/email_edit.html:90
+msgid "Do you really want to delete this domain rule?"
+msgstr "Bu alan adı kuralını gerçekten silmek istiyor musunuz?"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:176
+msgid "Next"
+msgstr "Sonraki"
+
+#: cps/templates/http_error.html:37
+msgid "Create issue"
+msgstr "Sorun oluştur"
+
+#: cps/templates/http_error.html:44
+msgid "Back to home"
+msgstr "Anasayfaya geri dön"
+
+#: cps/templates/index.html:5
+msgid "Discover (Random Books)"
+msgstr "Keşfet (Rastgele)"
+
+#: cps/templates/index.html:64
+msgid "Group by series"
+msgstr "Serilere göre grupla"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "Başlangıç"
+
+#: cps/templates/index.xml:21
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "İndirilme sayısına göre bu katalogdaki popüler yayınlar."
+
+#: cps/templates/index.xml:28
+msgid "Popular publications from this catalog based on Rating."
+msgstr "Değerlendirmeye göre bu katalogdaki popüler yayınlar."
+
+#: cps/templates/index.xml:31
+msgid "Recently added Books"
+msgstr "Yeni eklenen eKitaplar"
+
+#: cps/templates/index.xml:35
+msgid "The latest Books"
+msgstr "En en eKitaplar"
+
+#: cps/templates/index.xml:42
+msgid "Show Random Books"
+msgstr "Rastgele Kitap Göster"
+
+#: cps/templates/index.xml:65
+msgid "Books ordered by Author"
+msgstr "Yazara göre sıralanmış eKitaplar"
+
+#: cps/templates/index.xml:72
+msgid "Books ordered by publisher"
+msgstr "Yayınevine göre sıralanmış eKitaplar"
+
+#: cps/templates/index.xml:79
+msgid "Books ordered by category"
+msgstr "Kategoriye göre sıralanmış eKitaplar"
+
+#: cps/templates/index.xml:86
+msgid "Books ordered by series"
+msgstr "Seriye göre sıralanmış eKitaplar"
+
+#: cps/templates/index.xml:93
+msgid "Books ordered by Languages"
+msgstr "Dile göre sıralanmış eKitaplar"
+
+#: cps/templates/index.xml:100
+msgid "Books ordered by file formats"
+msgstr "Biçime göre sıralanmış eKitaplar"
+
+#: cps/templates/index.xml:103 cps/templates/layout.html:137
+msgid "Public Shelves"
+msgstr "Genel Kitaplıklar"
+
+#: cps/templates/index.xml:107
+msgid "Books organized in public shelfs, visible to everyone"
+msgstr "Genel kitaplıklara eklenmiş kitapları herkes görebilir"
+
+#: cps/templates/index.xml:111 cps/templates/layout.html:141
+msgid "Your Shelves"
+msgstr "Kitaplıklarınız"
+
+#: cps/templates/index.xml:115
+msgid "User's own shelfs, only visible to the current user himself"
+msgstr "Kullanıcının kendi kitaplıkları, sadece geçerli kullanıcı görebilir"
+
+#: cps/templates/layout.html:28
+msgid "Home"
+msgstr "Anasayfa"
+
+#: cps/templates/layout.html:34
+msgid "Toggle navigation"
+msgstr "Menüyü aç/kapat"
+
+#: cps/templates/layout.html:55
+msgid "Advanced Search"
+msgstr "Gelişmiş Arama"
+
+#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: cps/templates/layout.html:78
+msgid "Account"
+msgstr "Hesap"
+
+#: cps/templates/layout.html:80
+msgid "Logout"
+msgstr "Çıkış"
+
+#: cps/templates/layout.html:85 cps/templates/register.html:14
+msgid "Register"
+msgstr "Kayıt ol"
+
+#: cps/templates/layout.html:116 cps/templates/layout.html:223
+msgid "Uploading..."
+msgstr "Yükleniyor..."
+
+#: cps/templates/layout.html:117
+msgid "please don't refresh the page"
+msgstr "lütfen sayfayı yenilemeyin"
+
+#: cps/templates/layout.html:127
+msgid "Browse"
+msgstr "Gözat"
+
+#: cps/templates/layout.html:146
+msgid "Create a Shelf"
+msgstr "Kitaplık oluştur"
+
+#: cps/templates/layout.html:147 cps/templates/stats.html:3
+msgid "About"
+msgstr "Hakkında"
+
+#: cps/templates/layout.html:161
+msgid "Previous"
+msgstr "Önceki"
+
+#: cps/templates/layout.html:188
+msgid "Book Details"
+msgstr "eKitap Detayları"
+
+#: cps/templates/layout.html:222
+msgid "Upload done, processing, please wait..."
+msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
+
+#: cps/templates/layout.html:225
+msgid "Error"
+msgstr "Hata"
+
+#: cps/templates/login.html:8 cps/templates/login.html:9
+#: cps/templates/register.html:7 cps/templates/user_edit.html:8
+msgid "Username"
+msgstr "Kullanıcı adı"
+
+#: cps/templates/login.html:12 cps/templates/login.html:13
+#: cps/templates/user_edit.html:21
+msgid "Password"
+msgstr "Şifre"
+
+#: cps/templates/login.html:17
+msgid "Remember me"
+msgstr "Beni hatırla"
+
+#: cps/templates/login.html:22
+msgid "Forgot password"
+msgstr "Şifremi unuttum"
+
+#: cps/templates/login.html:25
+msgid "Log in with magic link"
+msgstr "Sihirli bağlantı ile giriş yap"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web log: "
+msgstr "Calibre-Web Log'unu göster"
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web log: "
+msgstr "Calibre-Web Log: "
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr "Akış çıktısı, görüntülenemiyor"
+
+#: cps/templates/logviewer.html:12
+msgid "Show access log: "
+msgstr "Erişim Log'unu göster"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web ebook catalog"
+msgstr "Calibre-Web eKitap Kataloğu"
+
+#: cps/templates/read.html:74
+msgid "Reflow text when sidebars are open."
+msgstr "Kenar çubukları açıkken metni kaydır"
+
+#: cps/templates/readcbr.html:88
+msgid "Keyboard Shortcuts"
+msgstr "Klavye Kısayolları"
+
+#: cps/templates/readcbr.html:91
+msgid "Previous Page"
+msgstr "Önceki Sayfa"
+
+#: cps/templates/readcbr.html:92
+msgid "Next Page"
+msgstr "Sonraki Sayfa"
+
+#: cps/templates/readcbr.html:93
+msgid "Scale to Best"
+msgstr "En İyiye Ölçeklendir"
+
+#: cps/templates/readcbr.html:94
+msgid "Scale to Width"
+msgstr "Genişliğe Ölçeklendir"
+
+#: cps/templates/readcbr.html:95
+msgid "Scale to Height"
+msgstr "Yüksekliğe Ölçeklendir"
+
+#: cps/templates/readcbr.html:96
+msgid "Scale to Native"
+msgstr "Asıla göre ölçeklendir"
+
+#: cps/templates/readcbr.html:97
+msgid "Rotate Right"
+msgstr "Sağa çevir"
+
+#: cps/templates/readcbr.html:98
+msgid "Rotate Left"
+msgstr "Sola çevir"
+
+#: cps/templates/readcbr.html:99
+msgid "Flip Image"
+msgstr "Resmi döndir"
+
+#: cps/templates/readcbr.html:115
+msgid "Light"
+msgstr "Açık"
+
+#: cps/templates/readcbr.html:116
+msgid "Dark"
+msgstr "Koyu"
+
+#: cps/templates/readcbr.html:121
+msgid "Scale"
+msgstr "Ölçeklendir"
+
+#: cps/templates/readcbr.html:124
+msgid "Best"
+msgstr "En İyi"
+
+#: cps/templates/readcbr.html:125
+msgid "Width"
+msgstr "Genişlik"
+
+#: cps/templates/readcbr.html:126
+msgid "Height"
+msgstr "Yükseklik"
+
+#: cps/templates/readcbr.html:127
+msgid "Native"
+msgstr "Asıl"
+
+#: cps/templates/readcbr.html:132
+msgid "Rotate"
+msgstr "Çevir"
+
+#: cps/templates/readcbr.html:143
+msgid "Flip"
+msgstr "Döndür"
+
+#: cps/templates/readcbr.html:146
+msgid "Horizontal"
+msgstr "Yatay"
+
+#: cps/templates/readcbr.html:147
+msgid "Vertical"
+msgstr "Dikey"
+
+#: cps/templates/readcbr.html:152
+msgid "Direction"
+msgstr "Yön"
+
+#: cps/templates/readcbr.html:155
+msgid "Left to Right"
+msgstr "Soldan Sağa"
+
+#: cps/templates/readcbr.html:156
+msgid "Right to Left"
+msgstr "Sağdan Sola"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF reader"
+msgstr "PDF Okuyucu"
+
+#: cps/templates/readtxt.html:6
+msgid "Basic txt Reader"
+msgstr "Temel Metin Okuyucu"
+
+#: cps/templates/register.html:4
+msgid "Register a new account"
+msgstr "Yeni bir hesap oluştur"
+
+#: cps/templates/register.html:8
+msgid "Choose a username"
+msgstr "Kullanıcı adı seç"
+
+#: cps/templates/register.html:11 cps/templates/user_edit.html:13
+msgid "E-mail address"
+msgstr "E-Posta adresi"
+
+#: cps/templates/register.html:12
+msgid "Your email address"
+msgstr "E-Posta adresiniz"
+
+#: cps/templates/remote_login.html:6
+msgid "Use your other device, login and visit "
+msgstr "Diğer cihazınızı kullanın, giriş yapın ve ziyaret edin "
+
+#: cps/templates/remote_login.html:9
+msgid "Once you do so, you will automatically get logged in on this device."
+msgstr "Bunu yaptıktan sonra, otomatik olarak bu cihaza giriş yapacaksınız"
+
+#: cps/templates/remote_login.html:12
+msgid "The link will expire after 10 minutes."
+msgstr "Bağlantı süresi 10 dakika sonra dolacak"
+
+#: cps/templates/search.html:5
+msgid "No Results for:"
+msgstr "Sonuç bulunamadı:"
+
+#: cps/templates/search.html:6
+msgid "Please try a different search"
+msgstr "Lütfen başka bir arama yapın"
+
+#: cps/templates/search.html:8
+msgid "Results for:"
+msgstr "Sonuçlar:"
+
+#: cps/templates/search_form.html:19
+msgid "Publishing date from"
+msgstr "Yayınlanma tarihi (başlangıç)"
+
+#: cps/templates/search_form.html:26
+msgid "Publishing date to"
+msgstr "Yayınlanma tarihi (bitiş)"
+
+#: cps/templates/search_form.html:43
+msgid "Exclude Tags"
+msgstr "Etiketleri Hariç Tut"
+
+#: cps/templates/search_form.html:63
+msgid "Exclude Series"
+msgstr "Serileri Hariç Tut"
+
+#: cps/templates/search_form.html:84
+msgid "Exclude Languages"
+msgstr "Dilleri Hariç Tut"
+
+#: cps/templates/search_form.html:95
+msgid "Extensions"
+msgstr "Uzantılar"
+
+#: cps/templates/search_form.html:105
+msgid "Exclude Extensions"
+msgstr "Uzantıları Hariç Tut"
+
+#: cps/templates/search_form.html:117
+msgid "Rating bigger than"
+msgstr "Değerlendirmeler (daha fazla)"
+
+#: cps/templates/search_form.html:121
+msgid "Rating less than"
+msgstr "Değerlendirmeler (daha az)"
+
+#: cps/templates/shelf.html:10
+msgid "Delete this Shelf"
+msgstr "Bu Kitaplığı sil"
+
+#: cps/templates/shelf.html:11
+msgid "Edit Shelf"
+msgstr "Kitaplığı düzenle"
+
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
+msgid "Change order"
+msgstr "Sıralamayı değiştir"
+
+#: cps/templates/shelf.html:67
+msgid "Do you really want to delete the shelf?"
+msgstr "Bu kitaplığı silmek istediğinize emin misiniz?"
+
+#: cps/templates/shelf.html:70
+msgid "Shelf will be lost for everybody and forever!"
+msgstr "Kitaplık herkes için sonsuza kadar yok olacak!"
+
+#: cps/templates/shelf_edit.html:13
+msgid "should the shelf be public?"
+msgstr "Kitaplık herkese açık olsun mu?"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag 'n drop to rearrange order"
+msgstr "Sıralamayı değiştirmek için sürükle-bırak"
+
+#: cps/templates/stats.html:7
+msgid "Calibre library statistics"
+msgstr "Calibre kitaplık istatistikleri"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "Bu kitaplıktaki kitaplar"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "Bu kitaplıktaki Yazarlar"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "Bu kitaplıktaki kategoriler"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "Bu kitaplıktaki Seriler"
+
+#: cps/templates/stats.html:28
+msgid "Linked libraries"
+msgstr "Bağlantılı Kitaplıklar"
+
+#: cps/templates/stats.html:32
+msgid "Program library"
+msgstr "Program Kitaplığı"
+
+#: cps/templates/stats.html:33
+msgid "Installed Version"
+msgstr "Yüklü Sürüm"
+
+#: cps/templates/tasks.html:7
+msgid "Tasks list"
+msgstr "Görev listesi"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "Kullanıcı"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "Görev"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "Durum"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "İlerleme"
+
+#: cps/templates/tasks.html:17
+msgid "Runtime"
+msgstr "Çalışma süresü"
+
+#: cps/templates/tasks.html:18
+msgid "Starttime"
+msgstr "Başlangıç zamanı"
+
+#: cps/templates/tasks.html:24
+msgid "Delete finished tasks"
+msgstr "Biten görevleri sil"
+
+#: cps/templates/tasks.html:25
+msgid "Hide all tasks"
+msgstr "Tüm görevleri gizle"
+
+#: cps/templates/user_edit.html:18
+msgid "Reset user Password"
+msgstr "Kullanıcı şifresini sıfırla"
+
+#: cps/templates/user_edit.html:26
+msgid "Kindle E-Mail"
+msgstr "Kindle E-Posta Adresi"
+
+#: cps/templates/user_edit.html:41
+msgid "Show books with language"
+msgstr "Bu dildeki kitapları göster"
+
+#: cps/templates/user_edit.html:43
+msgid "Show all"
+msgstr "Tümünü göster"
+
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr "OAuth Ayarları"
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr "Bağla"
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr "Kaldır"
+
+#: cps/templates/user_edit.html:123
+msgid "Delete this user"
+msgstr "Bu kullanıcıyı sil"
+
+#: cps/templates/user_edit.html:138
+msgid "Recent Downloads"
+msgstr "Son İndirilenler"

From 1770f3fd0df4d195031f4794091426e5325aa219 Mon Sep 17 00:00:00 2001
From: iz <iz7iz7iz@protonmail.ch>
Date: Thu, 23 Apr 2020 22:47:24 +0300
Subject: [PATCH 11/17] Update turkish translation headers

---
 cps/translations/tr/LC_MESSAGES/messages.mo | Bin 40000 -> 40015 bytes
 cps/translations/tr/LC_MESSAGES/messages.po |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 0ae14a6d353d8f5963f031c30c07acac5d770288..f2acfa94e29926b8909e1aedb515b1d6b18f90c5 100644
GIT binary patch
delta 4343
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
Mk34W`TIq=20b9j$mjD0&

delta 4328
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

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 72b02707..a37f5c2b 100644
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# German translations for Calibre-Web.
-# Copyright (C) 2016 Ozzie Isaacs
+# Turkish translations for Calibre-Web.
+# Copyright (C) 2016 iz7iz7iz
 # This file is distributed under the same license as the Calibre-Web
 # project.
-# FIRST AUTHOR OzzieIsaacs, 2016.
+# FIRST AUTHOR iz7iz7iz, 2020.
 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"
-"PO-Revision-Date: 2020-04-23 21:23+0300\n"
-"Last-Translator: Ozzie Isaacs\n"
+"PO-Revision-Date: 2020-04-23 22:47+0300\n"
+"Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language-Team: \n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"

From d8bf540db234af7a0dd79e2f8e74b5ca6ae24a3a Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Fri, 24 Apr 2020 18:04:27 +0200
Subject: [PATCH 12/17] Remove an undeclared and useless local variable

---
 cps/static/js/main.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 5738f36e..23ca69fd 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -211,8 +211,7 @@ $(function() {
             data: {"parameter":2},
             success: function success(data) {
                 $("#spinner2").hide();
-                ResultText = data.text;
-                $("#DialogContent").html(ResultText);
+                $("#DialogContent").html(data.text);
                 $("#DialogFinished").removeClass("hidden");
             }
         });
@@ -311,8 +310,7 @@ $(function() {
             url: path + "/../../import_ldap_users",
             success: function success(data) {
                 $("#spinner2").hide();
-                ResultText = data.text;
-                $("#DialogContent").html(ResultText);
+                $("#DialogContent").html(data.text);
                 $("#DialogFinished").removeClass("hidden");
             }
         });

From 8bd1903d988fdecac8008cbfd403edc3df458f0e Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 24 Apr 2020 18:37:29 +0200
Subject: [PATCH 13/17] Fix for #1326 (opds feed user login not working ->
 download was not possible)

---
 cps/web.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cps/web.py b/cps/web.py
index bfb0ec5d..7be3250d 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -156,6 +156,9 @@ def load_user_from_auth_header(header_val):
     except (TypeError, UnicodeDecodeError, binascii.Error):
         pass
     user = _fetch_user_by_name(basic_username)
+    if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
+        if services.ldap.bind_user(str(user.password), basic_password)
+            return user
     if user and check_password_hash(str(user.password), basic_password):
         return user
     return

From 7393b69757c77241c552e7af7274ada59689ee82 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 24 Apr 2020 19:25:11 +0200
Subject: [PATCH 14/17] Fix for #1326 (typo)

---
 cps/web.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/web.py b/cps/web.py
index 7be3250d..c99cfeb9 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -157,7 +157,7 @@ def load_user_from_auth_header(header_val):
         pass
     user = _fetch_user_by_name(basic_username)
     if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
-        if services.ldap.bind_user(str(user.password), basic_password)
+        if services.ldap.bind_user(str(user.password), basic_password):
             return user
     if user and check_password_hash(str(user.password), basic_password):
         return user

From d657330584f0c3a71dc6021f5fd812d832a15eb5 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Apr 2020 07:13:55 +0200
Subject: [PATCH 15/17] Fix for removing admin role from last admin user (in
 addition to prevent delete of last admin user) #1326

---
 cps/admin.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 41f3b1db..fb26931e 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -834,9 +834,8 @@ def edit_user(user_id):
     if request.method == "POST":
         to_save = request.form.to_dict()
         if "delete" in to_save:
-            if ub.session.query(ub.User).filter(and_(ub.User.role.op('&')
-                                                             (constants.ROLE_ADMIN)== constants.ROLE_ADMIN,
-                                                         ub.User.id != content.id)).count():
+            if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
+                                                ub.User.id != content.id).count():
                 ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
                 ub.session.commit()
                 flash(_(u"User '%(nick)s' deleted", nick=content.nickname), category="success")
@@ -845,6 +844,12 @@ def edit_user(user_id):
                 flash(_(u"No admin user remaining, can't delete user", nick=content.nickname), category="error")
                 return redirect(url_for('admin.admin'))
         else:
+            if not ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
+                                                    ub.User.id != content.id).count() and \
+                not 'admin_role' in to_save:
+                flash(_(u"No admin user remaining, can't remove admin role", nick=content.nickname), category="error")
+                return redirect(url_for('admin.admin'))
+
             if "password" in to_save and to_save["password"]:
                 content.password = generate_password_hash(to_save["password"])
             anonymous = content.is_anonymous

From fa387980663657f1299cc86e8f4834aa779ec42d Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Apr 2020 08:55:01 +0200
Subject: [PATCH 16/17] Added contributing file

---
 CONTRIBUTING.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..d178f5e2
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,49 @@
+## How to contribute to Calibre-Web
+
+First of all, I would like to thank you for reading this text. I'm happy you are willing to contribute to Calibre-Web
+
+#### General
+
+**Communication language** is english. Google translated texts are not as bad as you might think, they are usually understandable, so don't worry if you generate your post that way.
+
+**Calibre-Web** is not **Calibre**. If you are having a question regarding Calibre please post this at their [repository](https://github.com/kovidgoyal/calibre).
+
+**Docker-Containers** of Calibre-Web are maintained by different persons than the people who drive Calibre-Web. If we come to the conclusion during our analysis that the problem is related to Docker, we might ask you to open a new issue at the reprository of the Docker Container.
+
+If you are having **Basic Installation Problems** with python or it's dependencies, please consider using your favorite search engine to find a solution. In case you can't find a solution, we are happy to help you.
+
+We can offer only very limited support regarding configuration of **Reverse-Proxy Installations**, **OPDS-Reader** or other programs in combination with Calibre-Web. 
+
+#### **Translation**
+
+Some of the user languages in Calibre-Web having missing translations. We are happy to add the missing texts if you are translate them. Create a Pull Request, create an issue with the .po file attached, or write an email to "ozzie.fernandez.isaacs@googlemail.com" with attached translation file. To display all book languages in your native language an additional file is used (iso_language_names.py). The content of this file is autogenerated with the corresponding translations of Calibre, please do not edit this file on your own. 
+
+#### **Documentation**
+
+The Calibre-Web documentation is hosted in the Github [Wiki](https://github.com/janeczku/calibre-web/wiki). The Wiki is open to everybody, if you find a problem, feel free to correct it. If information is missing, you are welcome to add it. The content will be reviewed time by time. Please try to be consitent with the form with the other Wiki pages (e.g. the project name is Calibre-Web with 2 capital letters and a dash in between).
+
+#### **Reporting a bug**
+
+Do not open up a GitHub issue if the bug is a **security vulnerability** in Calibre-Web. Please write intead an email to "ozzie.fernandez.isaacs@googlemail.com".
+
+Ensure the ***bug was not already reported** by searching on GitHub under [Issues](https://github.com/janeczku/calibre-web/issues). Please also check if a solution for your problem can be found in the [wiki](https://github.com/janeczku/calibre-web/wiki).
+
+If you're unable to find an **open issue** addressing the problem, open a [new one](https://github.com/janeczku/calibre-web/issues/new?assignees=&labels=&template=bug_report.md&title=). Be sure to include a **title** and **clear description**, as much relevant information as possible, the **issue form** helps you providing the right information. Deleting the form and just pasting the stack trace doesn't speed up fixing the problem. If your issue could be resolved, consider closing the issue. 
+
+#### **Feature Request**
+
+If there is afeature missing in Calibre-Web and you can't find a feature request in the [Issues](https://github.com/janeczku/calibre-web/issues) section, you could create a [feature request](https://github.com/janeczku/calibre-web/issues/new?assignees=&labels=&template=feature_request.md&title=). 
+We will not extend Calibre-Web with any more login abilitys or add further files storages, or file syncing ability. Furthermore Calibre-Web is made for home usage for company inhouse usage, so requests regarding any sorts of social interaction capability, payment routines, search engine or web site analytics integration will not be implemeted. 
+
+#### Contributing code to Calibre-Web
+
+Open a new GitHub pull request with the patch. Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+In case your code enhances features of Calibre-Web: Create your pull request for the development branch if your enhancement consits of more than some lines of code in a local section of Calibre-Webs code. This makes it easier to test it and check all implication before it's made public. 
+
+Please check if your code runs on Python 2.7 (still necessary in 2020) and mainly on python 3. If possible and the feature is related to operating system functions, try to check it on Windows and Linux. 
+Calibre-Web is automatically tested on Linux in combination with python 3.7. The code for testing is in a [seperate repo](https://github.com/OzzieIsaacs/calibre-web-test) on Github. It uses unittest and performs real system tests with selenium, would be great if you could consider also writing some tests. 
+A static code analysis is done by Codacy, but it's partly broken and doesn't run automatically. You could check your code with ESLint before contributing, a configuration file can be found in the projects root folder. 
+
+
+

From 85ffc90f66ed82893f1307a8dbb65d4ba5955620 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Apr 2020 08:56:51 +0200
Subject: [PATCH 17/17] Update markup

---
 CONTRIBUTING.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d178f5e2..741f87bb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 ## How to contribute to Calibre-Web
 
-First of all, I would like to thank you for reading this text. I'm happy you are willing to contribute to Calibre-Web
+First of all, we would like to thank you for reading this text. we are happy you are willing to contribute to Calibre-Web
 
-#### General
+### **General**
 
 **Communication language** is english. Google translated texts are not as bad as you might think, they are usually understandable, so don't worry if you generate your post that way.
 
@@ -14,15 +14,15 @@ If you are having **Basic Installation Problems** with python or it's dependenci
 
 We can offer only very limited support regarding configuration of **Reverse-Proxy Installations**, **OPDS-Reader** or other programs in combination with Calibre-Web. 
 
-#### **Translation**
+### **Translation**
 
 Some of the user languages in Calibre-Web having missing translations. We are happy to add the missing texts if you are translate them. Create a Pull Request, create an issue with the .po file attached, or write an email to "ozzie.fernandez.isaacs@googlemail.com" with attached translation file. To display all book languages in your native language an additional file is used (iso_language_names.py). The content of this file is autogenerated with the corresponding translations of Calibre, please do not edit this file on your own. 
 
-#### **Documentation**
+### **Documentation**
 
 The Calibre-Web documentation is hosted in the Github [Wiki](https://github.com/janeczku/calibre-web/wiki). The Wiki is open to everybody, if you find a problem, feel free to correct it. If information is missing, you are welcome to add it. The content will be reviewed time by time. Please try to be consitent with the form with the other Wiki pages (e.g. the project name is Calibre-Web with 2 capital letters and a dash in between).
 
-#### **Reporting a bug**
+### **Reporting a bug**
 
 Do not open up a GitHub issue if the bug is a **security vulnerability** in Calibre-Web. Please write intead an email to "ozzie.fernandez.isaacs@googlemail.com".
 
@@ -30,12 +30,12 @@ Ensure the ***bug was not already reported** by searching on GitHub under [Issue
 
 If you're unable to find an **open issue** addressing the problem, open a [new one](https://github.com/janeczku/calibre-web/issues/new?assignees=&labels=&template=bug_report.md&title=). Be sure to include a **title** and **clear description**, as much relevant information as possible, the **issue form** helps you providing the right information. Deleting the form and just pasting the stack trace doesn't speed up fixing the problem. If your issue could be resolved, consider closing the issue. 
 
-#### **Feature Request**
+### **Feature Request**
 
 If there is afeature missing in Calibre-Web and you can't find a feature request in the [Issues](https://github.com/janeczku/calibre-web/issues) section, you could create a [feature request](https://github.com/janeczku/calibre-web/issues/new?assignees=&labels=&template=feature_request.md&title=). 
 We will not extend Calibre-Web with any more login abilitys or add further files storages, or file syncing ability. Furthermore Calibre-Web is made for home usage for company inhouse usage, so requests regarding any sorts of social interaction capability, payment routines, search engine or web site analytics integration will not be implemeted. 
 
-#### Contributing code to Calibre-Web
+### **Contributing code to Calibre-Web**
 
 Open a new GitHub pull request with the patch. Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.