Commit 62865897 authored by Ozzieisaacs's avatar Ozzieisaacs

Merge branch 'master' into Develop

parents 0dd0605a db0fe9a7
......@@ -40,7 +40,7 @@ try:
from comicapi import __version__ as comic_version
except (ImportError):
comic_version = ''
except ImportError as e:
except (ImportError, LookupError) as e:
log.debug('Cannot import comicapi, extracting comic metadata will not work: %s', e)
import zipfile
import tarfile
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-01-08 11:37+0000\n"
"Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
"Language: cs_CZ\n"
......@@ -713,20 +713,20 @@ msgstr "Police %(title)s změněna"
msgid "Edit a shelf"
msgstr "Upravit polici"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Police: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Změnit pořadí Police: '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-06-02 20:57+0200\n"
"Last-Translator: Ozzie Isaacs\n"
"Language: de\n"
......@@ -714,20 +714,20 @@ msgstr "Bücherregal %(title)s verändert"
msgid "Edit a shelf"
msgstr "Bücherregal editieren"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Bücherregal: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Fehler beim Öffnen des Bücherregals. Bücherregal exisitert nicht oder ist nicht zugänglich"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "Verstecktes Buch"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Calibre-Web\n"
"Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
"POT-Creation-Date: 2020-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-05-25 17:22+0200\n"
"Last-Translator: minakmostoles <xxx@xxx.com>\n"
"Language: es\n"
......@@ -717,20 +717,20 @@ msgstr "Estante %(title)s cambiado"
msgid "Edit a shelf"
msgstr "Editar un estante"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Estante: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Error al abrir un estante. El estante no existe o no es accesible"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "Libro oculto"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Cambiar orden del estante: '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-01-12 13:56+0100\n"
"Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
"Language: fi\n"
......@@ -714,20 +714,20 @@ msgstr "Hylly %(title)s muutettu"
msgid "Edit a shelf"
msgstr "Muokkaa hyllyä"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Hylly: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Muuta hyllyn: '%(name)s' järjestystä"
......
This diff is collapsed.
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2020-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2019-04-06 23:36+0200\n"
"Last-Translator: \n"
"Language: hu\n"
......@@ -714,20 +714,20 @@ msgstr "A következő polc megváltoztatva: %(title)s"
msgid "Edit a shelf"
msgstr "Polc szerkesztése"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Polc: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "A következő polc átrendezése: %(name)s"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2017-04-04 15:09+0200\n"
"Last-Translator: ElQuimm <quimm@webtaste.com>\n"
"Language: it\n"
......@@ -713,20 +713,20 @@ msgstr "Lo scaffale %(title)s è stato modificato"
msgid "Edit a shelf"
msgstr "Modifica uno scaffale"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Scaffale: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "Libro nascosto"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2018-02-07 02:20-0500\n"
"Last-Translator: white <space_white@yahoo.com>\n"
"Language: ja\n"
......@@ -714,20 +714,20 @@ msgstr "%(title)s を変更しました"
msgid "Edit a shelf"
msgstr "本棚を編集する"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "本棚: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "'%(name)s' 内の本の順番を変更する"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2018-08-27 17:06+0700\n"
"Last-Translator: \n"
"Language: km_KH\n"
......@@ -715,20 +715,20 @@ msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្ត
msgid "Edit a shelf"
msgstr "កែប្រែធ្នើ"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "ធ្នើ៖ ‘%(name)s’"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-05-10 21:00+0200\n"
"Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
"Language: nl\n"
......@@ -715,20 +715,20 @@ msgstr "Boekenplank '%(title)s' is aangepast"
msgid "Edit a shelf"
msgstr "Pas een boekenplank aan"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Boekenplank: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "Verborgen boek"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Volgorde bewerken van boekenplank: '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-03-31 21:50+0200\n"
"Last-Translator: Jerzy Piątek <jerzy.piatek@gmail.com>\n"
"Language: pl\n"
......@@ -721,20 +721,20 @@ msgstr "Półka %(title)s została zmieniona"
msgid "Edit a shelf"
msgstr "Edytuj półkę"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Półka: „%(name)s”"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "Ukryta książka"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Zmieniono kolejność półki: '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-04-29 01:20+0400\n"
"Last-Translator: ZIZA\n"
"Language: ru\n"
......@@ -715,20 +715,20 @@ msgstr "Колка %(title)s изменена"
msgid "Edit a shelf"
msgstr "Изменить полку"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Полка: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "Скрытая книга"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Изменить расположение полки '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-03-14 09:30+0100\n"
"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
"Language: sv\n"
......@@ -714,20 +714,20 @@ msgstr "Hyllan %(title)s ändrad"
msgid "Edit a shelf"
msgstr "Redigera en hylla"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Hylla: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "Dold bok"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Ändra ordning på hyllan: '%(name)s'"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Calibre-Web\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2020-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2020-04-23 22:47+0300\n"
"Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
"Language: tr\n"
......@@ -714,20 +714,20 @@ msgstr "%(title)s kitaplığı değiştirildi"
msgid "Edit a shelf"
msgstr "Kitaplığı düzenle"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Kitaplık: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Kitaplık açılırken hata oluştu. Kitaplık mevcut değil ya da erişilebilir değil"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2017-04-30 00:47+0300\n"
"Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
"Language: uk\n"
......@@ -713,20 +713,20 @@ msgstr "Книжкова полиця %(title)s змінена"
msgid "Edit a shelf"
msgstr "Змінити книжкову полицю"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "Книжкова полиця: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "Змінити розташування книжкової полиці '%(name)s'"
......
......@@ -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-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: 2017-01-06 17:00+0000\n"
"Last-Translator: dalin <dalin.lin@gmail.com>\n"
"Language: zh_Hans_CN\n"
......@@ -714,20 +714,20 @@ msgstr "书架 %(title)s 已被修改"
msgid "Edit a shelf"
msgstr "编辑书架"
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr "书架: '%(name)s'"
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr "打开书架出错。书架不存在或不可访问"
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr "隐藏书籍"
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr "修改书架 '%(name)s' 顺序"
......
......@@ -1023,7 +1023,7 @@ def get_tasks_status():
@app.route("/reconnect")
def reconnect():
db.reconnect_db(config, ub.app_DB_path)
calibre_db.reconnect_db(config, ub.app_DB_path)
return json.dumps({})
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2020-06-02 20:57+0200\n"
"POT-Creation-Date: 2020-06-07 06:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -713,20 +713,20 @@ msgstr ""
msgid "Edit a shelf"
msgstr ""
#: cps/shelf.py:331
#: cps/shelf.py:332
#, python-format
msgid "Shelf: '%(name)s'"
msgstr ""
#: cps/shelf.py:334
#: cps/shelf.py:335
msgid "Error opening shelf. Shelf does not exist or is not accessible"
msgstr ""
#: cps/shelf.py:367
#: cps/shelf.py:368
msgid "Hidden Book"
msgstr ""
#: cps/shelf.py:372
#: cps/shelf.py:373
#, python-format
msgid "Change order of Shelf: '%(name)s'"
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment