Commit Graph

99 Commits (36cb79de624e0a08d90fb1f64509caf7757edbc5)

Author SHA1 Message Date
Ozzieisaacs 36cb79de62 Merge remote-tracking branch 'turkish/master'
Ozzieisaacs 1df82110d1 Update Italian language translation
Ozzieisaacs 06fde4fcd0 Fix (Enable LDAP Anonymous Login)
Ozzieisaacs 53be752787 Merge remote-tracking branch 'it/patch-10'
Ozzieisaacs ec6b346ca1 Update Translation
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master'
Ozzieisaacs b89309ab82 Merge remote-tracking branch 'po/master'
Ozzieisaacs 092423adc7 Merge remote-tracking branch 'sv/master'
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
Ozzieisaacs a50ca1a85f Fix
Ozzieisaacs 1d40434d2b Merge remote-tracking branch 'it/patch-9'
Ozzieisaacs 89927fd7e9 Merge ComicVine API
Ozzieisaacs 3fb851304f Merge remote-tracking branch 'ru/master'
Ozzieisaacs c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1'
Jeff 0854303710
Update Chinese translation
Ozzieisaacs 917132fe26 Update Translation (german and russian)
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
Ozzieisaacs fc4436f091 Update Translation
Ozzieisaacs 4f81184da0 Update translation
Ozzieisaacs 24d755b123 Update translations
Merge remote-tracking branch 'it/patch-7'
Ozzieisaacs 3f578122a3 Merge remote-tracking branch 'it/patch-6'
xcffl aefaf47f4c
Update Simplified Chinese translation
Ozzieisaacs f67953c447 Update translation
Merge remote-tracking branch 'cz/patch-11'
Ozzieisaacs acfad7a982 Update Italian translation
Ozzieisaacs 542a0008c9 Merge remote-tracking branch 'ru/master'
Ozzieisaacs 68ca0b86da Updated tiniymce + locale
updated datepicker + locale
Included cs, fi language, updated ru language
Ozzieisaacs 22add37b64 Merge remote-tracking branch 'fix typo in config_edit.html #1097'
Updated translations
dalin 92841b46d7 update Simplified Chinese translations.
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop'
Ozzieisaacs 2e4344f7ea Merge remote-tracking branch 'swedish/master'
Ozzieisaacs ca5e285c5a Merge branch 'Develop'
Ozzieisaacs 12576393cf Merge remote-tracking branch 'spanish/patch-1'
Merge remote-tracking branch 'german/master'
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
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)
Ozzieisaacs 6662a58cb0 Update translationfiles
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
Ozzieisaacs d106ada9ed Changed version
Update translation
Ozzieisaacs 479b4b7d82 Update translations, integrated update of Italian translation
Ozzieisaacs 07649d04a3 Fix updater
Update translations
Code cleaning updater
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
Ozzieisaacs 76d40411dd Translation updated
Ozzieisaacs fad62a0909 translation update
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
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
Ozzieisaacs c527d1f49a Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
dalin 947622800c Update Simplified Chinese translation. Fix in the case of Simplified Chinese.
Ozzieisaacs 38c180a9ea Update translation files
OzzieIsaacs 4eeeb02b1d Merge remote-tracking branch 'update_check/master'
OzzieIsaacs 01fb8ee681 Fix
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
OzzieIsaacs a5d15a19de Update Translation "->'
OzzieIsaacs 9d0f583d4f Updated french and chinese language. Thanks to @idalin and Olivier
Fixed bug some translations are not shown
idalin b103ecdb5c update simplified Chinese