From 06fde4fcd00fcd067a58939e1d9eabee62a86913 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sat, 18 Apr 2020 11:47:44 +0200 Subject: [PATCH] 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 \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 \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 \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 \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 \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 \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 \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 \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 \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 \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 \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 \n" "Language-Team: LANGUAGE \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 @@
-

Start Time: 2020-04-16 21:05:16

+

Start Time: 2020-04-18 10:46:25

-

Stop Time: 2020-04-16 21:53:03

+

Stop Time: 2020-04-18 11:34:54

-

Duration: 41:12 min

+

Duration: 41:54 min

@@ -1006,9 +1006,9 @@ 
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
 ?                                                                            +++++++++++++++++
@@ -1040,13 +1040,13 @@ AssertionError: 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg' != test_ldap.test_ldap_login - 7 - 7 + 8 + 8 0 0 0 - Detail + Detail @@ -1114,6 +1114,15 @@ AssertionError: 'http[35 chars]4dd7bb34f15173d3cfcccd48b/{ImageId}/image.jpg' != + + + +
test_ldap_authentication
+ + PASS + + + @@ -1310,7 +1319,7 @@ AssertionError: False is not true : logfile config value is not empty after rese - test_oauth.test_outh_login + test_oauth.test_OAuth_login 2 2 0 @@ -2196,8 +2205,8 @@ AssertionError: False is not true : logfile config value is not empty after rese Total - 185 - 176 + 186 + 177 2 0 7 @@ -2340,6 +2349,30 @@ AssertionError: False is not true : logfile config value is not empty after rese test_kobo_sync + + Flask-SimpleLDAP + 1.4.0 + test_ldap_login + + + + python-ldap + 3.2.0 + test_ldap_login + + + + Flask-Dance + 3.0.0 + test_OAuth_login + + + + SQLAlchemy-Utils + 0.36.3 + test_OAuth_login + + @@ -2348,7 +2381,7 @@ AssertionError: False is not true : logfile config value is not empty after rese