Translations update 01May2017

seblucas / cops

Calibre OPDS (and HTML) PHP Server : web-based light alternative to Calibre content server / Calibre2OPDS to serve ebooks (epub, mobi, pdf, ...)

http://blog.slucas.fr/en/oss/calibre-opds-php-server

GNU General Public License v2.0

1.43k stars 229 forks source link

Translations update 01May2017 #349

Closed horus68 closed 7 years ago

horus68 commented 7 years ago

Sync files from Transifex. Translations update 01May2017

seblucas commented 7 years ago

Thanks a lot for your speedy answer ;)

There is a conflict for the italian file, did you update you branch before doing the PR ?

horus68 commented 7 years ago

There is a strange conflict on italian language! My local file do not have issues "seriesword.none": "Nessuna collana", is now change to "seriesword.none": "Nessuna serie",

but it do not merge into online github. Can you sort it out?

horus68 commented 7 years ago

@seblucas If you can please merge my committed file for Italian into the previous one online (or merge all the conflicts)

seblucas commented 7 years ago

Committed locally.

@horus the master branch of your fork is quite old, that should be why there was a conflict. You should update it (or delete it and refork as you prefer).