1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-26 18:10:30 +00:00
Commit Graph

136 Commits

Author SHA1 Message Date
Ozzie Isaacs
a6d1f6039d Merge remote-tracking branch 'es/spanish-translation' into master
# Conflicts:
#	cps/translations/es/LC_MESSAGES/messages.po
2021-06-29 18:30:37 +02:00
Ozzie Isaacs
792d4a65bc Fix typo 2021-06-29 18:24:35 +02:00
Ozzie Isaacs
e6e3032f02 Merge remote-tracking branch 'pl/master' into master 2021-06-12 08:52:14 +02:00
Ozzie Isaacs
20b84a9459 Unified translations
Update translations for release
2021-05-16 09:37:45 +02:00
Ozzie Isaacs
ad2d0c84e4 Update swedish translation 2021-05-13 16:28:02 +02:00
Ozzieisaacs
bd3ccfd0a9 Merge remote-tracking branch 'cn/master' into master 2021-05-01 16:33:47 +02:00
Ozzie Isaacs
19797d5d23 Merge remote-tracking branch 'it/patch-24' into master 2021-04-26 19:05:25 +02:00
Ozzie Isaacs
b624ce16c3 Merge remote-tracking branch 'it/patch-23' into master 2021-04-18 12:04:08 +02:00
Ozzie Isaacs
1a0de3b3cf Merge remote-tracking branch 'de_translation/patch-1' into master 2021-04-06 18:08:32 +02:00
Ozzie Isaacs
2c92f24d89 Added Brazilian translation 2021-03-27 12:20:07 +01:00
Ozzie Isaacs
dd32cc99ea Merge remote-tracking branch 'es/patch-1' into master 2021-03-15 08:17:14 +01:00
Ozzie Isaacs
4a4d02ea6a Added translations 2021-02-02 19:04:55 +01:00
Ozzie Isaacs
9418045a2c Updated Translation
Version bump
Fixed errors in requirements file(s)
2021-01-17 16:28:28 +01:00
Ozzieisaacs
9e1cdd8f57 Merge remote-tracking branch 'it/patch-20' into master
# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
2021-01-02 19:37:59 +01:00
Ozzieisaacs
96b18faea1 Merge remote-tracking branch 'nl/master' into master 2020-12-12 10:06:16 +01:00
Ozzieisaacs
2da7cd2064 Merge remote-tracking branch 'it/patch-18' into master 2020-12-01 14:11:25 +01:00
Ozzieisaacs
d76b4fd7ea Merge remote-tracking branch 'it/patch-17' into master 2020-11-14 13:12:36 +01:00
Ozzieisaacs
37a80b935d Added greek translation 2020-10-31 19:20:00 +01:00
Ozzieisaacs
f9995583a5 Merge remote-tracking branch 'translate/patch-1' into master 2020-10-20 17:12:25 +02:00
Ozzieisaacs
093f90d4c1 Update translation files 2020-10-10 11:38:40 +02:00
Ozzieisaacs
1f4564da76 Merge remote-tracking branch 'es/patch-1' into master 2020-10-06 21:48:42 +02:00
Ozzieisaacs
e61e94f0fa Merge remote-tracking branch 'it/patch-15' into master
Updated Translations
2020-09-26 16:19:34 +02:00
Ozzieisaacs
ec0a0190e7 Merge remote-tracking branch 'polish/master' into master 2020-09-01 20:18:29 +02:00
Ozzie Isaacs
66acd1821d Update Gdrive integration (Error Handling on Callback and wording) 2020-07-21 18:01:38 +02:00
Ozzieisaacs
6315655f93 Re-add missing po files 2020-06-28 12:05:16 +02:00
Ozzieisaacs
080042882f Merge remote-tracking branch 'cz/master' 2020-06-28 09:33:18 +02:00
Ozzieisaacs
bf75f16169 Updated Chinese translation 2020-06-20 13:55:34 +02:00
Ozzieisaacs
ded3e06a9b Updated french translation 2020-06-07 06:48:51 +02:00
Ozzieisaacs
4de89ec6ce Merge remote-tracking branch 'it/patch-14' 2020-06-02 20:58:17 +02:00
Ozzieisaacs
d3c2bf7dd4 Merge remote-tracking branch 'es/patch-1' 2020-05-28 18:50:16 +02:00
Ozzieisaacs
11e5d4c5b7 Merge remote-tracking branch 'es/patch-2' 2020-05-25 21:57:26 +02:00
Ozzieisaacs
e0ee2e0801 Merge remote-tracking branch 'typo/master' 2020-05-23 08:47:08 +02:00
Michael Knepher
c79a9e9858 Fix typo "Shelfs" to "Shelves" 2020-05-22 11:43:52 -07:00
Ozzieisaacs
a276a33081 Merge remote-tracking branch 'nl/master' 2020-05-15 20:34:30 +02:00
Ozzieisaacs
700cb3b553 Merge remote-tracking branch 'NL/master'
Updated all strings
2020-05-01 17:15:59 +02:00
Ozzieisaacs
e9446556a1 Merge remote-tracking branch 'ru/master' 2020-04-29 12:06:35 +02:00
Ozzieisaacs
36cb79de62 Merge remote-tracking branch 'turkish/master' 2020-04-24 22:14:57 +02:00
Ozzieisaacs
1df82110d1 Update Italian language translation 2020-04-19 19:13:10 +02:00
Ozzieisaacs
06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 2020-04-18 11:48:34 +02:00
Ozzieisaacs
53be752787 Merge remote-tracking branch 'it/patch-10' 2020-04-16 20:17:02 +02:00
Ozzieisaacs
ec6b346ca1 Update Translation 2020-04-03 19:50:29 +02:00
Ozzieisaacs
e99f5bcced Merge remote-tracking branch 'english/master' 2020-04-03 19:46:26 +02:00
Ozzieisaacs
b89309ab82 Merge remote-tracking branch 'po/master' 2020-04-03 19:27:10 +02:00
Ozzieisaacs
092423adc7 Merge remote-tracking branch 'sv/master'
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:38:50 +01:00
Ozzieisaacs
a50ca1a85f Fix #1259 2020-03-14 10:35:58 +01:00
Ozzieisaacs
1d40434d2b Merge remote-tracking branch 'it/patch-9' 2020-03-12 20:32:08 +01:00
Ozzieisaacs
89927fd7e9 Merge ComicVine API 2020-03-07 13:33:35 +01:00
Ozzieisaacs
3fb851304f Merge remote-tracking branch 'ru/master' 2020-03-07 11:21:10 +01:00
Ozzieisaacs
c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 2020-02-26 18:03:26 +01:00
Ozzieisaacs
917132fe26 Update Translation (german and russian)
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
2020-02-24 19:38:12 +01:00
Ozzieisaacs
fc4436f091 Update Translation 2020-02-23 20:07:21 +01:00
Ozzieisaacs
4f81184da0 Update translation 2020-02-23 13:22:57 +01:00
Ozzieisaacs
24d755b123 Update translations
Merge remote-tracking branch 'it/patch-7'
2020-02-23 10:55:56 +01:00
Ozzieisaacs
3f578122a3 Merge remote-tracking branch 'it/patch-6' 2020-02-16 18:56:14 +01:00
Ozzieisaacs
f67953c447 Update translation
Merge remote-tracking branch 'cz/patch-11'
2020-02-01 15:03:03 +01:00
Ozzieisaacs
acfad7a982 Update Italian translation 2020-01-27 18:17:17 +01:00
Ozzieisaacs
542a0008c9 Merge remote-tracking branch 'ru/master' 2020-01-26 19:33:37 +01:00
Ozzieisaacs
68ca0b86da Updated tiniymce + locale
updated datepicker + locale
Included cs, fi language, updated ru language
2020-01-12 14:11:53 +01:00
Ozzieisaacs
22add37b64 Merge remote-tracking branch 'fix typo in config_edit.html #1097'
Updated translations
2019-12-08 10:10:32 +01:00
Ozzieisaacs
a4416c202d Merge remote-tracking branch 'rename/develop' 2019-11-16 08:01:18 +01:00
Ozzieisaacs
2e4344f7ea Merge remote-tracking branch 'swedish/master' 2019-11-16 07:27:08 +01:00
Ozzieisaacs
ca5e285c5a Merge branch 'Develop' 2019-09-06 19:05:02 +02:00
Ozzieisaacs
12576393cf Merge remote-tracking branch 'spanish/patch-1'
Merge remote-tracking branch 'german/master'
2019-07-26 16:41:52 +02:00
Ozzieisaacs
4708347c16 Merge branch 'Develop'
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
2019-07-13 20:54:21 +02:00
Ozzieisaacs
32af660f86 Improvements for logfile viewer
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
2019-06-22 19:55:59 +02:00
Ozzieisaacs
6662a58cb0 Update translationfiles 2019-05-31 15:48:19 +02:00
Ozzieisaacs
4fecce0a0d Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt
2019-05-31 11:17:47 +02:00
Ozzieisaacs
d106ada9ed Changed version
Update translation
2019-05-30 09:07:52 +02:00
Ozzieisaacs
479b4b7d82 Update translations, integrated update of Italian translation 2019-05-08 20:24:10 +02:00
Ozzieisaacs
07649d04a3 Fix updater
Update translations
Code cleaning updater
2019-03-24 15:27:23 +01:00
Ozzieisaacs
da3fcb9a72 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
2019-03-10 08:31:10 +01:00
Ozzieisaacs
76d40411dd Translation updated 2019-03-10 08:04:31 +01:00
Ozzieisaacs
fad62a0909 translation update 2019-02-24 19:23:51 +01:00
Ozzieisaacs
ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
2019-02-03 16:38:27 +01:00
Ozzieisaacs
836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs
c527d1f49a Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
2019-01-12 09:01:08 +01:00
Ozzieisaacs
38c180a9ea Update translation files 2018-11-03 14:05:02 +01:00
OzzieIsaacs
4eeeb02b1d Merge remote-tracking branch 'update_check/master' 2018-09-14 21:12:45 +02:00
OzzieIsaacs
01fb8ee681 Fix #609
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
2018-09-09 18:17:15 +02:00
OzzieIsaacs
a5d15a19de Update Translation "->' 2018-09-08 14:50:52 +02:00
OzzieIsaacs
9d0f583d4f Updated french and chinese language. Thanks to @idalin and Olivier
Fixed bug some translations are not shown
2018-09-08 12:28:48 +02:00
OzzieIsaacs
0bcb20f674 Fix #604
Added missing translation for "select option"
2018-09-03 19:12:15 +02:00
OzzieIsaacs
4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
2018-08-31 15:00:22 +02:00
OzzieIsaacs
9c889d1681 Fix #597
Updated language files
2018-08-30 09:32:42 +02:00
OzzieIsaacs
a7a91ae54c Added posibility to upload cover from local drive (#439)
Updated language files
2018-08-28 14:07:48 +02:00
OzzieIsaacs
3a37183e25 Included khmer language
Further unified naming
2018-08-28 10:29:11 +02:00