\n"
"Language: pl\n"
@@ -24,7 +24,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.1\n"
-#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1401
+#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1450
msgid "not installed"
msgstr "nie zainstalowane"
@@ -80,378 +80,382 @@ msgstr ""
msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
msgstr ""
-#: cps/ub.py:577
+#: cps/ub.py:649
msgid "Guest"
msgstr "Gość"
-#: cps/web.py:967
+#: cps/web.py:1016
msgid "Requesting update package"
msgstr "Żądanie o pakiet aktualizacji"
-#: cps/web.py:968
+#: cps/web.py:1017
msgid "Downloading update package"
msgstr "Pobieranie pakietu aktualizacji"
-#: cps/web.py:969
+#: cps/web.py:1018
msgid "Unzipping update package"
msgstr "Rozpakowywanie pakietu aktualizacji"
-#: cps/web.py:970
+#: cps/web.py:1019
msgid "Files are replaced"
msgstr "Pliki zostały zastąpione"
-#: cps/web.py:971
+#: cps/web.py:1020
msgid "Database connections are closed"
msgstr "Połączenia z bazą danych zostały zakończone"
-#: cps/web.py:972
+#: cps/web.py:1021
msgid "Server is stopped"
msgstr "Serwer jest zatrzymany"
-#: cps/web.py:973
+#: cps/web.py:1022
msgid "Update finished, please press okay and reload page"
msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
-#: cps/web.py:1047
+#: cps/web.py:1096
msgid "Recently Added Books"
msgstr ""
-#: cps/web.py:1057
+#: cps/web.py:1106
msgid "Newest Books"
msgstr ""
-#: cps/web.py:1069
+#: cps/web.py:1118
msgid "Oldest Books"
msgstr ""
-#: cps/web.py:1081
+#: cps/web.py:1130
msgid "Books (A-Z)"
msgstr ""
-#: cps/web.py:1092
+#: cps/web.py:1141
msgid "Books (Z-A)"
msgstr ""
-#: cps/web.py:1120
+#: cps/web.py:1169
msgid "Hot Books (most downloaded)"
msgstr "Najpopularniejsze książki (najczęściej pobierane)"
-#: cps/web.py:1133
+#: cps/web.py:1182
msgid "Best rated books"
msgstr "Najlepiej oceniane książki"
-#: cps/templates/index.xml:32 cps/web.py:1144
+#: cps/templates/index.xml:32 cps/web.py:1193
msgid "Random Books"
msgstr "Losowe książki"
-#: cps/web.py:1158
+#: cps/web.py:1207
msgid "Author list"
msgstr "Lista autorów"
-#: cps/web.py:1170 cps/web.py:1228 cps/web.py:1358 cps/web.py:1827
+#: cps/web.py:1219 cps/web.py:1277 cps/web.py:1407 cps/web.py:1876
msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:"
-#: cps/templates/index.xml:64 cps/web.py:1212
+#: cps/templates/index.xml:64 cps/web.py:1261
msgid "Series list"
msgstr "Lista serii"
-#: cps/web.py:1226
+#: cps/web.py:1275
#, python-format
msgid "Series: %(serie)s"
msgstr "Seria: %(serie)s"
-#: cps/web.py:1259
+#: cps/web.py:1308
msgid "Available languages"
msgstr "Dostępne języki"
-#: cps/web.py:1276
+#: cps/web.py:1325
#, python-format
msgid "Language: %(name)s"
msgstr "Język: %(name)s"
-#: cps/templates/index.xml:58 cps/web.py:1286
+#: cps/templates/index.xml:58 cps/web.py:1335
msgid "Category list"
msgstr "Lista kategorii"
-#: cps/web.py:1300
+#: cps/web.py:1349
#, python-format
msgid "Category: %(name)s"
msgstr "Kategoria: %(name)s"
-#: cps/web.py:1412
+#: cps/web.py:1461
msgid "Excecution permissions missing"
msgstr ""
-#: cps/web.py:1426
+#: cps/web.py:1475
msgid "Statistics"
msgstr "Statystyki"
-#: cps/web.py:1591
+#: cps/web.py:1640
msgid "Server restarted, please reload page"
msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
-#: cps/web.py:1593
+#: cps/web.py:1642
msgid "Performing shutdown of server, please close window"
msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
-#: cps/web.py:1609
+#: cps/web.py:1658
msgid "Update done"
msgstr "Aktualizacja zakończona"
-#: cps/web.py:1691 cps/web.py:1704
+#: cps/web.py:1740 cps/web.py:1753
msgid "search"
msgstr "szukaj"
#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:132 cps/web.py:1782
+#: cps/templates/layout.html:132 cps/web.py:1831
msgid "Read Books"
msgstr "Przeczytane książki"
#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:134 cps/web.py:1785
+#: cps/templates/layout.html:134 cps/web.py:1834
msgid "Unread Books"
msgstr "Nieprzeczytane książki"
-#: cps/web.py:1860 cps/web.py:1862 cps/web.py:1864 cps/web.py:1873
+#: cps/web.py:1909 cps/web.py:1911 cps/web.py:1913 cps/web.py:1922
msgid "Read a Book"
msgstr "Czytaj książkę"
-#: cps/web.py:1925 cps/web.py:2556
+#: cps/web.py:1974 cps/web.py:2644
msgid "Please fill out all fields!"
msgstr "Proszę wypełnić wszystkie pola!"
-#: cps/web.py:1926 cps/web.py:1942 cps/web.py:1947 cps/web.py:1949
+#: cps/web.py:1975 cps/web.py:1992 cps/web.py:1997 cps/web.py:1999
msgid "register"
msgstr "rejestracja"
-#: cps/web.py:1941
+#: cps/web.py:1991
msgid "An unknown error occured. Please try again later."
msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
-#: cps/web.py:1946
+#: cps/web.py:1996
msgid "This username or email address is already in use."
msgstr "Nazwa użytkownika lub adres e-mail jest już w użyciu."
-#: cps/web.py:1965 cps/web.py:2061
+#: cps/web.py:2015 cps/web.py:2111
#, python-format
msgid "you are now logged in as: '%(nickname)s'"
msgstr "Zalogowałeś się jako: '%(nickname)s'"
-#: cps/web.py:1970
+#: cps/web.py:2020
msgid "Wrong Username or Password"
msgstr "Błędna nazwa użytkownika lub hasło"
-#: cps/web.py:1976 cps/web.py:1997
+#: cps/web.py:2026 cps/web.py:2047
msgid "login"
msgstr "logowanie"
-#: cps/web.py:2009 cps/web.py:2040
+#: cps/web.py:2059 cps/web.py:2090
msgid "Token not found"
msgstr ""
-#: cps/web.py:2017 cps/web.py:2048
+#: cps/web.py:2067 cps/web.py:2098
msgid "Token has expired"
msgstr ""
-#: cps/web.py:2025
+#: cps/web.py:2075
msgid "Success! Please return to your device"
msgstr ""
-#: cps/web.py:2075
+#: cps/web.py:2125
msgid "Please configure the SMTP mail settings first..."
msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
-#: cps/web.py:2079
+#: cps/web.py:2129
#, python-format
msgid "Book successfully send to %(kindlemail)s"
msgstr "Książka została pomyślnie wysłana do %(kindlemail)s"
-#: cps/web.py:2083
+#: cps/web.py:2133
#, python-format
msgid "There was an error sending this book: %(res)s"
msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
-#: cps/web.py:2085 cps/web.py:2641
+#: cps/web.py:2135 cps/web.py:2730
msgid "Please configure your kindle email address first..."
msgstr "Proszę najpierw skonfigurować adres e-mail swojego kindla..."
-#: cps/web.py:2129
+#: cps/web.py:2179
#, python-format
msgid "Book has been added to shelf: %(sname)s"
msgstr "Książka została dodana do półki: %(sname)s"
-#: cps/web.py:2166
+#: cps/web.py:2216
#, python-format
msgid "Book has been removed from shelf: %(sname)s"
msgstr "Książka została usunięta z półki: %(sname)s"
-#: cps/web.py:2185 cps/web.py:2209
+#: cps/web.py:2235 cps/web.py:2259
#, python-format
msgid "A shelf with the name '%(title)s' already exists."
msgstr "Półka o nazwie '%(title)s' już istnieje."
-#: cps/web.py:2190
+#: cps/web.py:2240
#, python-format
msgid "Shelf %(title)s created"
msgstr "Półka %(title)s została utworzona"
-#: cps/web.py:2192 cps/web.py:2220
+#: cps/web.py:2242 cps/web.py:2270
msgid "There was an error"
msgstr "Wystąpił błąd"
-#: cps/web.py:2193 cps/web.py:2195
+#: cps/web.py:2243 cps/web.py:2245
msgid "create a shelf"
msgstr "utwórz półkę"
-#: cps/web.py:2218
+#: cps/web.py:2268
#, python-format
msgid "Shelf %(title)s changed"
msgstr "Półka %(title)s została zmieniona"
-#: cps/web.py:2221 cps/web.py:2223
+#: cps/web.py:2271 cps/web.py:2273
msgid "Edit a shelf"
msgstr "Edytuj półkę"
-#: cps/web.py:2244
+#: cps/web.py:2294
#, python-format
msgid "successfully deleted shelf %(name)s"
msgstr "pomyślnie usunięto półkę %(name)s"
-#: cps/web.py:2266
+#: cps/web.py:2316
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Półka: '%(name)s'"
-#: cps/web.py:2269
+#: cps/web.py:2319
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr ""
-#: cps/web.py:2300
+#: cps/web.py:2350
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Zmieniono kolejność półki: '%(name)s'"
-#: cps/web.py:2369
+#: cps/web.py:2419
msgid "Found an existing account for this email address."
msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
-#: cps/web.py:2371 cps/web.py:2375
+#: cps/web.py:2421 cps/web.py:2425
#, python-format
msgid "%(name)s's profile"
msgstr "Profil użytkownika %(name)s"
-#: cps/web.py:2372
+#: cps/web.py:2422
msgid "Profile updated"
msgstr "Zaktualizowano profil"
-#: cps/web.py:2386
+#: cps/web.py:2436
msgid "Admin page"
msgstr "Portal administracyjny"
-#: cps/web.py:2510
-msgid "Calibre-web configuration updated"
-msgstr "Konfiguracja Calibre-web została zaktualizowana"
+#: cps/web.py:2583
+msgid "Logfile location is not valid, please enter correct path"
+msgstr ""
-#: cps/web.py:2517 cps/web.py:2523 cps/web.py:2537
+#: cps/web.py:2586 cps/web.py:2605 cps/web.py:2611 cps/web.py:2625
msgid "Basic Configuration"
msgstr "Podstawowa konfiguracja"
-#: cps/web.py:2521
+#: cps/web.py:2598
+msgid "Calibre-web configuration updated"
+msgstr "Konfiguracja Calibre-web została zaktualizowana"
+
+#: cps/web.py:2609
msgid "DB location is not valid, please enter correct path"
msgstr "Lokalizacja bazy danych jest nieprawidłowa, wpisz poprawną ścieżkę"
-#: cps/templates/admin.html:34 cps/web.py:2558 cps/web.py:2611
+#: cps/templates/admin.html:34 cps/web.py:2646 cps/web.py:2700
msgid "Add new user"
msgstr "Dodaj nowego użytkownika"
-#: cps/web.py:2603
+#: cps/web.py:2691
#, python-format
msgid "User '%(user)s' created"
msgstr "Użytkownik '%(user)s' został utworzony"
-#: cps/web.py:2607
+#: cps/web.py:2695
msgid "Found an existing account for this email address or nickname."
msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy użytkownika."
-#: cps/web.py:2629
+#: cps/web.py:2718
msgid "Mail settings updated"
msgstr "Zaktualizowano ustawienia poczty e-mail"
-#: cps/web.py:2636
+#: cps/web.py:2725
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "Testowy e-mail został pomyślnie wysłany do %(kindlemail)s"
-#: cps/web.py:2639
+#: cps/web.py:2728
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "Wystąpił błąd podczas wysyłania testowej wiadomości e-mail: %(res)s"
-#: cps/web.py:2643
+#: cps/web.py:2732
msgid "E-Mail settings updated"
msgstr "Zaktualizowano ustawienia e-mail"
-#: cps/web.py:2644
+#: cps/web.py:2733
msgid "Edit mail settings"
msgstr "Edytuj ustawienia poczty e-mail"
-#: cps/web.py:2673
+#: cps/web.py:2762
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "Użytkownik '%(nick)s' został usunięty"
-#: cps/web.py:2781
+#: cps/web.py:2870
#, python-format
msgid "User '%(nick)s' updated"
msgstr "Użytkownik '%(nick)s' został zaktualizowany"
-#: cps/web.py:2784
+#: cps/web.py:2873
msgid "An unknown error occured."
msgstr "Wystąpił nieznany błąd."
-#: cps/web.py:2787
+#: cps/web.py:2876
#, python-format
msgid "Edit User %(nick)s"
msgstr "Edytuj użytkownika %(nick)s"
-#: cps/web.py:2803
+#: cps/web.py:2892
msgid "Error opening eBook. File does not exist or file is not accessible"
msgstr ""
-#: cps/web.py:2818 cps/web.py:3026 cps/web.py:3031 cps/web.py:3174
+#: cps/web.py:2907 cps/web.py:3115 cps/web.py:3120 cps/web.py:3263
msgid "edit metadata"
msgstr "edytuj metadane"
-#: cps/web.py:2828 cps/web.py:3068
+#: cps/web.py:2917 cps/web.py:3157
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr "Rozszerzenie pliku \"%s\" nie jest dozwolone do przesłania na ten serwer"
-#: cps/web.py:2839
+#: cps/web.py:2928
#, python-format
msgid "Failed to store file %s."
msgstr ""
-#: cps/web.py:2861 cps/web.py:2865
+#: cps/web.py:2950 cps/web.py:2954
msgid "unknown"
msgstr ""
-#: cps/web.py:3074
+#: cps/web.py:3163
msgid "File to be uploaded must have an extension"
msgstr "Plik do przesłania musi mieć rozszerzenie"
-#: cps/web.py:3093
+#: cps/web.py:3182
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)."
-#: cps/web.py:3098
+#: cps/web.py:3187
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)."
-#: cps/web.py:3103
+#: cps/web.py:3192
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)."
@@ -608,7 +612,7 @@ msgstr "OK"
#: cps/templates/admin.html:105 cps/templates/admin.html:119
#: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:156 cps/templates/email_edit.html:36
+#: cps/templates/config_edit.html:211 cps/templates/email_edit.html:36
#: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:139
msgid "Back"
@@ -701,7 +705,7 @@ msgstr "wyświetl książkę po edycji"
msgid "Get metadata"
msgstr "Uzyskaj metadane"
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:154
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:209
#: cps/templates/login.html:20 cps/templates/search_form.html:79
#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:137
msgid "Submit"
@@ -818,71 +822,123 @@ msgstr "Wyrażenie regularne dla tytułu sortującego"
msgid "Tags for Mature Content"
msgstr ""
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:92
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr ""
+
+#: cps/templates/config_edit.html:98
msgid "Enable uploading"
msgstr "Włącz wysyłanie"
-#: cps/templates/config_edit.html:97
+#: cps/templates/config_edit.html:102
msgid "Enable anonymous browsing"
msgstr "Włącz anonimowe przeglądanie"
-#: cps/templates/config_edit.html:101
+#: cps/templates/config_edit.html:106
msgid "Enable public registration"
msgstr "Włącz publiczną rejestrację"
-#: cps/templates/config_edit.html:105
+#: cps/templates/config_edit.html:110
msgid "Enable remote login (\"magic link\")"
msgstr ""
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:115
msgid "Use"
msgstr ""
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:116
msgid "Obtain an API Key"
msgstr ""
-#: cps/templates/config_edit.html:115
+#: cps/templates/config_edit.html:120
msgid "Goodreads API Key"
msgstr ""
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:124
msgid "Goodreads API Secret"
msgstr ""
-#: cps/templates/config_edit.html:125
+#: cps/templates/config_edit.html:129
msgid "Default Settings for new users"
msgstr "Domyślne ustawienia dla nowych użytkowników"
-#: cps/templates/config_edit.html:128 cps/templates/user_edit.html:94
+#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:94
msgid "Admin user"
msgstr "Użytkownik z uprawnieniami administratora"
-#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:103
+#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:103
msgid "Allow Downloads"
msgstr "Zezwalaj na pobieranie"
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:107
+#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:107
msgid "Allow Uploads"
msgstr "Zezwalaj na wysyłanie"
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:111
msgid "Allow Edit"
msgstr "Zezwalaj na edycję"
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:115
msgid "Allow Delete books"
msgstr ""
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:120
+#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:120
msgid "Allow Changing Password"
msgstr "Zezwalaj na zmianę hasła"
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:124
+#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:124
msgid "Allow Editing Public Shelfs"
msgstr ""
-#: cps/templates/config_edit.html:159 cps/templates/layout.html:76
+#: cps/templates/config_edit.html:160
+msgid "Default visiblities for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:164 cps/templates/user_edit.html:46
+msgid "Show random books"
+msgstr "Pokaż losowe książki"
+
+#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:50
+msgid "Show recent books"
+msgstr ""
+
+#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:54
+msgid "Show sorted books"
+msgstr ""
+
+#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:58
+msgid "Show hot books"
+msgstr "Pokaż najpopularniejsze książki"
+
+#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:62
+msgid "Show best rated books"
+msgstr "Pokaż najlepiej ocenione książki"
+
+#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:66
+msgid "Show language selection"
+msgstr "Pokaż wybór języka"
+
+#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:70
+msgid "Show series selection"
+msgstr "Pokaż wybór serii"
+
+#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:74
+msgid "Show category selection"
+msgstr "Pokaż wybór kategorii"
+
+#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:78
+msgid "Show author selection"
+msgstr "Pokaż wybór autora"
+
+#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:82
+msgid "Show read and unread"
+msgstr "Pokaż przeczytane i nieprzeczytane"
+
+#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:86
+msgid "Show random books in detail view"
+msgstr "Pokaz losowe książki w widoku szczegółowym"
+
+#: cps/templates/config_edit.html:214 cps/templates/layout.html:76
#: cps/templates/login.html:4
msgid "Login"
msgstr "Zaloguj się"
@@ -1014,6 +1070,22 @@ msgstr "Książki sortowane według kategorii"
msgid "Books ordered by series"
msgstr "Książki sortowane według serii"
+#: cps/templates/index.xml:70 cps/templates/layout.html:152
+msgid "Public Shelves"
+msgstr "Publiczne półki"
+
+#: cps/templates/index.xml:73
+msgid "Books organized in public shelfs, visible to everyone"
+msgstr ""
+
+#: cps/templates/index.xml:77 cps/templates/layout.html:156
+msgid "Your Shelves"
+msgstr "Twoje półki"
+
+#: cps/templates/index.xml:80
+msgid "User's own shelfs, only visible to the current user himself"
+msgstr ""
+
#: cps/templates/layout.html:30
msgid "Toggle navigation"
msgstr "Przełącz nawigację"
@@ -1075,14 +1147,6 @@ msgstr "Kategorie"
msgid "Languages"
msgstr "Języki"
-#: cps/templates/layout.html:152
-msgid "Public Shelves"
-msgstr "Publiczne półki"
-
-#: cps/templates/layout.html:156
-msgid "Your Shelves"
-msgstr "Twoje półki"
-
#: cps/templates/layout.html:161
msgid "Create a Shelf"
msgstr "Utwórz półkę"
@@ -1266,50 +1330,6 @@ msgstr "Pokaż książki w języku"
msgid "Show all"
msgstr "Pokaż wszystko"
-#: cps/templates/user_edit.html:46
-msgid "Show random books"
-msgstr "Pokaż losowe książki"
-
-#: cps/templates/user_edit.html:50
-msgid "Show recent books"
-msgstr ""
-
-#: cps/templates/user_edit.html:54
-msgid "Show sorted books"
-msgstr ""
-
-#: cps/templates/user_edit.html:58
-msgid "Show hot books"
-msgstr "Pokaż najpopularniejsze książki"
-
-#: cps/templates/user_edit.html:62
-msgid "Show best rated books"
-msgstr "Pokaż najlepiej ocenione książki"
-
-#: cps/templates/user_edit.html:66
-msgid "Show language selection"
-msgstr "Pokaż wybór języka"
-
-#: cps/templates/user_edit.html:70
-msgid "Show series selection"
-msgstr "Pokaż wybór serii"
-
-#: cps/templates/user_edit.html:74
-msgid "Show category selection"
-msgstr "Pokaż wybór kategorii"
-
-#: cps/templates/user_edit.html:78
-msgid "Show author selection"
-msgstr "Pokaż wybór autora"
-
-#: cps/templates/user_edit.html:82
-msgid "Show read and unread"
-msgstr "Pokaż przeczytane i nieprzeczytane"
-
-#: cps/templates/user_edit.html:86
-msgid "Show random books in detail view"
-msgstr "Pokaz losowe książki w widoku szczegółowym"
-
#: cps/templates/user_edit.html:98
msgid "Show mature content"
msgstr ""
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index cb6d86b8..76dd6e1c 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Calibre-web\n"
"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2017-11-30 16:45+0100\n"
+"POT-Creation-Date: 2017-12-02 11:12+0100\n"
"PO-Revision-Date: 2017-04-30 00:47+0300\n"
"Last-Translator: Pavel Korovin \n"
"Language: ru\n"
@@ -26,7 +26,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.1\n"
-#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1401
+#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1450
msgid "not installed"
msgstr "Отсутствует"
@@ -80,378 +80,382 @@ msgstr ""
msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
msgstr ""
-#: cps/ub.py:577
+#: cps/ub.py:649
msgid "Guest"
msgstr "Гость"
-#: cps/web.py:967
+#: cps/web.py:1016
msgid "Requesting update package"
msgstr "Проверка обновлений"
-#: cps/web.py:968
+#: cps/web.py:1017
msgid "Downloading update package"
msgstr "Загрузка обновлений"
-#: cps/web.py:969
+#: cps/web.py:1018
msgid "Unzipping update package"
msgstr "Распаковка обновлений"
-#: cps/web.py:970
+#: cps/web.py:1019
msgid "Files are replaced"
msgstr "Файлы заменены"
-#: cps/web.py:971
+#: cps/web.py:1020
msgid "Database connections are closed"
msgstr "Соеднинения с базой данных закрыты"
-#: cps/web.py:972
+#: cps/web.py:1021
msgid "Server is stopped"
msgstr "Сервер остановлен"
-#: cps/web.py:973
+#: cps/web.py:1022
msgid "Update finished, please press okay and reload page"
msgstr "Обновления установлены, нажмите okay и перезагрузите страницу"
-#: cps/web.py:1047
+#: cps/web.py:1096
msgid "Recently Added Books"
msgstr ""
-#: cps/web.py:1057
+#: cps/web.py:1106
msgid "Newest Books"
msgstr ""
-#: cps/web.py:1069
+#: cps/web.py:1118
msgid "Oldest Books"
msgstr ""
-#: cps/web.py:1081
+#: cps/web.py:1130
msgid "Books (A-Z)"
msgstr ""
-#: cps/web.py:1092
+#: cps/web.py:1141
msgid "Books (Z-A)"
msgstr ""
-#: cps/web.py:1120
+#: cps/web.py:1169
msgid "Hot Books (most downloaded)"
msgstr "Популярные книги (часто загружаемые)"
-#: cps/web.py:1133
+#: cps/web.py:1182
msgid "Best rated books"
msgstr "Книги с наивысшим рейтингом"
-#: cps/templates/index.xml:32 cps/web.py:1144
+#: cps/templates/index.xml:32 cps/web.py:1193
msgid "Random Books"
msgstr "Случайный выбор"
-#: cps/web.py:1158
+#: cps/web.py:1207
msgid "Author list"
msgstr "Авторы"
-#: cps/web.py:1170 cps/web.py:1228 cps/web.py:1358 cps/web.py:1827
+#: cps/web.py:1219 cps/web.py:1277 cps/web.py:1407 cps/web.py:1876
msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
-#: cps/templates/index.xml:64 cps/web.py:1212
+#: cps/templates/index.xml:64 cps/web.py:1261
msgid "Series list"
msgstr "Серии"
-#: cps/web.py:1226
+#: cps/web.py:1275
#, python-format
msgid "Series: %(serie)s"
msgstr "Серии: %(serie)s"
-#: cps/web.py:1259
+#: cps/web.py:1308
msgid "Available languages"
msgstr "Языки"
-#: cps/web.py:1276
+#: cps/web.py:1325
#, python-format
msgid "Language: %(name)s"
msgstr "Язык: %(name)s"
-#: cps/templates/index.xml:58 cps/web.py:1286
+#: cps/templates/index.xml:58 cps/web.py:1335
msgid "Category list"
msgstr "Категории"
-#: cps/web.py:1300
+#: cps/web.py:1349
#, python-format
msgid "Category: %(name)s"
msgstr "Категория: %(name)s"
-#: cps/web.py:1412
+#: cps/web.py:1461
msgid "Excecution permissions missing"
msgstr ""
-#: cps/web.py:1426
+#: cps/web.py:1475
msgid "Statistics"
msgstr "Статистика"
-#: cps/web.py:1591
+#: cps/web.py:1640
msgid "Server restarted, please reload page"
msgstr "Сервер перезагружен, пожалуйста, перезагрузите страницу"
-#: cps/web.py:1593
+#: cps/web.py:1642
msgid "Performing shutdown of server, please close window"
msgstr "Производится остановка сервера, пожалуйста, закройте окно"
-#: cps/web.py:1609
+#: cps/web.py:1658
msgid "Update done"
msgstr "Обновление закончено"
-#: cps/web.py:1691 cps/web.py:1704
+#: cps/web.py:1740 cps/web.py:1753
msgid "search"
msgstr "поиск"
#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:132 cps/web.py:1782
+#: cps/templates/layout.html:132 cps/web.py:1831
msgid "Read Books"
msgstr "Прочитанные"
#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:134 cps/web.py:1785
+#: cps/templates/layout.html:134 cps/web.py:1834
msgid "Unread Books"
msgstr "Непрочитанные"
-#: cps/web.py:1860 cps/web.py:1862 cps/web.py:1864 cps/web.py:1873
+#: cps/web.py:1909 cps/web.py:1911 cps/web.py:1913 cps/web.py:1922
msgid "Read a Book"
msgstr "Читать книгу"
-#: cps/web.py:1925 cps/web.py:2556
+#: cps/web.py:1974 cps/web.py:2644
msgid "Please fill out all fields!"
msgstr "Пожалуйста, заполните все поля!"
-#: cps/web.py:1926 cps/web.py:1942 cps/web.py:1947 cps/web.py:1949
+#: cps/web.py:1975 cps/web.py:1992 cps/web.py:1997 cps/web.py:1999
msgid "register"
msgstr "зарегистрироваться"
-#: cps/web.py:1941
+#: cps/web.py:1991
msgid "An unknown error occured. Please try again later."
msgstr "Неизвестная ошибка. Пожалуйста, попробуйте позже."
-#: cps/web.py:1946
+#: cps/web.py:1996
msgid "This username or email address is already in use."
msgstr "Имя пользователя или адрес эл. почты уже используется"
-#: cps/web.py:1965 cps/web.py:2061
+#: cps/web.py:2015 cps/web.py:2111
#, python-format
msgid "you are now logged in as: '%(nickname)s'"
msgstr "Вы вошли как пользователь '%(nickname)s'"
-#: cps/web.py:1970
+#: cps/web.py:2020
msgid "Wrong Username or Password"
msgstr "Ошибка в имени пользователя или пароле"
-#: cps/web.py:1976 cps/web.py:1997
+#: cps/web.py:2026 cps/web.py:2047
msgid "login"
msgstr "войти"
-#: cps/web.py:2009 cps/web.py:2040
+#: cps/web.py:2059 cps/web.py:2090
msgid "Token not found"
msgstr ""
-#: cps/web.py:2017 cps/web.py:2048
+#: cps/web.py:2067 cps/web.py:2098
msgid "Token has expired"
msgstr ""
-#: cps/web.py:2025
+#: cps/web.py:2075
msgid "Success! Please return to your device"
msgstr ""
-#: cps/web.py:2075
+#: cps/web.py:2125
msgid "Please configure the SMTP mail settings first..."
msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
-#: cps/web.py:2079
+#: cps/web.py:2129
#, python-format
msgid "Book successfully send to %(kindlemail)s"
msgstr "Книга успешно отправлена на %(kindlemail)s"
-#: cps/web.py:2083
+#: cps/web.py:2133
#, python-format
msgid "There was an error sending this book: %(res)s"
msgstr "Ошибка при отправке книги: %(res)s"
-#: cps/web.py:2085 cps/web.py:2641
+#: cps/web.py:2135 cps/web.py:2730
msgid "Please configure your kindle email address first..."
msgstr "Пожалуйста, сначала укажите ваш kindle email..."
-#: cps/web.py:2129
+#: cps/web.py:2179
#, python-format
msgid "Book has been added to shelf: %(sname)s"
msgstr "Книга добавлена на книжную полку: %(sname)s"
-#: cps/web.py:2166
+#: cps/web.py:2216
#, python-format
msgid "Book has been removed from shelf: %(sname)s"
msgstr "Книга удалена с книжной полки: %(sname)s"
-#: cps/web.py:2185 cps/web.py:2209
+#: cps/web.py:2235 cps/web.py:2259
#, python-format
msgid "A shelf with the name '%(title)s' already exists."
msgstr "Книжкная полка с названием '%(title)s' уже существует."
-#: cps/web.py:2190
+#: cps/web.py:2240
#, python-format
msgid "Shelf %(title)s created"
msgstr "Создана книжная полка %(title)s"
-#: cps/web.py:2192 cps/web.py:2220
+#: cps/web.py:2242 cps/web.py:2270
msgid "There was an error"
msgstr "Произошла ошибка"
-#: cps/web.py:2193 cps/web.py:2195
+#: cps/web.py:2243 cps/web.py:2245
msgid "create a shelf"
msgstr "создать книжную полку"
-#: cps/web.py:2218
+#: cps/web.py:2268
#, python-format
msgid "Shelf %(title)s changed"
msgstr "Книжная полка %(title)s изменена"
-#: cps/web.py:2221 cps/web.py:2223
+#: cps/web.py:2271 cps/web.py:2273
msgid "Edit a shelf"
msgstr "Изменить книжную полку"
-#: cps/web.py:2244
+#: cps/web.py:2294
#, python-format
msgid "successfully deleted shelf %(name)s"
msgstr "Книжная полка %(name)s удалена"
-#: cps/web.py:2266
+#: cps/web.py:2316
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Книжная полка: '%(name)s'"
-#: cps/web.py:2269
+#: cps/web.py:2319
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr ""
-#: cps/web.py:2300
+#: cps/web.py:2350
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Изменить расположение книжной полки '%(name)s'"
-#: cps/web.py:2369
+#: cps/web.py:2419
msgid "Found an existing account for this email address."
msgstr "Найдена учётная запись для для данного адреса email."
-#: cps/web.py:2371 cps/web.py:2375
+#: cps/web.py:2421 cps/web.py:2425
#, python-format
msgid "%(name)s's profile"
msgstr "Профиль %(name)s"
-#: cps/web.py:2372
+#: cps/web.py:2422
msgid "Profile updated"
msgstr "Профиль обновлён"
-#: cps/web.py:2386
+#: cps/web.py:2436
msgid "Admin page"
msgstr "Администрирование"
-#: cps/web.py:2510
-msgid "Calibre-web configuration updated"
-msgstr "Конфигурация Calibre-web обновлена"
+#: cps/web.py:2583
+msgid "Logfile location is not valid, please enter correct path"
+msgstr ""
-#: cps/web.py:2517 cps/web.py:2523 cps/web.py:2537
+#: cps/web.py:2586 cps/web.py:2605 cps/web.py:2611 cps/web.py:2625
msgid "Basic Configuration"
msgstr "Настройки сервера"
-#: cps/web.py:2521
+#: cps/web.py:2598
+msgid "Calibre-web configuration updated"
+msgstr "Конфигурация Calibre-web обновлена"
+
+#: cps/web.py:2609
msgid "DB location is not valid, please enter correct path"
msgstr "Неверный путь к фалу БД, пожалуйста, укажите правильное расположение БД"
-#: cps/templates/admin.html:34 cps/web.py:2558 cps/web.py:2611
+#: cps/templates/admin.html:34 cps/web.py:2646 cps/web.py:2700
msgid "Add new user"
msgstr "Добавить пользователя"
-#: cps/web.py:2603
+#: cps/web.py:2691
#, python-format
msgid "User '%(user)s' created"
msgstr "Пользователь '%(user)s' добавлен"
-#: cps/web.py:2607
+#: cps/web.py:2695
msgid "Found an existing account for this email address or nickname."
msgstr "Для указанного адреса или имени найдена существующая учётная запись."
-#: cps/web.py:2629
+#: cps/web.py:2718
msgid "Mail settings updated"
msgstr "Настройки почты изменены"
-#: cps/web.py:2636
+#: cps/web.py:2725
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "Тестовое сообщение успешно отправлено на адрес %(kindlemail)s"
-#: cps/web.py:2639
+#: cps/web.py:2728
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "Ошибка отправки тестового сообщения: %(res)s"
-#: cps/web.py:2643
+#: cps/web.py:2732
msgid "E-Mail settings updated"
msgstr "Обновлены настройки e-mail"
-#: cps/web.py:2644
+#: cps/web.py:2733
msgid "Edit mail settings"
msgstr "Изменить почтовые настройки"
-#: cps/web.py:2673
+#: cps/web.py:2762
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "Пользователь '%(nick)s' удалён"
-#: cps/web.py:2781
+#: cps/web.py:2870
#, python-format
msgid "User '%(nick)s' updated"
msgstr "Пользователь '%(nick)s' обновлён"
-#: cps/web.py:2784
+#: cps/web.py:2873
msgid "An unknown error occured."
msgstr "Произошла неизвестная ошибка."
-#: cps/web.py:2787
+#: cps/web.py:2876
#, python-format
msgid "Edit User %(nick)s"
msgstr "Изменить пользователя %(nick)s"
-#: cps/web.py:2803
+#: cps/web.py:2892
msgid "Error opening eBook. File does not exist or file is not accessible"
msgstr ""
-#: cps/web.py:2818 cps/web.py:3026 cps/web.py:3031 cps/web.py:3174
+#: cps/web.py:2907 cps/web.py:3115 cps/web.py:3120 cps/web.py:3263
msgid "edit metadata"
msgstr "изменить метаданные"
-#: cps/web.py:2828 cps/web.py:3068
+#: cps/web.py:2917 cps/web.py:3157
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr "Запрещена загрузка файлов с расширением \"%s\""
-#: cps/web.py:2839
+#: cps/web.py:2928
#, python-format
msgid "Failed to store file %s."
msgstr ""
-#: cps/web.py:2861 cps/web.py:2865
+#: cps/web.py:2950 cps/web.py:2954
msgid "unknown"
msgstr "неизвестно"
-#: cps/web.py:3074
+#: cps/web.py:3163
msgid "File to be uploaded must have an extension"
msgstr "Загружаемый файл должен иметь расширение"
-#: cps/web.py:3093
+#: cps/web.py:3182
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr "Ошибка при создании пути %s (доступ запрещён)"
-#: cps/web.py:3098
+#: cps/web.py:3187
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr "Ошибка записи файоа %s (доступ запрещён)"
-#: cps/web.py:3103
+#: cps/web.py:3192
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "Ошибка удаления файла %s (доступ запрещён)"
@@ -608,7 +612,7 @@ msgstr "Ok"
#: cps/templates/admin.html:105 cps/templates/admin.html:119
#: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:156 cps/templates/email_edit.html:36
+#: cps/templates/config_edit.html:211 cps/templates/email_edit.html:36
#: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:139
msgid "Back"
@@ -701,7 +705,7 @@ msgstr "смотреть книгу после редактирования"
msgid "Get metadata"
msgstr "Получить метаданные"
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:154
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:209
#: cps/templates/login.html:20 cps/templates/search_form.html:79
#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:137
msgid "Submit"
@@ -817,71 +821,123 @@ msgstr "Regexp для сортировки по названию"
msgid "Tags for Mature Content"
msgstr ""
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:92
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr ""
+
+#: cps/templates/config_edit.html:98
msgid "Enable uploading"
msgstr "Разрешить загрузку на сервер"
-#: cps/templates/config_edit.html:97
+#: cps/templates/config_edit.html:102
msgid "Enable anonymous browsing"
msgstr "Разрешить анонимный просмотр"
-#: cps/templates/config_edit.html:101
+#: cps/templates/config_edit.html:106
msgid "Enable public registration"
msgstr "Разрешить публичную регистрацию"
-#: cps/templates/config_edit.html:105
+#: cps/templates/config_edit.html:110
msgid "Enable remote login (\"magic link\")"
msgstr ""
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:115
msgid "Use"
msgstr ""
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:116
msgid "Obtain an API Key"
msgstr ""
-#: cps/templates/config_edit.html:115
+#: cps/templates/config_edit.html:120
msgid "Goodreads API Key"
msgstr ""
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:124
msgid "Goodreads API Secret"
msgstr ""
-#: cps/templates/config_edit.html:125
+#: cps/templates/config_edit.html:129
msgid "Default Settings for new users"
msgstr "Настройки по умолчанию для новых пользователей"
-#: cps/templates/config_edit.html:128 cps/templates/user_edit.html:94
+#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:94
msgid "Admin user"
msgstr "Управление сервером"
-#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:103
+#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:103
msgid "Allow Downloads"
msgstr "Разрешить скачивание с сервера"
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:107
+#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:107
msgid "Allow Uploads"
msgstr "Разрешить загрузку на сервер"
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:111
msgid "Allow Edit"
msgstr "Разрешить редактирование книг"
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:115
msgid "Allow Delete books"
msgstr "Разрешить удаление книг"
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:120
+#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:120
msgid "Allow Changing Password"
msgstr "Разрешить смену пароля"
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:124
+#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:124
msgid "Allow Editing Public Shelfs"
msgstr "Разрешить редактирование публичных книжных полок"
-#: cps/templates/config_edit.html:159 cps/templates/layout.html:76
+#: cps/templates/config_edit.html:160
+msgid "Default visiblities for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:164 cps/templates/user_edit.html:46
+msgid "Show random books"
+msgstr "Показывать случайные книги"
+
+#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:50
+msgid "Show recent books"
+msgstr ""
+
+#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:54
+msgid "Show sorted books"
+msgstr ""
+
+#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:58
+msgid "Show hot books"
+msgstr "Показывать популярные книги"
+
+#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:62
+msgid "Show best rated books"
+msgstr "Показывать книги с наивысшим рейтингом"
+
+#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:66
+msgid "Show language selection"
+msgstr "Показывать выбор языка"
+
+#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:70
+msgid "Show series selection"
+msgstr "Показывать выбор серии"
+
+#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:74
+msgid "Show category selection"
+msgstr "Показывать выбор категории"
+
+#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:78
+msgid "Show author selection"
+msgstr "Показывать выбор автора"
+
+#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:82
+msgid "Show read and unread"
+msgstr "Показывать прочитанные и непрочитанные"
+
+#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:86
+msgid "Show random books in detail view"
+msgstr "Показывать случайные книги при просмотре деталей"
+
+#: cps/templates/config_edit.html:214 cps/templates/layout.html:76
#: cps/templates/login.html:4
msgid "Login"
msgstr "Имя пользователя"
@@ -1011,6 +1067,22 @@ msgstr "Книги, отсортированные по категории"
msgid "Books ordered by series"
msgstr "Книги, отсортированные по серии"
+#: cps/templates/index.xml:70 cps/templates/layout.html:152
+msgid "Public Shelves"
+msgstr "Общие книжные полки"
+
+#: cps/templates/index.xml:73
+msgid "Books organized in public shelfs, visible to everyone"
+msgstr ""
+
+#: cps/templates/index.xml:77 cps/templates/layout.html:156
+msgid "Your Shelves"
+msgstr "Ваши книжные полки"
+
+#: cps/templates/index.xml:80
+msgid "User's own shelfs, only visible to the current user himself"
+msgstr ""
+
#: cps/templates/layout.html:30
msgid "Toggle navigation"
msgstr "Включить навигацию"
@@ -1072,14 +1144,6 @@ msgstr "Категории"
msgid "Languages"
msgstr "Языки"
-#: cps/templates/layout.html:152
-msgid "Public Shelves"
-msgstr "Общие книжные полки"
-
-#: cps/templates/layout.html:156
-msgid "Your Shelves"
-msgstr "Ваши книжные полки"
-
#: cps/templates/layout.html:161
msgid "Create a Shelf"
msgstr "Создать книжную полку"
@@ -1262,50 +1326,6 @@ msgstr "Показать книги на языках"
msgid "Show all"
msgstr "Всех"
-#: cps/templates/user_edit.html:46
-msgid "Show random books"
-msgstr "Показывать случайные книги"
-
-#: cps/templates/user_edit.html:50
-msgid "Show recent books"
-msgstr ""
-
-#: cps/templates/user_edit.html:54
-msgid "Show sorted books"
-msgstr ""
-
-#: cps/templates/user_edit.html:58
-msgid "Show hot books"
-msgstr "Показывать популярные книги"
-
-#: cps/templates/user_edit.html:62
-msgid "Show best rated books"
-msgstr "Показывать книги с наивысшим рейтингом"
-
-#: cps/templates/user_edit.html:66
-msgid "Show language selection"
-msgstr "Показывать выбор языка"
-
-#: cps/templates/user_edit.html:70
-msgid "Show series selection"
-msgstr "Показывать выбор серии"
-
-#: cps/templates/user_edit.html:74
-msgid "Show category selection"
-msgstr "Показывать выбор категории"
-
-#: cps/templates/user_edit.html:78
-msgid "Show author selection"
-msgstr "Показывать выбор автора"
-
-#: cps/templates/user_edit.html:82
-msgid "Show read and unread"
-msgstr "Показывать прочитанные и непрочитанные"
-
-#: cps/templates/user_edit.html:86
-msgid "Show random books in detail view"
-msgstr "Показывать случайные книги при просмотре деталей"
-
#: cps/templates/user_edit.html:98
msgid "Show mature content"
msgstr ""
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 190ef138..dccd5438 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Calibre-web\n"
"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2017-11-30 16:45+0100\n"
+"POT-Creation-Date: 2017-12-02 11:12+0100\n"
"PO-Revision-Date: 2017-01-06 17:00+0000\n"
"Last-Translator: dalin \n"
"Language: zh_Hans_CN\n"
@@ -26,7 +26,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.1\n"
-#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1401
+#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1450
msgid "not installed"
msgstr "未安装"
@@ -80,378 +80,382 @@ msgstr ""
msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
msgstr ""
-#: cps/ub.py:577
+#: cps/ub.py:649
msgid "Guest"
msgstr "游客"
-#: cps/web.py:967
+#: cps/web.py:1016
msgid "Requesting update package"
msgstr "正在请求更新包"
-#: cps/web.py:968
+#: cps/web.py:1017
msgid "Downloading update package"
msgstr "正在下载更新包"
-#: cps/web.py:969
+#: cps/web.py:1018
msgid "Unzipping update package"
msgstr "正在解压更新包"
-#: cps/web.py:970
+#: cps/web.py:1019
msgid "Files are replaced"
msgstr "文件已替换"
-#: cps/web.py:971
+#: cps/web.py:1020
msgid "Database connections are closed"
msgstr "数据库连接已关闭"
-#: cps/web.py:972
+#: cps/web.py:1021
msgid "Server is stopped"
msgstr "服务器已停止"
-#: cps/web.py:973
+#: cps/web.py:1022
msgid "Update finished, please press okay and reload page"
msgstr "更新完成,请按确定并刷新页面"
-#: cps/web.py:1047
+#: cps/web.py:1096
msgid "Recently Added Books"
msgstr "最近添加的书籍"
-#: cps/web.py:1057
+#: cps/web.py:1106
msgid "Newest Books"
msgstr "最新书籍"
-#: cps/web.py:1069
+#: cps/web.py:1118
msgid "Oldest Books"
msgstr "最旧书籍"
-#: cps/web.py:1081
+#: cps/web.py:1130
msgid "Books (A-Z)"
msgstr "书籍 (A-Z)"
-#: cps/web.py:1092
+#: cps/web.py:1141
msgid "Books (Z-A)"
msgstr "书籍 (Z-A)"
-#: cps/web.py:1120
+#: cps/web.py:1169
msgid "Hot Books (most downloaded)"
msgstr "热门书籍(最多下载)"
-#: cps/web.py:1133
+#: cps/web.py:1182
msgid "Best rated books"
msgstr "最高评分书籍"
-#: cps/templates/index.xml:32 cps/web.py:1144
+#: cps/templates/index.xml:32 cps/web.py:1193
msgid "Random Books"
msgstr "随机书籍"
-#: cps/web.py:1158
+#: cps/web.py:1207
msgid "Author list"
msgstr "作者列表"
-#: cps/web.py:1170 cps/web.py:1228 cps/web.py:1358 cps/web.py:1827
+#: cps/web.py:1219 cps/web.py:1277 cps/web.py:1407 cps/web.py:1876
msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
-#: cps/templates/index.xml:64 cps/web.py:1212
+#: cps/templates/index.xml:64 cps/web.py:1261
msgid "Series list"
msgstr "丛书列表"
-#: cps/web.py:1226
+#: cps/web.py:1275
#, python-format
msgid "Series: %(serie)s"
msgstr "丛书: %(serie)s"
-#: cps/web.py:1259
+#: cps/web.py:1308
msgid "Available languages"
msgstr "可用语言"
-#: cps/web.py:1276
+#: cps/web.py:1325
#, python-format
msgid "Language: %(name)s"
msgstr "语言: %(name)s"
-#: cps/templates/index.xml:58 cps/web.py:1286
+#: cps/templates/index.xml:58 cps/web.py:1335
msgid "Category list"
msgstr "分类列表"
-#: cps/web.py:1300
+#: cps/web.py:1349
#, python-format
msgid "Category: %(name)s"
msgstr "分类: %(name)s"
-#: cps/web.py:1412
+#: cps/web.py:1461
msgid "Excecution permissions missing"
msgstr "可执行权限缺失"
-#: cps/web.py:1426
+#: cps/web.py:1475
msgid "Statistics"
msgstr "统计"
-#: cps/web.py:1591
+#: cps/web.py:1640
msgid "Server restarted, please reload page"
msgstr "服务器已重启,请刷新页面"
-#: cps/web.py:1593
+#: cps/web.py:1642
msgid "Performing shutdown of server, please close window"
msgstr "正在关闭服务器,请关闭窗口"
-#: cps/web.py:1609
+#: cps/web.py:1658
msgid "Update done"
msgstr "更新完成"
-#: cps/web.py:1691 cps/web.py:1704
+#: cps/web.py:1740 cps/web.py:1753
msgid "search"
msgstr "搜索"
#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:132 cps/web.py:1782
+#: cps/templates/layout.html:132 cps/web.py:1831
msgid "Read Books"
msgstr "已读书籍"
#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:134 cps/web.py:1785
+#: cps/templates/layout.html:134 cps/web.py:1834
msgid "Unread Books"
msgstr "未读书籍"
-#: cps/web.py:1860 cps/web.py:1862 cps/web.py:1864 cps/web.py:1873
+#: cps/web.py:1909 cps/web.py:1911 cps/web.py:1913 cps/web.py:1922
msgid "Read a Book"
msgstr "阅读一本书"
-#: cps/web.py:1925 cps/web.py:2556
+#: cps/web.py:1974 cps/web.py:2644
msgid "Please fill out all fields!"
msgstr "请填写所有字段"
-#: cps/web.py:1926 cps/web.py:1942 cps/web.py:1947 cps/web.py:1949
+#: cps/web.py:1975 cps/web.py:1992 cps/web.py:1997 cps/web.py:1999
msgid "register"
msgstr "注册"
-#: cps/web.py:1941
+#: cps/web.py:1991
msgid "An unknown error occured. Please try again later."
msgstr "发生一个未知错误。请稍后再试。"
-#: cps/web.py:1946
+#: cps/web.py:1996
msgid "This username or email address is already in use."
msgstr "此用户名或邮箱已被使用。"
-#: cps/web.py:1965 cps/web.py:2061
+#: cps/web.py:2015 cps/web.py:2111
#, python-format
msgid "you are now logged in as: '%(nickname)s'"
msgstr "您现在已以'%(nickname)s'身份登录"
-#: cps/web.py:1970
+#: cps/web.py:2020
msgid "Wrong Username or Password"
msgstr "用户名或密码错误"
-#: cps/web.py:1976 cps/web.py:1997
+#: cps/web.py:2026 cps/web.py:2047
msgid "login"
msgstr "登录"
-#: cps/web.py:2009 cps/web.py:2040
+#: cps/web.py:2059 cps/web.py:2090
msgid "Token not found"
msgstr "找不到Token"
-#: cps/web.py:2017 cps/web.py:2048
+#: cps/web.py:2067 cps/web.py:2098
msgid "Token has expired"
msgstr "Token已过期"
-#: cps/web.py:2025
+#: cps/web.py:2075
msgid "Success! Please return to your device"
msgstr "成功!请返回您的设备"
-#: cps/web.py:2075
+#: cps/web.py:2125
msgid "Please configure the SMTP mail settings first..."
msgstr "请先配置SMTP邮箱..."
-#: cps/web.py:2079
+#: cps/web.py:2129
#, python-format
msgid "Book successfully send to %(kindlemail)s"
msgstr "此书已被成功发给 %(kindlemail)s"
-#: cps/web.py:2083
+#: cps/web.py:2133
#, python-format
msgid "There was an error sending this book: %(res)s"
msgstr "发送这本书的时候出现错误: %(res)s"
-#: cps/web.py:2085 cps/web.py:2641
+#: cps/web.py:2135 cps/web.py:2730
msgid "Please configure your kindle email address first..."
msgstr "请先配置您的kindle电子邮箱地址..."
-#: cps/web.py:2129
+#: cps/web.py:2179
#, python-format
msgid "Book has been added to shelf: %(sname)s"
msgstr "此书已被添加到书架: %(sname)s"
-#: cps/web.py:2166
+#: cps/web.py:2216
#, python-format
msgid "Book has been removed from shelf: %(sname)s"
msgstr "此书已从书架 %(sname)s 中删除"
-#: cps/web.py:2185 cps/web.py:2209
+#: cps/web.py:2235 cps/web.py:2259
#, python-format
msgid "A shelf with the name '%(title)s' already exists."
msgstr "已存在书架 '%(title)s'。"
-#: cps/web.py:2190
+#: cps/web.py:2240
#, python-format
msgid "Shelf %(title)s created"
msgstr "书架 %(title)s 已被创建"
-#: cps/web.py:2192 cps/web.py:2220
+#: cps/web.py:2242 cps/web.py:2270
msgid "There was an error"
msgstr "发生错误"
-#: cps/web.py:2193 cps/web.py:2195
+#: cps/web.py:2243 cps/web.py:2245
msgid "create a shelf"
msgstr "创建书架"
-#: cps/web.py:2218
+#: cps/web.py:2268
#, python-format
msgid "Shelf %(title)s changed"
msgstr "书架 %(title)s 已被修改"
-#: cps/web.py:2221 cps/web.py:2223
+#: cps/web.py:2271 cps/web.py:2273
msgid "Edit a shelf"
msgstr "编辑书架"
-#: cps/web.py:2244
+#: cps/web.py:2294
#, python-format
msgid "successfully deleted shelf %(name)s"
msgstr "成功删除书架 %(name)s"
-#: cps/web.py:2266
+#: cps/web.py:2316
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "书架: '%(name)s'"
-#: cps/web.py:2269
+#: cps/web.py:2319
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "打开书架出错。书架不存在或不可访问"
-#: cps/web.py:2300
+#: cps/web.py:2350
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "修改书架 '%(name)s' 顺序"
-#: cps/web.py:2369
+#: cps/web.py:2419
msgid "Found an existing account for this email address."
msgstr "找到已使用此邮箱的账号。"
-#: cps/web.py:2371 cps/web.py:2375
+#: cps/web.py:2421 cps/web.py:2425
#, python-format
msgid "%(name)s's profile"
msgstr "%(name)s 的资料"
-#: cps/web.py:2372
+#: cps/web.py:2422
msgid "Profile updated"
msgstr "资料已更新"
-#: cps/web.py:2386
+#: cps/web.py:2436
msgid "Admin page"
msgstr "管理页"
-#: cps/web.py:2510
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web配置已更新"
+#: cps/web.py:2583
+msgid "Logfile location is not valid, please enter correct path"
+msgstr ""
-#: cps/web.py:2517 cps/web.py:2523 cps/web.py:2537
+#: cps/web.py:2586 cps/web.py:2605 cps/web.py:2611 cps/web.py:2625
msgid "Basic Configuration"
msgstr "基本配置"
-#: cps/web.py:2521
+#: cps/web.py:2598
+msgid "Calibre-web configuration updated"
+msgstr "Calibre-web配置已更新"
+
+#: cps/web.py:2609
msgid "DB location is not valid, please enter correct path"
msgstr "DB位置无效,请输入正确路径"
-#: cps/templates/admin.html:34 cps/web.py:2558 cps/web.py:2611
+#: cps/templates/admin.html:34 cps/web.py:2646 cps/web.py:2700
msgid "Add new user"
msgstr "添加新用户"
-#: cps/web.py:2603
+#: cps/web.py:2691
#, python-format
msgid "User '%(user)s' created"
msgstr "用户 '%(user)s' 已被创建"
-#: cps/web.py:2607
+#: cps/web.py:2695
msgid "Found an existing account for this email address or nickname."
msgstr "已存在使用此邮箱或昵称的账号。"
-#: cps/web.py:2629
+#: cps/web.py:2718
msgid "Mail settings updated"
msgstr "邮箱设置已更新"
-#: cps/web.py:2636
+#: cps/web.py:2725
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "测试邮件已成功发送到 %(kindlemail)s"
-#: cps/web.py:2639
+#: cps/web.py:2728
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "发送测试邮件时发生错误: %(res)s"
-#: cps/web.py:2643
+#: cps/web.py:2732
msgid "E-Mail settings updated"
msgstr "E-Mail 设置已更新"
-#: cps/web.py:2644
+#: cps/web.py:2733
msgid "Edit mail settings"
msgstr "编辑邮箱设置"
-#: cps/web.py:2673
+#: cps/web.py:2762
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "用户 '%(nick)s' 已被删除"
-#: cps/web.py:2781
+#: cps/web.py:2870
#, python-format
msgid "User '%(nick)s' updated"
msgstr "用户 '%(nick)s' 已被更新"
-#: cps/web.py:2784
+#: cps/web.py:2873
msgid "An unknown error occured."
msgstr "发生未知错误。"
-#: cps/web.py:2787
+#: cps/web.py:2876
#, python-format
msgid "Edit User %(nick)s"
msgstr "编辑用户 %(nick)s"
-#: cps/web.py:2803
+#: cps/web.py:2892
msgid "Error opening eBook. File does not exist or file is not accessible"
msgstr "打开电子书出错。文件不存在或不可访问"
-#: cps/web.py:2818 cps/web.py:3026 cps/web.py:3031 cps/web.py:3174
+#: cps/web.py:2907 cps/web.py:3115 cps/web.py:3120 cps/web.py:3263
msgid "edit metadata"
msgstr "编辑元数据"
-#: cps/web.py:2828 cps/web.py:3068
+#: cps/web.py:2917 cps/web.py:3157
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr "不能上传后缀为 \"%s\" 的文件到此服务器"
-#: cps/web.py:2839
+#: cps/web.py:2928
#, python-format
msgid "Failed to store file %s."
msgstr ""
-#: cps/web.py:2861 cps/web.py:2865
+#: cps/web.py:2950 cps/web.py:2954
msgid "unknown"
msgstr "未知"
-#: cps/web.py:3074
+#: cps/web.py:3163
msgid "File to be uploaded must have an extension"
msgstr "要上传的文件必须有一个后缀"
-#: cps/web.py:3093
+#: cps/web.py:3182
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr "创建路径 %s 失败(权限拒绝)。"
-#: cps/web.py:3098
+#: cps/web.py:3187
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr "存储文件 %s 失败(权限拒绝)。"
-#: cps/web.py:3103
+#: cps/web.py:3192
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "删除文件 %s 失败(权限拒绝)。"
@@ -608,7 +612,7 @@ msgstr "确定"
#: cps/templates/admin.html:105 cps/templates/admin.html:119
#: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:156 cps/templates/email_edit.html:36
+#: cps/templates/config_edit.html:211 cps/templates/email_edit.html:36
#: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:139
msgid "Back"
@@ -701,7 +705,7 @@ msgstr "编辑后查看书籍"
msgid "Get metadata"
msgstr "获取元数据"
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:154
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:209
#: cps/templates/login.html:20 cps/templates/search_form.html:79
#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:137
msgid "Submit"
@@ -817,71 +821,123 @@ msgstr "标题排序的正则表达式"
msgid "Tags for Mature Content"
msgstr ""
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:92
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr ""
+
+#: cps/templates/config_edit.html:98
msgid "Enable uploading"
msgstr "启用上传"
-#: cps/templates/config_edit.html:97
+#: cps/templates/config_edit.html:102
msgid "Enable anonymous browsing"
msgstr "启用匿名浏览"
-#: cps/templates/config_edit.html:101
+#: cps/templates/config_edit.html:106
msgid "Enable public registration"
msgstr "启用注册"
-#: cps/templates/config_edit.html:105
+#: cps/templates/config_edit.html:110
msgid "Enable remote login (\"magic link\")"
msgstr "启用远程登录 (\"魔法链接\")"
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:115
msgid "Use"
msgstr ""
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:116
msgid "Obtain an API Key"
msgstr ""
-#: cps/templates/config_edit.html:115
+#: cps/templates/config_edit.html:120
msgid "Goodreads API Key"
msgstr ""
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:124
msgid "Goodreads API Secret"
msgstr ""
-#: cps/templates/config_edit.html:125
+#: cps/templates/config_edit.html:129
msgid "Default Settings for new users"
msgstr "新用户默认设置"
-#: cps/templates/config_edit.html:128 cps/templates/user_edit.html:94
+#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:94
msgid "Admin user"
msgstr "管理用户"
-#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:103
+#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:103
msgid "Allow Downloads"
msgstr "允许下载"
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:107
+#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:107
msgid "Allow Uploads"
msgstr "允许上传"
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:111
msgid "Allow Edit"
msgstr "允许编辑"
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:115
msgid "Allow Delete books"
msgstr "允许删除书籍"
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:120
+#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:120
msgid "Allow Changing Password"
msgstr "允许修改密码"
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:124
+#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:124
msgid "Allow Editing Public Shelfs"
msgstr "允许编辑公共书架"
-#: cps/templates/config_edit.html:159 cps/templates/layout.html:76
+#: cps/templates/config_edit.html:160
+msgid "Default visiblities for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:164 cps/templates/user_edit.html:46
+msgid "Show random books"
+msgstr "显示随机书籍"
+
+#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:50
+msgid "Show recent books"
+msgstr ""
+
+#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:54
+msgid "Show sorted books"
+msgstr ""
+
+#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:58
+msgid "Show hot books"
+msgstr "显示热门书籍"
+
+#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:62
+msgid "Show best rated books"
+msgstr "显示最高评分书籍"
+
+#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:66
+msgid "Show language selection"
+msgstr "显示语言选择"
+
+#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:70
+msgid "Show series selection"
+msgstr "显示丛书选择"
+
+#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:74
+msgid "Show category selection"
+msgstr "显示分类选择"
+
+#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:78
+msgid "Show author selection"
+msgstr "显示作者选择"
+
+#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:82
+msgid "Show read and unread"
+msgstr "显示已读和未读"
+
+#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:86
+msgid "Show random books in detail view"
+msgstr "在详情页显示随机书籍"
+
+#: cps/templates/config_edit.html:214 cps/templates/layout.html:76
#: cps/templates/login.html:4
msgid "Login"
msgstr "登录"
@@ -1011,6 +1067,22 @@ msgstr "书籍按分类排序"
msgid "Books ordered by series"
msgstr "书籍按丛书排序"
+#: cps/templates/index.xml:70 cps/templates/layout.html:152
+msgid "Public Shelves"
+msgstr "公开书架"
+
+#: cps/templates/index.xml:73
+msgid "Books organized in public shelfs, visible to everyone"
+msgstr ""
+
+#: cps/templates/index.xml:77 cps/templates/layout.html:156
+msgid "Your Shelves"
+msgstr "您的书架"
+
+#: cps/templates/index.xml:80
+msgid "User's own shelfs, only visible to the current user himself"
+msgstr ""
+
#: cps/templates/layout.html:30
msgid "Toggle navigation"
msgstr "切换导航"
@@ -1072,14 +1144,6 @@ msgstr "分类"
msgid "Languages"
msgstr "语言"
-#: cps/templates/layout.html:152
-msgid "Public Shelves"
-msgstr "公开书架"
-
-#: cps/templates/layout.html:156
-msgid "Your Shelves"
-msgstr "您的书架"
-
#: cps/templates/layout.html:161
msgid "Create a Shelf"
msgstr "创建书架"
@@ -1262,50 +1326,6 @@ msgstr "按语言显示书籍"
msgid "Show all"
msgstr "显示全部"
-#: cps/templates/user_edit.html:46
-msgid "Show random books"
-msgstr "显示随机书籍"
-
-#: cps/templates/user_edit.html:50
-msgid "Show recent books"
-msgstr ""
-
-#: cps/templates/user_edit.html:54
-msgid "Show sorted books"
-msgstr ""
-
-#: cps/templates/user_edit.html:58
-msgid "Show hot books"
-msgstr "显示热门书籍"
-
-#: cps/templates/user_edit.html:62
-msgid "Show best rated books"
-msgstr "显示最高评分书籍"
-
-#: cps/templates/user_edit.html:66
-msgid "Show language selection"
-msgstr "显示语言选择"
-
-#: cps/templates/user_edit.html:70
-msgid "Show series selection"
-msgstr "显示丛书选择"
-
-#: cps/templates/user_edit.html:74
-msgid "Show category selection"
-msgstr "显示分类选择"
-
-#: cps/templates/user_edit.html:78
-msgid "Show author selection"
-msgstr "显示作者选择"
-
-#: cps/templates/user_edit.html:82
-msgid "Show read and unread"
-msgstr "显示已读和未读"
-
-#: cps/templates/user_edit.html:86
-msgid "Show random books in detail view"
-msgstr "在详情页显示随机书籍"
-
#: cps/templates/user_edit.html:98
msgid "Show mature content"
msgstr ""
diff --git a/cps/ub.py b/cps/ub.py
index b76ace02..0d0f78e0 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -14,9 +14,9 @@ from flask_babel import gettext as _
import json
import datetime
from binascii import hexlify
+import cli
-dbpath = os.path.join(os.path.normpath(os.getenv("CALIBRE_DBPATH", os.path.dirname(os.path.realpath(__file__)) + os.sep + ".." + os.sep)), "app.db")
-engine = create_engine('sqlite:///{0}'.format(dbpath), echo=False)
+engine = create_engine('sqlite:///{0}'.format(cli.settingspath), echo=False)
Base = declarative_base()
ROLE_USER = 0
@@ -294,6 +294,7 @@ class Settings(Base):
config_goodreads_api_key = Column(String)
config_goodreads_api_secret = Column(String)
config_mature_content_tags = Column(String) # type: str
+ config_logfile = Column(String)
def __repr__(self):
pass
@@ -322,6 +323,7 @@ class Config:
self.config_main_dir = os.path.join(os.path.normpath(os.path.dirname(
os.path.realpath(__file__)) + os.sep + ".." + os.sep))
self.db_configured = None
+ self.config_logfile = None
self.loadSettings()
def loadSettings(self):
@@ -356,11 +358,22 @@ class Config:
self.config_goodreads_api_key = data.config_goodreads_api_key
self.config_goodreads_api_secret = data.config_goodreads_api_secret
self.config_mature_content_tags = data.config_mature_content_tags
+ if data.config_logfile:
+ self.config_logfile = data.config_logfile
@property
def get_main_dir(self):
return self.config_main_dir
+ def get_config_logfile(self):
+ if not self.config_logfile:
+ return os.path.join(self.get_main_dir, "calibre-web.log")
+ else:
+ if os.path.dirname(self.config_logfile):
+ return self.config_logfile
+ else:
+ return os.path.join(self.get_main_dir, self.config_logfile)
+
def role_admin(self):
if self.config_default_role is not None:
return True if self.config_default_role & ROLE_ADMIN == ROLE_ADMIN else False
@@ -584,6 +597,13 @@ def migrate_Database():
conn = engine.connect()
conn.execute("ALTER TABLE Settings ADD column `config_default_show` SmallInteger DEFAULT 2047")
session.commit()
+ try:
+ session.query(exists().where(Settings.config_logfile)).scalar()
+ session.commit()
+ except exc.OperationalError: # Database is not compatible, some rows are missing
+ conn = engine.connect()
+ conn.execute("ALTER TABLE Settings ADD column `config_logfile` String DEFAULT ''")
+ session.commit()
def clean_database():
@@ -662,7 +682,7 @@ Session.configure(bind=engine)
session = Session()
# generate database and admin and guest user, if no database is existing
-if not os.path.exists(dbpath):
+if not os.path.exists(cli.settingspath):
try:
Base.metadata.create_all(engine)
create_default_config()
diff --git a/cps/web.py b/cps/web.py
index f3c55109..da7f6f61 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -222,7 +222,7 @@ gevent_server = None
formatter = logging.Formatter(
"[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s - %(message)s")
-file_handler = RotatingFileHandler(os.path.join(config.get_main_dir, "calibre-web.log"), maxBytes=50000, backupCount=2)
+file_handler = RotatingFileHandler(config.get_config_logfile(), maxBytes=50000, backupCount=2)
file_handler.setFormatter(formatter)
app.logger.addHandler(file_handler)
app.logger.setLevel(config.config_log_level)
@@ -2573,7 +2573,20 @@ def configuration_helper(origin):
content.config_default_show = content.config_default_show + ub.SIDEBAR_RECENT
if "show_sorted" in to_save:
content.config_default_show = content.config_default_show + ub.SIDEBAR_SORTED
-
+ if content.config_logfile != to_save["config_logfile"]:
+ # check valid path, only path or file
+ if os.path.dirname(to_save["config_logfile"]):
+ if os.path.exists(os.path.dirname(to_save["config_log_level"])):
+ content.config_logfile = to_save["config_logfile"]
+ else:
+ ub.session.commit()
+ flash(_(u'Logfile location is not valid, please enter correct path'), category="error")
+ return render_title_template("config_edit.html", content=config, origin=origin,
+ gdrive=gdrive_support,
+ goodreads=goodreads_support, title=_(u"Basic Configuration"))
+ else:
+ content.config_logfile = to_save["config_logfile"]
+ reboot_required = True
try:
if content.config_use_google_drive and is_gdrive_ready() and not os.path.exists(config.config_calibre_dir + "/metadata.db"):
gdriveutils.downloadFile(Gdrive.Instance().drive, None, "metadata.db", config.config_calibre_dir + "/metadata.db")
diff --git a/messages.pot b/messages.pot
index 27f35ad0..a2cfa7a8 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: 2017-11-30 16:45+0100\n"
+"POT-Creation-Date: 2017-12-02 11:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.1\n"
-#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1401
+#: cps/book_formats.py:119 cps/book_formats.py:123 cps/web.py:1450
msgid "not installed"
msgstr ""
@@ -71,378 +71,382 @@ msgstr ""
msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
msgstr ""
-#: cps/ub.py:577
+#: cps/ub.py:649
msgid "Guest"
msgstr ""
-#: cps/web.py:967
+#: cps/web.py:1016
msgid "Requesting update package"
msgstr ""
-#: cps/web.py:968
+#: cps/web.py:1017
msgid "Downloading update package"
msgstr ""
-#: cps/web.py:969
+#: cps/web.py:1018
msgid "Unzipping update package"
msgstr ""
-#: cps/web.py:970
+#: cps/web.py:1019
msgid "Files are replaced"
msgstr ""
-#: cps/web.py:971
+#: cps/web.py:1020
msgid "Database connections are closed"
msgstr ""
-#: cps/web.py:972
+#: cps/web.py:1021
msgid "Server is stopped"
msgstr ""
-#: cps/web.py:973
+#: cps/web.py:1022
msgid "Update finished, please press okay and reload page"
msgstr ""
-#: cps/web.py:1047
+#: cps/web.py:1096
msgid "Recently Added Books"
msgstr ""
-#: cps/web.py:1057
+#: cps/web.py:1106
msgid "Newest Books"
msgstr ""
-#: cps/web.py:1069
+#: cps/web.py:1118
msgid "Oldest Books"
msgstr ""
-#: cps/web.py:1081
+#: cps/web.py:1130
msgid "Books (A-Z)"
msgstr ""
-#: cps/web.py:1092
+#: cps/web.py:1141
msgid "Books (Z-A)"
msgstr ""
-#: cps/web.py:1120
+#: cps/web.py:1169
msgid "Hot Books (most downloaded)"
msgstr ""
-#: cps/web.py:1133
+#: cps/web.py:1182
msgid "Best rated books"
msgstr ""
-#: cps/templates/index.xml:32 cps/web.py:1144
+#: cps/templates/index.xml:32 cps/web.py:1193
msgid "Random Books"
msgstr ""
-#: cps/web.py:1158
+#: cps/web.py:1207
msgid "Author list"
msgstr ""
-#: cps/web.py:1170 cps/web.py:1228 cps/web.py:1358 cps/web.py:1827
+#: cps/web.py:1219 cps/web.py:1277 cps/web.py:1407 cps/web.py:1876
msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr ""
-#: cps/templates/index.xml:64 cps/web.py:1212
+#: cps/templates/index.xml:64 cps/web.py:1261
msgid "Series list"
msgstr ""
-#: cps/web.py:1226
+#: cps/web.py:1275
#, python-format
msgid "Series: %(serie)s"
msgstr ""
-#: cps/web.py:1259
+#: cps/web.py:1308
msgid "Available languages"
msgstr ""
-#: cps/web.py:1276
+#: cps/web.py:1325
#, python-format
msgid "Language: %(name)s"
msgstr ""
-#: cps/templates/index.xml:58 cps/web.py:1286
+#: cps/templates/index.xml:58 cps/web.py:1335
msgid "Category list"
msgstr ""
-#: cps/web.py:1300
+#: cps/web.py:1349
#, python-format
msgid "Category: %(name)s"
msgstr ""
-#: cps/web.py:1412
+#: cps/web.py:1461
msgid "Excecution permissions missing"
msgstr ""
-#: cps/web.py:1426
+#: cps/web.py:1475
msgid "Statistics"
msgstr ""
-#: cps/web.py:1591
+#: cps/web.py:1640
msgid "Server restarted, please reload page"
msgstr ""
-#: cps/web.py:1593
+#: cps/web.py:1642
msgid "Performing shutdown of server, please close window"
msgstr ""
-#: cps/web.py:1609
+#: cps/web.py:1658
msgid "Update done"
msgstr ""
-#: cps/web.py:1691 cps/web.py:1704
+#: cps/web.py:1740 cps/web.py:1753
msgid "search"
msgstr ""
#: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:132 cps/web.py:1782
+#: cps/templates/layout.html:132 cps/web.py:1831
msgid "Read Books"
msgstr ""
#: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:134 cps/web.py:1785
+#: cps/templates/layout.html:134 cps/web.py:1834
msgid "Unread Books"
msgstr ""
-#: cps/web.py:1860 cps/web.py:1862 cps/web.py:1864 cps/web.py:1873
+#: cps/web.py:1909 cps/web.py:1911 cps/web.py:1913 cps/web.py:1922
msgid "Read a Book"
msgstr ""
-#: cps/web.py:1925 cps/web.py:2556
+#: cps/web.py:1974 cps/web.py:2644
msgid "Please fill out all fields!"
msgstr ""
-#: cps/web.py:1926 cps/web.py:1942 cps/web.py:1947 cps/web.py:1949
+#: cps/web.py:1975 cps/web.py:1992 cps/web.py:1997 cps/web.py:1999
msgid "register"
msgstr ""
-#: cps/web.py:1941
+#: cps/web.py:1991
msgid "An unknown error occured. Please try again later."
msgstr ""
-#: cps/web.py:1946
+#: cps/web.py:1996
msgid "This username or email address is already in use."
msgstr ""
-#: cps/web.py:1965 cps/web.py:2061
+#: cps/web.py:2015 cps/web.py:2111
#, python-format
msgid "you are now logged in as: '%(nickname)s'"
msgstr ""
-#: cps/web.py:1970
+#: cps/web.py:2020
msgid "Wrong Username or Password"
msgstr ""
-#: cps/web.py:1976 cps/web.py:1997
+#: cps/web.py:2026 cps/web.py:2047
msgid "login"
msgstr ""
-#: cps/web.py:2009 cps/web.py:2040
+#: cps/web.py:2059 cps/web.py:2090
msgid "Token not found"
msgstr ""
-#: cps/web.py:2017 cps/web.py:2048
+#: cps/web.py:2067 cps/web.py:2098
msgid "Token has expired"
msgstr ""
-#: cps/web.py:2025
+#: cps/web.py:2075
msgid "Success! Please return to your device"
msgstr ""
-#: cps/web.py:2075
+#: cps/web.py:2125
msgid "Please configure the SMTP mail settings first..."
msgstr ""
-#: cps/web.py:2079
-#, python-format
-msgid "Book successfully send to %(kindlemail)s"
-msgstr ""
-
-#: cps/web.py:2083
-#, python-format
-msgid "There was an error sending this book: %(res)s"
-msgstr ""
-
-#: cps/web.py:2085 cps/web.py:2641
-msgid "Please configure your kindle email address first..."
-msgstr ""
-
#: cps/web.py:2129
#, python-format
+msgid "Book successfully send to %(kindlemail)s"
+msgstr ""
+
+#: cps/web.py:2133
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr ""
+
+#: cps/web.py:2135 cps/web.py:2730
+msgid "Please configure your kindle email address first..."
+msgstr ""
+
+#: cps/web.py:2179
+#, python-format
msgid "Book has been added to shelf: %(sname)s"
msgstr ""
-#: cps/web.py:2166
+#: cps/web.py:2216
#, python-format
msgid "Book has been removed from shelf: %(sname)s"
msgstr ""
-#: cps/web.py:2185 cps/web.py:2209
+#: cps/web.py:2235 cps/web.py:2259
#, python-format
msgid "A shelf with the name '%(title)s' already exists."
msgstr ""
-#: cps/web.py:2190
+#: cps/web.py:2240
#, python-format
msgid "Shelf %(title)s created"
msgstr ""
-#: cps/web.py:2192 cps/web.py:2220
+#: cps/web.py:2242 cps/web.py:2270
msgid "There was an error"
msgstr ""
-#: cps/web.py:2193 cps/web.py:2195
+#: cps/web.py:2243 cps/web.py:2245
msgid "create a shelf"
msgstr ""
-#: cps/web.py:2218
+#: cps/web.py:2268
#, python-format
msgid "Shelf %(title)s changed"
msgstr ""
-#: cps/web.py:2221 cps/web.py:2223
+#: cps/web.py:2271 cps/web.py:2273
msgid "Edit a shelf"
msgstr ""
-#: cps/web.py:2244
+#: cps/web.py:2294
#, python-format
msgid "successfully deleted shelf %(name)s"
msgstr ""
-#: cps/web.py:2266
+#: cps/web.py:2316
#, python-format
msgid "Shelf: '%(name)s'"
msgstr ""
-#: cps/web.py:2269
+#: cps/web.py:2319
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr ""
-#: cps/web.py:2300
+#: cps/web.py:2350
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr ""
-#: cps/web.py:2369
+#: cps/web.py:2419
msgid "Found an existing account for this email address."
msgstr ""
-#: cps/web.py:2371 cps/web.py:2375
+#: cps/web.py:2421 cps/web.py:2425
#, python-format
msgid "%(name)s's profile"
msgstr ""
-#: cps/web.py:2372
+#: cps/web.py:2422
msgid "Profile updated"
msgstr ""
-#: cps/web.py:2386
+#: cps/web.py:2436
msgid "Admin page"
msgstr ""
-#: cps/web.py:2510
-msgid "Calibre-web configuration updated"
+#: cps/web.py:2583
+msgid "Logfile location is not valid, please enter correct path"
msgstr ""
-#: cps/web.py:2517 cps/web.py:2523 cps/web.py:2537
+#: cps/web.py:2586 cps/web.py:2605 cps/web.py:2611 cps/web.py:2625
msgid "Basic Configuration"
msgstr ""
-#: cps/web.py:2521
+#: cps/web.py:2598
+msgid "Calibre-web configuration updated"
+msgstr ""
+
+#: cps/web.py:2609
msgid "DB location is not valid, please enter correct path"
msgstr ""
-#: cps/templates/admin.html:34 cps/web.py:2558 cps/web.py:2611
+#: cps/templates/admin.html:34 cps/web.py:2646 cps/web.py:2700
msgid "Add new user"
msgstr ""
-#: cps/web.py:2603
+#: cps/web.py:2691
#, python-format
msgid "User '%(user)s' created"
msgstr ""
-#: cps/web.py:2607
+#: cps/web.py:2695
msgid "Found an existing account for this email address or nickname."
msgstr ""
-#: cps/web.py:2629
+#: cps/web.py:2718
msgid "Mail settings updated"
msgstr ""
-#: cps/web.py:2636
+#: cps/web.py:2725
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr ""
-#: cps/web.py:2639
+#: cps/web.py:2728
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr ""
-#: cps/web.py:2643
+#: cps/web.py:2732
msgid "E-Mail settings updated"
msgstr ""
-#: cps/web.py:2644
+#: cps/web.py:2733
msgid "Edit mail settings"
msgstr ""
-#: cps/web.py:2673
+#: cps/web.py:2762
#, python-format
msgid "User '%(nick)s' deleted"
msgstr ""
-#: cps/web.py:2781
+#: cps/web.py:2870
#, python-format
msgid "User '%(nick)s' updated"
msgstr ""
-#: cps/web.py:2784
+#: cps/web.py:2873
msgid "An unknown error occured."
msgstr ""
-#: cps/web.py:2787
+#: cps/web.py:2876
#, python-format
msgid "Edit User %(nick)s"
msgstr ""
-#: cps/web.py:2803
+#: cps/web.py:2892
msgid "Error opening eBook. File does not exist or file is not accessible"
msgstr ""
-#: cps/web.py:2818 cps/web.py:3026 cps/web.py:3031 cps/web.py:3174
+#: cps/web.py:2907 cps/web.py:3115 cps/web.py:3120 cps/web.py:3263
msgid "edit metadata"
msgstr ""
-#: cps/web.py:2828 cps/web.py:3068
+#: cps/web.py:2917 cps/web.py:3157
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr ""
-#: cps/web.py:2839
+#: cps/web.py:2928
#, python-format
msgid "Failed to store file %s."
msgstr ""
-#: cps/web.py:2861 cps/web.py:2865
+#: cps/web.py:2950 cps/web.py:2954
msgid "unknown"
msgstr ""
-#: cps/web.py:3074
+#: cps/web.py:3163
msgid "File to be uploaded must have an extension"
msgstr ""
-#: cps/web.py:3093
+#: cps/web.py:3182
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr ""
-#: cps/web.py:3098
+#: cps/web.py:3187
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr ""
-#: cps/web.py:3103
+#: cps/web.py:3192
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr ""
@@ -599,7 +603,7 @@ msgstr ""
#: cps/templates/admin.html:105 cps/templates/admin.html:119
#: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:156 cps/templates/email_edit.html:36
+#: cps/templates/config_edit.html:211 cps/templates/email_edit.html:36
#: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:139
msgid "Back"
@@ -692,7 +696,7 @@ msgstr ""
msgid "Get metadata"
msgstr ""
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:154
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:209
#: cps/templates/login.html:20 cps/templates/search_form.html:79
#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:137
msgid "Submit"
@@ -808,71 +812,123 @@ msgstr ""
msgid "Tags for Mature Content"
msgstr ""
-#: cps/templates/config_edit.html:93
+#: cps/templates/config_edit.html:92
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr ""
+
+#: cps/templates/config_edit.html:98
msgid "Enable uploading"
msgstr ""
-#: cps/templates/config_edit.html:97
+#: cps/templates/config_edit.html:102
msgid "Enable anonymous browsing"
msgstr ""
-#: cps/templates/config_edit.html:101
+#: cps/templates/config_edit.html:106
msgid "Enable public registration"
msgstr ""
-#: cps/templates/config_edit.html:105
+#: cps/templates/config_edit.html:110
msgid "Enable remote login (\"magic link\")"
msgstr ""
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:115
msgid "Use"
msgstr ""
-#: cps/templates/config_edit.html:111
+#: cps/templates/config_edit.html:116
msgid "Obtain an API Key"
msgstr ""
-#: cps/templates/config_edit.html:115
+#: cps/templates/config_edit.html:120
msgid "Goodreads API Key"
msgstr ""
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:124
msgid "Goodreads API Secret"
msgstr ""
-#: cps/templates/config_edit.html:125
+#: cps/templates/config_edit.html:129
msgid "Default Settings for new users"
msgstr ""
-#: cps/templates/config_edit.html:128 cps/templates/user_edit.html:94
+#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:94
msgid "Admin user"
msgstr ""
-#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:103
+#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:103
msgid "Allow Downloads"
msgstr ""
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:107
+#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:107
msgid "Allow Uploads"
msgstr ""
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:111
msgid "Allow Edit"
msgstr ""
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:115
msgid "Allow Delete books"
msgstr ""
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:120
+#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:120
msgid "Allow Changing Password"
msgstr ""
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:124
+#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:124
msgid "Allow Editing Public Shelfs"
msgstr ""
-#: cps/templates/config_edit.html:159 cps/templates/layout.html:76
+#: cps/templates/config_edit.html:160
+msgid "Default visiblities for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:164 cps/templates/user_edit.html:46
+msgid "Show random books"
+msgstr ""
+
+#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:50
+msgid "Show recent books"
+msgstr ""
+
+#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:54
+msgid "Show sorted books"
+msgstr ""
+
+#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:58
+msgid "Show hot books"
+msgstr ""
+
+#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:62
+msgid "Show best rated books"
+msgstr ""
+
+#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:66
+msgid "Show language selection"
+msgstr ""
+
+#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:70
+msgid "Show series selection"
+msgstr ""
+
+#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:74
+msgid "Show category selection"
+msgstr ""
+
+#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:78
+msgid "Show author selection"
+msgstr ""
+
+#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:82
+msgid "Show read and unread"
+msgstr ""
+
+#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:86
+msgid "Show random books in detail view"
+msgstr ""
+
+#: cps/templates/config_edit.html:214 cps/templates/layout.html:76
#: cps/templates/login.html:4
msgid "Login"
msgstr ""
@@ -1002,6 +1058,22 @@ msgstr ""
msgid "Books ordered by series"
msgstr ""
+#: cps/templates/index.xml:70 cps/templates/layout.html:152
+msgid "Public Shelves"
+msgstr ""
+
+#: cps/templates/index.xml:73
+msgid "Books organized in public shelfs, visible to everyone"
+msgstr ""
+
+#: cps/templates/index.xml:77 cps/templates/layout.html:156
+msgid "Your Shelves"
+msgstr ""
+
+#: cps/templates/index.xml:80
+msgid "User's own shelfs, only visible to the current user himself"
+msgstr ""
+
#: cps/templates/layout.html:30
msgid "Toggle navigation"
msgstr ""
@@ -1063,14 +1135,6 @@ msgstr ""
msgid "Languages"
msgstr ""
-#: cps/templates/layout.html:152
-msgid "Public Shelves"
-msgstr ""
-
-#: cps/templates/layout.html:156
-msgid "Your Shelves"
-msgstr ""
-
#: cps/templates/layout.html:161
msgid "Create a Shelf"
msgstr ""
@@ -1253,50 +1317,6 @@ msgstr ""
msgid "Show all"
msgstr ""
-#: cps/templates/user_edit.html:46
-msgid "Show random books"
-msgstr ""
-
-#: cps/templates/user_edit.html:50
-msgid "Show recent books"
-msgstr ""
-
-#: cps/templates/user_edit.html:54
-msgid "Show sorted books"
-msgstr ""
-
-#: cps/templates/user_edit.html:58
-msgid "Show hot books"
-msgstr ""
-
-#: cps/templates/user_edit.html:62
-msgid "Show best rated books"
-msgstr ""
-
-#: cps/templates/user_edit.html:66
-msgid "Show language selection"
-msgstr ""
-
-#: cps/templates/user_edit.html:70
-msgid "Show series selection"
-msgstr ""
-
-#: cps/templates/user_edit.html:74
-msgid "Show category selection"
-msgstr ""
-
-#: cps/templates/user_edit.html:78
-msgid "Show author selection"
-msgstr ""
-
-#: cps/templates/user_edit.html:82
-msgid "Show read and unread"
-msgstr ""
-
-#: cps/templates/user_edit.html:86
-msgid "Show random books in detail view"
-msgstr ""
-
#: cps/templates/user_edit.html:98
msgid "Show mature content"
msgstr ""
diff --git a/readme.md b/readme.md
index 0b228086..c1e35e5c 100755
--- a/readme.md
+++ b/readme.md
@@ -46,7 +46,7 @@ Calibre Web is a web app providing a clean interface for browsing, reading and d
The configuration can be changed as admin in the admin panel under "Configuration"
Server Port:
-Changes the port calibre-web is listening, changes take effect after pressing submit button
+Changes the port Calibre-Web is listening, changes take effect after pressing submit button
Enable public registration:
Tick to enable public user registration.
@@ -70,7 +70,7 @@ Optionally, to enable on-the-fly conversion from EPUB to MOBI when using the sen
## Using Google Drive integration
-Additional optional dependencys are necessary to get this work. Please install all optional requirements by executing `pip install --target vendor -r optional-requirements.txt`
+Calibre Calibre library (metadata.db) can be located on a Google Drive. Additional optional dependencys are necessary to get this work. Please install all optional requirements by executing `pip install --target vendor -r optional-requirements.txt`
To use google drive integration, you have to use the google developer console to create a new app. https://console.developers.google.com
@@ -84,7 +84,7 @@ Once a project has been created, we need to create a client ID and a client secr
6. Give the Credentials a name and enter your callback, which will be CALIBRE_WEB_URL/gdrive/callback
7. Finally click save
-The Drive API should now be setup and ready to use, so we need to integrate it into Calibre Web. This is done as below: -
+The Drive API should now be setup and ready to use, so we need to integrate it into Calibre-Web. This is done as below: -
1. Open config page
2. Enter the location that will be used to store the metadata.db file, and to temporary store uploaded books and other temporary files for upload
@@ -92,7 +92,7 @@ The Drive API should now be setup and ready to use, so we need to integrate it i
3. Enter Client Secret and Client Key as provided via previous steps
4. Enter the folder that is the root of your calibre library
5. Enter base URL for calibre (used for google callbacks)
-6 Now select Authenticate Google Drive
+6. Now select Authenticate Google Drive
7. This should redirect you to google to allow it top use your Drive, and then redirect you back to the config page
8. Google Drive should now be connected and be used to get images and download Epubs. The metadata.db is stored in the calibre library location
@@ -108,7 +108,7 @@ Calibre Web can be run as Docker container. Pre-built Docker images based on Alp
## Reverse Proxy
-Reverse proxy configuration examples for apache and nginx to use calibre-web:
+Reverse proxy configuration examples for apache and nginx to use Calibre-Web:
nginx configuration for a local server listening on port 8080, mapping calibre web to /calibre:
@@ -152,12 +152,12 @@ Listen 443
```
-## Start calibre-web as service under Linux
+## Start Calibre-Web as service under Linux
Create a file "cps.service" as root in the folder /etc/systemd/system with the following content:
```[Unit]
-Description=Calibre-web
+Description=Calibre-Web
[Service]
Type=simple
@@ -173,3 +173,12 @@ Replace the user and ExecStart with your user and foldernames.
`sudo systemctl enable cps.service`
enables the service.
+
+## Command line options
+
+Starting the script with `-h` lists all supported command line options
+Currently supported are 2 options, which are both useful for running multiple instances of Calibre-Web
+
+`"-p path"` allows to specify the location of the settings database
+`"-p path"` allows to specify the location of the google-drive database
+