diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 33f68e1e..3308f936 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,22 @@ +7.1.0 +Aadida opcin para resetear el rating de un comics +Corregidos bugs que afectaban a la informacin de pgina. +Corregido error que marcaba un comic terminado como empezado si se volva a leer. +Aadidos 2 estados para las carpetas (Completo/Terminado) +Corregido bug en la comunicacin YACReaderLibrary <-> YACReader +Aadidas las acciones relativas a los comics al men contextual de la tabla de cmics. +Corrgido bug que provocaba el crecimiento ilimatado del log del servidor +Corregidos bugs menores + +7.0.2 (Slo MacOSX) +Eliminado el uso de Poppler en la versin de MacOSX +Trabajo en traducciones. +Corregidos bugs menores + +7.0.1 +Aadido QsLog a YACReader +Corregido bug en la comunicacin YACReaderLibrary <-> YACReader + 7.0 (Final) Corregidos eventos de teclado en algunos dilogos Corregido soporte para archivos Rar en sistemas Unix diff --git a/INSTALL.txt b/INSTALL.txt index 70bbcdb6..8c65b479 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,8 +1,31 @@ -INSTALLATION GUIDE FOR LINUX USERS +INSTALLATION GUIDE FOR LINUX USERS (BINARY PACKAGE) ********************************** YACReader and YACReaderLibraries binaries are compiled under Ubuntu 13.10 and uses Qt5 and libpoppler-qt5. +COMPILATION GUIDE FOR LINUX/UNIX USERS +********************************** +YACReader and YACReaderLibrary are build using qmake. To build and install the program, run: + +qmake +make +make install + +from the source dir. For seperate builds of YACReader or YACReaderLibrary, enter their respective subfolders and run the commands from there. + +Build options: +--------------------- +You can adjust the installation prefix as well als the path make install uses to install the files. +Use "qmake PREFIX=DIR" to configure YACReader for your systems default prefix (for example "/", "/usr", "/usr/local"). + +For packaging purposes, you can use "make install INSTALL_ROOT=DIR" to install to a different location than the prefix. + +Default values: + +PREFIX=/usr +INSTALL_ROOT="" + + DO YOU WANT TO HELP YACREADER? ****************************** -If you have experience creating packages,please help to create a package for your favourite distro! Send me an e-mail to: info@yacreader.com +If you have experience creating packages, please help to create a package for your favourite distro! Send me an e-mail to: info@yacreader.com diff --git a/YACReader.desktop b/YACReader.desktop new file mode 100644 index 00000000..ddd79076 --- /dev/null +++ b/YACReader.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=YACReader +GenericName=Yet Another Comic Reader +Comment=Yet Another Comic Reader +Exec=YACReader %f +Icon=/usr/share/YACReader/icon.png +Terminal=false +Type=Application +StartupNotify=true +Categories=Graphics;Viewer; +MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7; +X-Desktop-File-Install-Version=0.22 diff --git a/YACReader.pro b/YACReader.pro new file mode 100644 index 00000000..bfc8dc47 --- /dev/null +++ b/YACReader.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS = YACReader YACReaderLibrary +YACReaderLibrary.depends = YACReader diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index 15d17463..24a05ce0 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -8,6 +8,10 @@ DEPENDPATH += . \ DEFINES += NOMINMAX + unix:!macx{ +QMAKE_CXXFLAGS += -std=c++11 +} + isEqual(QT_MAJOR_VERSION, 5) { Release:DESTDIR = ../release5 Debug:DESTDIR = ../debug5 @@ -34,3 +38,61 @@ TRANSLATIONS = yacreader_es.ts \ yacreader_nl.ts \ yacreader_tr.ts \ yacreader_source.ts + + +win32 { +!exists (../compressed_archive/lib7zip) { + error(You\'ll need 7zip source code to compile YACReader. \ + Please check the compressed_archive folder for further instructions.) +} +} + +unix { +exists (../compressed_archive/libp7zip) { + message(Found p7zip source code...) + system(patch -d ../compressed_archive -N -p0 -i libp7zip.patch) +} else { + error(You\'ll need 7zip source code to compile YACReader. \ + Please check the compressed_archive folder for further instructions.) +} +} + +unix:!macx { +#set install prefix if it's empty +isEmpty(PREFIX) { + PREFIX = /usr +} + +BINDIR = $$PREFIX/bin +LIBDIR = $$PREFIX/lib +DATADIR = $$PREFIX/share + +DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" + + +#MAKE INSTALL + +INSTALLS += bin docs icon desktop translation + +bin.path = $$BINDIR +isEmpty(DESTDIR) { + bin.files = YACReader +} else { + bin.files = $$DESTDIR/YACReader +} + +docs.path = $$DATADIR/doc/YACReader +docs.files = ../*.txt + +icon.path = $$DATADIR/YACReader +icon.files = ../images/icon.png + +desktop.path = $$DATADIR/applications +desktop.extra = desktop-file-edit --set-icon=$$DATADIR/YACReader/icon.png $$PWD/../YACReader.desktop +desktop.files = ../YACReader.desktop + +#TODO: icons should be located at /usr/share/icons and have the same basename as their application + +translation.path = $$DATADIR/YACReader/languages +translation.files = ../release/languages/yacreader_* +} diff --git a/YACReader/main.cpp b/YACReader/main.cpp index f61614e2..d5bbdfb5 100644 --- a/YACReader/main.cpp +++ b/YACReader/main.cpp @@ -95,7 +95,11 @@ int main(int argc, char * argv[]) QTranslator translator; QString sufix = QLocale::system().name(); +#if defined Q_OS_UNIX && !defined Q_OS_MAC + translator.load(QString(DATADIR)+"/YACReader/languages/yacreader_"+sufix); +#else translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); +#endif app.installTranslator(&translator); MainWindowViewer * mwv = new MainWindowViewer(); diff --git a/YACReader/yacreader_es.qm b/YACReader/yacreader_es.qm index 81466a6c..b2cee2ed 100644 Binary files a/YACReader/yacreader_es.qm and b/YACReader/yacreader_es.qm differ diff --git a/YACReader/yacreader_es.ts b/YACReader/yacreader_es.ts index dc290c0b..220cbc70 100644 --- a/YACReader/yacreader_es.ts +++ b/YACReader/yacreader_es.ts @@ -101,305 +101,314 @@ MainWindowViewer - + &Open &Abrir - + O O - + Open a comic Abrir cómic - + Open Folder Abrir carpeta - + Ctrl+O Ctrl+O - + Open image folder Open images in a folder Abrir carpeta de imágenes - + Save Guardar - - + + Save current page Guardar la página actual - + Previous Comic Cómic anterior - + Open previous comic Abrir cómic anterior - + Next Comic Siguiente Cómic - + Open next comic Abrir siguiente cómic - + &Previous A&nterior - + Go to previous page Ir a la página anterior - + &Next Siguie&nte - + Go to next page Ir a la página siguiente - - + Fit Width Ajustar anchura - + Fit image to height Ajustar página a lo alto - + + Fit Height + Ajustar altura + + + Fit image to width Ajustar página a lo ancho - + Rotate image to the left Rotar imagen a la izquierda - + L L - + Rotate image to the right Rotar imagen a la derecha - + R R - + Double page mode Modo a doble página - + Switch to double page mode Cambiar a modo de doble página - + D D - + Go To Ir a - + G G - + Go to page ... Ir a página... - + Options Opciones - + C C - + YACReader options Opciones de YACReader - + Help Ayuda - + Help, About YACReader Ayuda, Sobre YACReader - + Magnifying glass Lupa - + Switch Magnifying glass Lupa On/Off - + Z Z - + Set bookmark Añadir marcador - + Set a bookmark on the current page Añadir un marcador en la página actual - + Show bookmarks Mostrar marcadores - + Show the bookmarks of the current comic Mostrar los marcadores del cómic actual - + M M - + Show keyboard shortcuts Mostrar atajos de teclado - + Show Info Mostrar información - + I I - + Close Cerrar - + Show Dictionary Mostrar diccionario - + Always on top Siempre visible - + Show full size Mostrar a tamaño original - + Show go to flow Mostrar flow ir a - + &File &Archivo - + + File + Archivo + + + Open Comic Abrir cómic - + Comic files Archivos de cómic - + Remind me in 14 days Recordar en 14 días - + Not now Ahora no - + Open folder Abrir carpeta - + Image files (*.jpg) Archivos de imagen (*.jpg) - + page_%1.jpg página_%1.jpg - + There is a new version avaliable Hay una nueva versión disponible - + Do you want to download the new version? ¿Desea descargar la nueva versión? diff --git a/YACReader/yacreader_fr.ts b/YACReader/yacreader_fr.ts index ab972d23..29539a7d 100644 --- a/YACReader/yacreader_fr.ts +++ b/YACReader/yacreader_fr.ts @@ -101,304 +101,313 @@ MainWindowViewer - + &Open &Ouvrir - + O O - + Open a comic Ouvrir un comic - + Open Folder Ouvrir un dossier - + Ctrl+O Ctrl+O - + Open image folder Ouvrir un dossier d'images - + Save Sauvegarder - - + + Save current page Sauvegarder la page actuelle - + Previous Comic Comic précédent - + Open previous comic Ouvrir le comic précédent - + Next Comic Comic suivant - + Open next comic Ouvrir le livre suivant - + &Previous &Précédent - + Go to previous page Aller à la page précédente - + &Next &Suivant - + Go to next page Aller à la page suivante - - + Fit Width Ajuster la largeur - + Fit image to height Ajuster l'image à la hauteur - + + Fit Height + + + + Fit image to width Ajuster l'image à la largeur - + Rotate image to the left Rotation sur la gauche - + L L - + Rotate image to the right Rotation sur la droite - + R R - + Double page mode Mode double page - + Switch to double page mode Passer en mode double page - + D D - + Go To Aller à - + G G - + Go to page ... Aller à la page ... - + Options Options - + C C - + YACReader options Options de YACReader - + Help Aide - + Help, About YACReader Aide, à propos de YACReader - + Magnifying glass Loupe - + Switch Magnifying glass Utiliser la loupe - + Z Z - + Set bookmark Placer un marque-page - + Set a bookmark on the current page Placer un marque-page à la page actuelle - + Show bookmarks Voir les marque-pages - + Show the bookmarks of the current comic Voir les marque-pages de ce comic - + M M - + Show keyboard shortcuts Voir les raccourcis - + Show Info Voir les infos - + I I - + Close Fermer - + Show Dictionary Dictionnaire - + Always on top Toujours au dessus - + Show full size Plein écran - + Show go to flow Afficher le go to flow - + &File &Fichier - + + File + + + + Open Comic Ouvrir le comic - + Comic files Comic files - + Open folder Ouvirir le dossier - + Image files (*.jpg) Image files (*.jpg) - + page_%1.jpg page_%1.jpg - + There is a new version avaliable Une nouvelle version est disponible - + Do you want to download the new version? Voulez-vous télécharger la nouvelle version? - + Remind me in 14 days - + Not now diff --git a/YACReader/yacreader_nl.ts b/YACReader/yacreader_nl.ts index cf19e3fe..0404c9f5 100644 --- a/YACReader/yacreader_nl.ts +++ b/YACReader/yacreader_nl.ts @@ -101,304 +101,313 @@ MainWindowViewer - + &Open &Open - + O O - + Open a comic Open een strip - + Open Folder Map Openen - + Ctrl+O Ctrl+O - + Open image folder Open afbeeldings map - + Save Bewaar - - + + Save current page Bewaren huidige pagina - + Previous Comic Vorige Strip - + Open previous comic Open de vorige strip - + Next Comic Volgende Strip - + Open next comic Open volgende strip - + &Previous &Vorige - + Go to previous page Ga naar de vorige pagina - + &Next &Volgende - + Go to next page Ga naar de volgende pagina - - + Fit Width Vensterbreedte aanpassen - + Fit image to height Afbeelding aanpassen aan hoogte - + + Fit Height + + + + Fit image to width Afbeelding aanpassen aan breedte - + Rotate image to the left Links omdraaien - + L L - + Rotate image to the right Rechts omdraaien - + R R - + Double page mode Dubbele bladzijde modus - + Switch to double page mode Naar dubbele bladzijde modus - + D D - + Go To Ga Naar - + G G - + Go to page ... Ga naar bladzijde ... - + Options Opties - + C C - + YACReader options YACReader opties - + Help Help - + Help, About YACReader Help, Over YACReader - + Magnifying glass Vergrootglas - + Switch Magnifying glass Overschakelen naar Vergrootglas - + Z Z - + Set bookmark Bladwijzer instellen - + Set a bookmark on the current page Een bladwijzer toevoegen aan de huidige pagina - + Show bookmarks Bladwijzers weergeven - + Show the bookmarks of the current comic Toon de bladwijzers van de huidige strip - + M M - + Show keyboard shortcuts Toon de sneltoetsen - + Show Info Info tonen - + I I - + Close Sluiten - + Show Dictionary Woordenlijst weergeven - + Always on top Altijd op voorgrond - + Show full size Volledig Scherm - + Show go to flow Toon ga naar de Omslagbrowser - + &File &Bestand - + + File + + + + Open Comic Open een Strip - + Comic files Strip bestanden - + Open folder Open een Map - + Image files (*.jpg) Afbeelding bestanden (*.jpg) - + page_%1.jpg pagina_%1.jpg - + There is a new version avaliable Er is een nieuwe versie beschikbaar - + Do you want to download the new version? Wilt u de nieuwe versie downloaden? - + Remind me in 14 days - + Not now diff --git a/YACReader/yacreader_pt.ts b/YACReader/yacreader_pt.ts index 4ffc5d0e..bdd6ec65 100644 --- a/YACReader/yacreader_pt.ts +++ b/YACReader/yacreader_pt.ts @@ -101,304 +101,313 @@ MainWindowViewer - + &Open &Abrir - + O O - + Open a comic Abrir um quadrinho - + Open Folder Abrir Pasta - + Ctrl+O Ctrl+O - + Open image folder - + Save Salvar - - + + Save current page Salvar página atual - + Previous Comic Quadrinho Anterior - + Open previous comic Abrir quadrinho anterior - + Next Comic Próximo Quadrinho - + Open next comic Abrir próximo quadrinho - + &Previous A&nterior - + Go to previous page Ir para a página anterior - + &Next &Próxima - + Go to next page Ir para a próxima página - - + Fit Width Ajustar à Largura - + Fit image to height - + + Fit Height + + + + Fit image to width - + Rotate image to the left Girar imagem à esquerda - + L L - + Rotate image to the right Girar imagem à direita - + R R - + Double page mode Modo dupla página - + Switch to double page mode Alternar para o modo dupla página - + D D - + Go To Ir Para - + G G - + Go to page ... Ir para a página... - + Options Opções - + C C - + YACReader options Opções do YACReader - + Help Ajuda - + Help, About YACReader Ajuda, Sobre o YACReader - + Magnifying glass Lupa - + Switch Magnifying glass Alternar Lupa - + Z Z - + Set bookmark Definir marcador - + Set a bookmark on the current page Definir um marcador na página atual - + Show bookmarks Mostrar marcadores - + Show the bookmarks of the current comic Mostrar os marcadores do quadrinho atual - + M M - + Show keyboard shortcuts Mostrar teclas de atalhos - + Show Info Mostrar Informações - + I I - + Close Fechar - + Show Dictionary - + Always on top - + Show full size - + Show go to flow - + &File &Arquivo - + + File + + + + Open Comic Abrir Quadrinho - + Comic files - + Remind me in 14 days - + Not now - + Open folder Abrir pasta - + Image files (*.jpg) Arquivos de imagem (*.jpg) - + page_%1.jpg - + There is a new version avaliable Há uma nova versão disponível - + Do you want to download the new version? Você deseja baixar a nova versão? diff --git a/YACReader/yacreader_ru.ts b/YACReader/yacreader_ru.ts index 187a0647..183b89ab 100644 --- a/YACReader/yacreader_ru.ts +++ b/YACReader/yacreader_ru.ts @@ -101,304 +101,313 @@ MainWindowViewer - + &Open &Открыть - + O О - + Open a comic Открыть комикс - + Open Folder Открыть папку - + Ctrl+O Ctrl+О - + Open image folder Открыть папку с изображениями - + Save Сохранить - - + + Save current page Сохранить нынешнюю страницу - + Previous Comic Предыдущий комикс - + Open previous comic Открыть предыдуший комикс - + Next Comic Следующий комикс - + Open next comic Открыть следующий комикс - + &Previous &Предыдущий - + Go to previous page Перейти к предыдущей странице - + &Next &Следующий - + Go to next page Перейти к следующей странице - - + Fit Width Подогнать ширину - + Fit image to height - + + Fit Height + + + + Fit image to width - + Rotate image to the left Повернуть изображение против часовой стрелки - + L L - + Rotate image to the right Повернуть изображение по часовой стрелке - + R R - + Double page mode Двойной режим страницы - + Switch to double page mode Переключить на двойной режим страницы - + D D - + Go To Перейти к - + G G - + Go to page ... Перейти к странице ... - + Options Настройки - + C С - + YACReader options Настройки YACReader - + Help Справка - + Help, About YACReader Справка по YACReader - + Magnifying glass Увеличительное стекло - + Switch Magnifying glass Переключиться на увеличительное стекло - + Z Z - + Set bookmark Установить закладку - + Set a bookmark on the current page Установить закладку на текущей странице - + Show bookmarks Показать закладки - + Show the bookmarks of the current comic Показать закладки текущего комикса - + M M - + Show keyboard shortcuts Показать горячие клавиши - + Show Info Показать информацию - + I I - + Close Закрыть - + Show Dictionary Показать словарь - + Always on top Всегда сверху - + Show full size Полноэкранный режим - + Show go to flow - + &File &Файл - + + File + + + + Open Comic Открыть комикс - + Comic files Файлы комикса - + Open folder Открыть папку - + Image files (*.jpg) Файлы изображений - + page_%1.jpg - + There is a new version avaliable Доступно новое обновление - + Do you want to download the new version? Хотите загрузить новую версию ? - + Remind me in 14 days - + Not now diff --git a/YACReader/yacreader_source.ts b/YACReader/yacreader_source.ts index f4ea473b..1e8ee9f3 100644 --- a/YACReader/yacreader_source.ts +++ b/YACReader/yacreader_source.ts @@ -101,304 +101,313 @@ MainWindowViewer - + &Open - + O - + Open a comic - + Open Folder - + Ctrl+O - + Open image folder - + Save - - + + Save current page - + Previous Comic - + Open previous comic - + Next Comic - + Open next comic - + &Previous - + Go to previous page - + &Next - + Go to next page - - + Fit Width - + Fit image to height - + + Fit Height + + + + Fit image to width - + Rotate image to the left - + L - + Rotate image to the right - + R - + Double page mode - + Switch to double page mode - + D - + Go To - + G - + Go to page ... - + Options - + C - + YACReader options - + Help - + Help, About YACReader - + Magnifying glass - + Switch Magnifying glass - + Z - + Set bookmark - + Set a bookmark on the current page - + Show bookmarks - + Show the bookmarks of the current comic - + M - + Show keyboard shortcuts - + Show Info - + I - + Close - + Show Dictionary - + Always on top - + Show full size - + Show go to flow - + &File - + + File + + + + Open Comic - + Comic files - + Open folder - + Image files (*.jpg) - + page_%1.jpg - + There is a new version avaliable - + Do you want to download the new version? - + Remind me in 14 days - + Not now diff --git a/YACReader/yacreader_tr.ts b/YACReader/yacreader_tr.ts index a4ad08ee..56fb2aac 100644 --- a/YACReader/yacreader_tr.ts +++ b/YACReader/yacreader_tr.ts @@ -385,6 +385,14 @@ Not now + + Fit Height + + + + File + + OptionsDialog diff --git a/YACReaderLibrary.desktop b/YACReaderLibrary.desktop new file mode 100644 index 00000000..38551ad7 --- /dev/null +++ b/YACReaderLibrary.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=YACReader Library +GenericName=Yet Another Comic Reader +Comment=Yet Another Comic Reader +Exec=YACReaderLibrary %f +Icon=/usr/share/YACReader/iconLibrary.png +Terminal=false +Type=Application +StartupNotify=true +Categories=Graphics;Viewer; +MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7; +X-Desktop-File-Install-Version=0.22 diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index d96a7965..a97ade55 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -19,7 +19,6 @@ win32 { LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 - isEqual(QT_MAJOR_VERSION, 5) { LIBS += -lpoppler-qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5 @@ -35,6 +34,7 @@ CONFIG -= embed_manifest_exe } unix:!macx{ +QMAKE_CXXFLAGS += -std=c++11 isEqual(QT_MAJOR_VERSION, 5) { INCLUDEPATH += /usr/include/poppler/qt5 @@ -190,3 +190,57 @@ isEqual(QT_MAJOR_VERSION, 5) { Release:DESTDIR = ../release Debug:DESTDIR = ../debug } + +win32 { +!exists(../compressed_archive/lib7zip){ + error(You\'ll need 7zip source code to compile YACReader. \ + Please check the compressed_archive folder for further instructions.) +} +} + +unix { +exists (../compressed_archive/libp7zip) { + message(Found p7zip source code...) + system(patch -d ../compressed_archive -N -p0 -i libp7zip.patch) +} else { + error(You\'ll need 7zip source code to compile YACReader. \ + Please check the compressed_archive folder for further instructions.) +} +} + +unix:!macx { +#set install prefix if it's empty +isEmpty(PREFIX) { + PREFIX = /usr +} + +BINDIR = $$PREFIX/bin +LIBDIR = $$PREFIX/lib +DATADIR = $$PREFIX/share + +DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" + +#MAKE INSTALL +INSTALLS += bin icon desktop server translation + +bin.path = $$BINDIR +isEmpty(DESTDIR) { + bin.files = YACReaderLibrary +} else { + bin.files = $$DESTDIR/YACReaderLibrary +} + +server.path = $$DATADIR/YACReader +server.files = ../release/server + +icon.path = $$DATADIR/YACReader +icon.files = ../images/iconLibrary.png ../images/db.png ../images/coversPackage.png + +desktop.path = $$DATADIR/applications +desktop.extra = desktop-file-edit --set-icon=$$DATADIR/YACReader/iconLibrary.png $$PWD/../YACReaderLibrary.desktop +desktop.files = ../YACReaderLibrary.desktop +#TODO: icons should be located at /usr/share/icons and have the same basename as their application + +translation.path = $$DATADIR/YACReader/languages +translation.files = ../release/languages/yacreaderlibrary_* +} diff --git a/YACReaderLibrary/db/tablemodel.cpp b/YACReaderLibrary/db/tablemodel.cpp index 52092ce8..e04bed06 100644 --- a/YACReaderLibrary/db/tablemodel.cpp +++ b/YACReaderLibrary/db/tablemodel.cpp @@ -81,6 +81,9 @@ QVariant TableModel::data(const QModelIndex &index, int role) const } + //TODO check here if any view is asking for TableModel::Roles + //these roles will be used from QML/GridView + if (role != Qt::DisplayRole) return QVariant(); @@ -597,6 +600,28 @@ void TableModel::resetComicRating(const QModelIndex &mi) QSqlDatabase::removeDatabase(_databasePath); } +QHash TableModel::roleNames() +{ + QHash roles; + + roles[NumberRole] = "number"; + roles[TitleRole] = "title"; + roles[FileNameRole] = "file_name"; + roles[NumPagesRole] = "num_pages"; + roles[IdRole] = "id"; + roles[Parent_IdRole] = "parent_id"; + roles[PathRole] = "path"; + roles[HashRole] = "hash"; + roles[ReadColumnRole] = "read"; + roles[IsBisRole] = "is_bis"; + roles[CurrentPageRole] = "current_page"; + roles[RatingRole] = "rating"; + roles[HasBeenOpenedRole] = "has_been_opened"; + roles[CoverPathRole] = "cover_path"; + + return roles; +} + void TableModel::updateRating(int rating, QModelIndex mi) { ComicDB comic = getComic(mi); diff --git a/YACReaderLibrary/db/tablemodel.h b/YACReaderLibrary/db/tablemodel.h index e17aab83..88913bc4 100644 --- a/YACReaderLibrary/db/tablemodel.h +++ b/YACReaderLibrary/db/tablemodel.h @@ -56,6 +56,8 @@ public: void reload(const ComicDB & comic); void resetComicRating(const QModelIndex & mi); + QHash roleNames(); + enum Columns { Number = 0, Title = 1, @@ -71,6 +73,25 @@ public: Rating = 11, HasBeenOpened = 12 }; + + enum Roles { + NumberRole = Qt::UserRole + 1, + TitleRole, + FileNameRole, + NumPagesRole, + IdRole, + Parent_IdRole, + PathRole, + HashRole, + ReadColumnRole, + IsBisRole, + CurrentPageRole, + RatingRole, + HasBeenOpenedRole, + CoverPathRole + + }; + public slots: void remove(int row); void startTransaction(); diff --git a/YACReaderLibrary/library_creator.cpp b/YACReaderLibrary/library_creator.cpp index cb3d19bf..505e83ea 100644 --- a/YACReaderLibrary/library_creator.cpp +++ b/YACReaderLibrary/library_creator.cpp @@ -73,7 +73,11 @@ void LibraryCreator::run() stopRunning = false; //check for 7z lib +#if defined Q_OS_UNIX && !defined Q_OS_MAC + QLibrary *sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so"); +#else QLibrary *sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z"); +#endif if(!sevenzLib->load()) { QLOG_ERROR() << "Loading 7z.dll : " + sevenzLib->errorString() << endl; diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 2d5846d6..66debab4 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -454,11 +454,11 @@ void LibraryWindow::createActions() setFolderAsCompletedAction->setVisible(false); setFolderAsFinishedAction = new QAction(this); - setFolderAsFinishedAction->setText(tr("Set as finished")); + setFolderAsFinishedAction->setText(tr("Set as read")); setFolderAsFinishedAction->setVisible(false); setFolderAsNotFinishedAction = new QAction(this); - setFolderAsNotFinishedAction->setText(tr("Set as unfinished")); + setFolderAsNotFinishedAction->setText(tr("Set as unread")); setFolderAsNotFinishedAction->setVisible(false); openContainingFolderComicAction = new QAction(this); @@ -1148,9 +1148,9 @@ void LibraryWindow::openComic() yacreaderFound = QProcess::startDetached(QDir::cleanPath(QCoreApplication::applicationDirPath())+QString("/YACReader \"%1\" \"%2\" \"%3\"").arg(path).arg(comicId).arg(libraryId)/*.arg(page).arg(bookmark1).arg(bookmark2).arg(bookmark3).arg(brightness).arg(contrast).arg(gamma)*/,QStringList()); #endif -#ifdef Q_OS_LINUX +#if defined Q_OS_UNIX && !defined Q_OS_MAC QStringList parameters = QStringList() << path << QString::number(comicId) << QString::number(libraryId); - yacreaderFound = QProcess::startDetached(QDir::cleanPath(QCoreApplication::applicationDirPath())+QString("/YACReader"),parameters); + yacreaderFound = QProcess::startDetached(QString("YACReader"),parameters); #endif if(!yacreaderFound) QMessageBox::critical(this,tr("YACReader not found"),tr("YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary.")); diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp index ea3709c3..951356fb 100644 --- a/YACReaderLibrary/main.cpp +++ b/YACReaderLibrary/main.cpp @@ -93,14 +93,19 @@ void logSystemAndConfig() #ifdef Q_OS_WIN if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.dll")) +#elif defined Q_OS_UNIX && !defined Q_OS_MAC + if(QLibrary::isLibrary(QString(LIBDIR)+"/p7zip/7z.so")) #else if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.so")) #endif QLOG_INFO() << "7z : found"; else QLOG_ERROR() << "7z : not found"; - +#if defined Q_OS_UNIX && !defined Q_OS_MAC + if(QFileInfo(QString(BINDIR)+"/qrencode").exists()) +#else if(QFileInfo(QApplication::applicationDirPath()+"/utils/qrencode.exe").exists() || QFileInfo("./util/qrencode").exists()) +#endif QLOG_INFO() << "qrencode : found"; else QLOG_INFO() << "qrencode : not found"; @@ -150,18 +155,26 @@ int main( int argc, char ** argv ) QTranslator translator; QString sufix = QLocale::system().name(); +#if defined Q_OS_UNIX && !defined Q_OS_MAC + translator.load(QString(DATADIR) +"/YACReader/languages/yacreaderlibrary_"+sufix); +#else translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreaderlibrary_"+sufix); +#endif app.installTranslator(&translator); QTranslator viewerTranslator; +#if defined Q_OS_UNIX && !defined Q_OS_MAC + viewerTranslator.load(QString(DATADIR)+"/YACReader/languages/yacreader_"+sufix); +#else viewerTranslator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix); +#endif app.installTranslator(&viewerTranslator); app.setApplicationName("YACReaderLibrary"); qRegisterMetaType("ComicDB"); #ifdef SERVER_RELEASE - QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creacin del fichero de config con el servidor + QSettings * settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creaci�n del fichero de config con el servidor settings->beginGroup("libraryConfig"); s = new Startup(); @@ -176,7 +189,7 @@ int main( int argc, char ** argv ) logSystemAndConfig(); - if(YACReaderLocalServer::isRunning()) //slo se permite una instancia de YACReaderLibrary + if(YACReaderLocalServer::isRunning()) //s�lo se permite una instancia de YACReaderLibrary { QLOG_WARN() << "another instance of YACReaderLibrary is running"; QsLogging::Logger::destroyInstance(); diff --git a/YACReaderLibrary/package_manager.cpp b/YACReaderLibrary/package_manager.cpp index 44066d54..d5f21ef9 100644 --- a/YACReaderLibrary/package_manager.cpp +++ b/YACReaderLibrary/package_manager.cpp @@ -14,7 +14,11 @@ void PackageManager::createPackage(const QString & libraryPath,const QString & d _7z = new QProcess(); connect(_7z,SIGNAL(error(QProcess::ProcessError)),this,SLOT(openingError(QProcess::ProcessError))); connect(_7z,SIGNAL(finished(int,QProcess::ExitStatus)),this,SIGNAL(exported())); - _7z->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes); +#if defined Q_OS_UNIX && !defined Q_OS_MAC + _7z->start("7z",attributes); //TODO: use 7z.so +#else + _7z->start(QCoreApplication::applicationDirPath()+"/utils/7zip",attributes); //TODO: use 7z.dll +#endif } void PackageManager::extractPackage(const QString & packagePath,const QString & destDir) @@ -26,7 +30,11 @@ void PackageManager::extractPackage(const QString & packagePath,const QString & _7z = new QProcess(); connect(_7z,SIGNAL(error(QProcess::ProcessError)),this,SLOT(openingError(QProcess::ProcessError))); connect(_7z,SIGNAL(finished(int,QProcess::ExitStatus)),this,SIGNAL(imported())); - _7z->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes); +#if defined Q_OS_UNIX && !defined Q_OS_MAC + _7z->start("7z",attributes); //TODO: use 7z.so +#else + _7z->start(QCoreApplication::applicationDirPath()+"/utils/7zip",attributes); //TODO: use 7z.dll +#endif } void PackageManager::cancel() diff --git a/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp b/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp index e750fd3e..e01a39b7 100644 --- a/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp +++ b/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp @@ -24,8 +24,13 @@ StaticFileController::StaticFileController(QSettings* settings, QObject* parent) if (QDir::isRelativePath(docroot)) #endif { +#if defined Q_OS_UNIX && ! defined Q_OS_MAC + QFileInfo configFile(QString(DATADIR)+"/YACReader"); + docroot=QFileInfo(QString(DATADIR)+"/YACReader",docroot).absoluteFilePath(); +#else QFileInfo configFile(QApplication::applicationDirPath()); docroot=QFileInfo(QApplication::applicationDirPath(),docroot).absoluteFilePath(); +#endif } qDebug("StaticFileController: docroot=%s, encoding=%s, maxAge=%i",qPrintable(docroot),qPrintable(encoding),maxAge); maxCachedFileSize=settings->value("maxCachedFileSize","65536").toInt(); diff --git a/YACReaderLibrary/server/lib/bfLogging/filelogger.cpp b/YACReaderLibrary/server/lib/bfLogging/filelogger.cpp index 27fd9d6e..24e32a35 100644 --- a/YACReaderLibrary/server/lib/bfLogging/filelogger.cpp +++ b/YACReaderLibrary/server/lib/bfLogging/filelogger.cpp @@ -33,8 +33,8 @@ void FileLogger::refreshSettings() { QFileInfo configFile(YACReader::getSettingsPath()); fileName=QFileInfo(YACReader::getSettingsPath(),fileName).absoluteFilePath(); } - maxSize=settings->value("maxSize",0).toLongLong(); - maxBackups=settings->value("maxBackups",0).toInt(); + maxSize=settings->value("maxSize",1048576).toLongLong(); + maxBackups=settings->value("maxBackups",1).toInt(); msgFormat=settings->value("msgFormat","{timestamp} {type} {msg}").toString(); timestampFormat=settings->value("timestampFormat","yyyy-MM-dd hh:mm:ss.zzz").toString(); minLevel=static_cast(settings->value("minLevel",0).toInt()); diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp b/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp index 2456407e..5cb416e4 100644 --- a/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp +++ b/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp @@ -22,8 +22,13 @@ TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent) if (QDir::isRelativePath(templatePath)) #endif { +#if defined Q_OS_UNIX && !defined Q_OS_MAC + QFileInfo configFile(QString(DATADIR)+"/YACReader"); + templatePath=QFileInfo(QString(DATADIR)+"/YACReader",templatePath).absoluteFilePath(); +#else QFileInfo configFile(QApplication::applicationDirPath()); templatePath=QFileInfo(QApplication::applicationDirPath(),templatePath).absoluteFilePath(); +#endif } fileNameSuffix=settings->value("suffix",".tpl").toString(); QString encoding=settings->value("encoding").toString(); diff --git a/YACReaderLibrary/server/static.cpp b/YACReaderLibrary/server/static.cpp index b724cfeb..38133b66 100644 --- a/YACReaderLibrary/server/static.cpp +++ b/YACReaderLibrary/server/static.cpp @@ -26,8 +26,11 @@ QString Static::getConfigDir() { return configDir; } // Search config file - + #if defined Q_OS_UNIX && !defined Q_OS_MAC + QString binDir=(QString(DATADIR) + "/YACReader"); + #else QString binDir=QCoreApplication::applicationDirPath(); + #endif QString organization=QCoreApplication::organizationName(); QString configFileName=QCoreApplication::applicationName()+".ini"; diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp index 5945ee38..571dcc7f 100644 --- a/YACReaderLibrary/server_config_dialog.cpp +++ b/YACReaderLibrary/server_config_dialog.cpp @@ -282,7 +282,11 @@ void ServerConfigDialog::generateQR(const QString & serverAddress) attributes << "-o" << "-" /*QCoreApplication::applicationDirPath()+"/utils/tmp.png"*/ << "-s" << "8" << "-l" << "H" << "-m" << "0" << serverAddress; connect(qrGenerator,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(updateImage(void))); connect(qrGenerator,SIGNAL(error(QProcess::ProcessError)),this,SLOT(openingError(QProcess::ProcessError))); //TODO: implement openingError +#if defined Q_OS_UNIX && !defined Q_OS_MAC + qrGenerator->start(QString("qrencode"),attributes); +#else qrGenerator->start(QCoreApplication::applicationDirPath()+"/utils/qrencode",attributes); +#endif } void ServerConfigDialog::updateImage() diff --git a/YACReaderLibrary/yacreaderlibrary_es.qm b/YACReaderLibrary/yacreaderlibrary_es.qm index 7c2ff7ff..370934a5 100644 Binary files a/YACReaderLibrary/yacreaderlibrary_es.qm and b/YACReaderLibrary/yacreaderlibrary_es.qm differ diff --git a/YACReaderLibrary/yacreaderlibrary_es.ts b/YACReaderLibrary/yacreaderlibrary_es.ts index 7402b1b9..942f6bcc 100644 --- a/YACReaderLibrary/yacreaderlibrary_es.ts +++ b/YACReaderLibrary/yacreaderlibrary_es.ts @@ -60,14 +60,14 @@ - - + + Looking for volume... Buscando volumen... - + comic %1 of %2 - %3 cómic %1 de %2 - %3 @@ -87,18 +87,18 @@ error desconocido - - + + Retrieving tags for : %1 Recuperando etiquetas para : %1 - + Retrieving volume info... Recuperando imformación del volumen... - + Looking for comic... Buscando cómic... @@ -362,370 +362,398 @@ LibraryWindow - + <font color='white'> press 'F' to close fullscreen mode </font> <font color='white'> presiona 'F' para salir de pantalla completa </font> - + YACReader Library YACReader Library - + Create a new library Crear una nueva biblioteca - + Open an existing library Abrir una biblioteca existente - - + + Export comics info Exportar información de los cómics - - + + Import comics info Importar información de cómics - + Pack covers Empaquetar portadas - + Pack the covers of the selected library Empaquetar las portadas de la biblioteca seleccionada - + Unpack covers Desempaquetar portadas - + Unpack a catalog Desempaquetar un catálogo - + Update library Actualizar biblioteca - + Update current library Actualizar la biblioteca seleccionada - + Rename library Renombrar biblioteca - + Rename current library Renombrar la biblioteca seleccionada - + Remove current library from your collection Eliminar biblioteca de la colección - + Open current comic Abrir cómic actual - + Open current comic on YACReader Abrir el cómic actual en YACReader - + + Set as read Marcar como leído - + Set comic as read Marcar cómic como leído - + + Set as unread Marcar como no leído - + Set comic as unread Marcar cómic como no leído - + Show/Hide marks Mostrar/Ocultar marcas - + Show or hide readed marks Mostrar u ocultar marcas - + Fullscreen mode on/off Modo a pantalla completa on/off - + Fullscreen mode on/off (F) Activar/desactivar modo a pantalla completa (F) - + Help, About YACReader Ayuda, A cerca de... YACReader - + Select root node Seleccionar el nodo raíz - + + + - + Expand all nodes Expandir todos los nodos - + - - - + Colapse all nodes Contraer todos los nodos - + Show options dialog Mostrar opciones - + Show comics server options dialog - + Open folder... Abrir carpeta... - + + Set as uncompleted + Marcar como incompleto + + + + Set as completed + Marcar como completo + + + Open containing folder... Abrir carpeta contenedora... - + + Reset comic rating + Reseteal cómic rating + + + Select all comics Seleccionar todos los cómics - + Edit Editar - + Asign current order to comics Asignar el orden actual a los cómics - + Update cover Actualizar portada - + Delete selected comics Borrar los cómics seleccionados - + Hide comic flow Ocultar cómic flow - + Download tags from Comic Vine Descargar etiquetas de Comic Vine - + + Folder + Carpeta + + + + Comic + Cómic + + + Library not available Library ' Biblioteca no disponible - + Library '%1' is no longer available. Do you want to remove it? La biblioteca '%1' no está disponible. ¿Deseas eliminarla? - + Library '%1' has been created with an older version of YACReaderLibrary. It must be created again. Do you want to create the library now? La biblioteca '%1' ha sido creada con una versión más antigua de YACReaderLibrary y debe ser creada de nuevo. ¿Deseas crear la biblioteca ahora? - + Old library Biblioteca antigua - + YACReader not found YACReader no encontrado - + YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary. YACReader no encontrado, YACReader debe estar instalado en el mismo directorio que YACReaderLibrary. - + Unable to delete No se ha podido borrar - + There was an issue trying to delete the selected comics. Please, check for write permissions in the selected files or containing folder. Ha habido algún problema intentando borrar los cómics selecionados. Por favor, verifica los permisos de escritura en los arhicovs seleccionados o los directorios que los conienen. - + Error creating the library Errar creando la biblioteca - + Error updating the library Error actualizando la biblioteca - + Error opening the library Error abriendo la biblioteca - + Delete comics Borrar cómics - + All the selected comics will be deleted from your disk. Are you sure? Todos los cómics seleccionados serán borrados de tu disco. ¿Estás seguro? - + Library name already exists Ya existe el nombre de la biblioteca - + There is another library with the name '%1'. Hay otra biblioteca con el nombre '%1'. - + + Library Librería - + Remove library Eliminar biblioteca - + Update needed Se necesita actualizar - + This library was created with a previous version of YACReaderLibrary. It needs to be updated. Update now? Esta biblioteca fue creada con una versión anterior de YACReaderLibrary. Es necesario que se actualice. ¿Deseas hacerlo ahora? - + Update failed La actualización ha fallado - + The current library can't be udpated. Check for write write permissions on: La librería actual no ha podido ser actualizada. Verifica que posees permisos de escritura en: - + Download new version Descargar la nueva versión - + This library was created with a newer version of YACReaderLibrary. Download the new version now? Esta biblioteca fue creada con una versión más nueva de YACReaderLibrary. ¿Deseas descargar la nueva versión ahora? - + Library not found Biblioteca no encontrada - + The selected folder doesn't contain any library. La carpeta seleccionada no contiene ninguna biblioteca. - + Are you sure? ¿Estás seguro? - + library? ? - + Remove and delete metadata Eliminar y borrar metadatos - + Do you want remove ¿Deseas eliminar la biblioteca - + Asign comics numbers Asignar números de cómic - + Asign numbers starting in: Asignar números empezando en: @@ -827,103 +855,108 @@ Tamaño: - + Writer(s): Guionista(s): - + Penciller(s): Dibujant(es): - + Inker(s): Entintador(es): - + Colorist(s): Color: - + Letterer(s): Letterer(es): Rotulista(s): - + Cover Artist(s): Artista(s) portada: - + Day: Día: - + Month: Mes: - + Year: Año: - + Publisher: Editorial: - + Format: Formato: - + Color/BW: Color/BN: - + Age rating: Casificación edades: - + Synopsis: Sinopsis: - + Characters: Personajes: - + Notes: Notas: - + + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> view </a> + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> ver </a> + + + Not found No encontrado - + Comic not found. You should update your library. Cómic no encontrado. Deberias actualizar tu biblioteca. - + Edit selected comics information Editar la información de los cómics seleccionados - + Edit comic information Editar la información del cócmic @@ -1168,47 +1201,47 @@ TableModel - + yes sí - + no no - + Title Título - + File Name Nombre de archivo - + Pages Páginas - + Size Tamaño - + Read Leído - + Current Page Página Actual - + Rating Nota diff --git a/YACReaderLibrary/yacreaderlibrary_fr.ts b/YACReaderLibrary/yacreaderlibrary_fr.ts index 24d7e1b0..2851cd6f 100644 --- a/YACReaderLibrary/yacreaderlibrary_fr.ts +++ b/YACReaderLibrary/yacreaderlibrary_fr.ts @@ -60,14 +60,14 @@ - - + + Looking for volume... - + comic %1 of %2 - %3 @@ -87,18 +87,18 @@ - - + + Retrieving tags for : %1 - + Retrieving volume info... - + Looking for comic... @@ -360,370 +360,398 @@ LibraryWindow - + YACReader Library Librairie de YACReader - + + Library Librairie - + <font color='white'> press 'F' to close fullscreen mode </font> <font color='white'> appuyez sur 'F' pour quitter le mode plein écran </font> - + Create a new library Créer une nouvelle librairie - + Open an existing library Ouvrir une librairie existante - - + + Export comics info Exporter les infos des comics - - + + Import comics info Importer les infos des comics - + Pack covers Archiver les couvertures - + Pack the covers of the selected library Archiver les couvertures de la librairie sélectionnée - + Unpack covers Désarchiver les couvertures - + Unpack a catalog Désarchiver un catalogue - + Update library Mettre la librairie à jour - + Update current library Mettre à jour la librairie actuelle - + Rename library Renommer la librairie - + Rename current library Renommer la librairie actuelle - + Remove library Supprimer la librairie - + Remove current library from your collection Enlever cette librairie de votre collection - + Open current comic Ouvrir ce comic - + Open current comic on YACReader Ouvrir ce comic dans YACReader - + + Set as read Marquer comme lu - + Set comic as read Marquer ce comic comme lu - + + Set as unread Marquer comme non-lu - + Set comic as unread Marquer ce comic comme non-lu - + Show/Hide marks Afficher/Cacher les marqueurs - + Show or hide readed marks Afficher ou cacher les marqueurs pour les livres lus - + Library not available Library ' Librairie non disponible - + Fullscreen mode on/off Mode plein écran activé/désactivé - + Fullscreen mode on/off (F) Mode plein écran activé/désactivé (F) - + Help, About YACReader Aide, à propos de YACReader - + Select root node Allerà la racine - + + + - + Expand all nodes Afficher tous les noeuds - + - - - + Colapse all nodes Masquer tous les noeuds - + Show options dialog Ouvrir la boite de dialogue - + Show comics server options dialog Ouvrir la boite de dialogue du serveur - + Open folder... Ouvrir le dossier... - + + Set as uncompleted + + + + + Set as completed + + + + Open containing folder... Ouvrir le dossier... - + + Reset comic rating + + + + Select all comics Sélectionner tous les comics - + Edit Editer - + Asign current order to comics Assigner l'ordre actuel à vos comics - + Update cover Mise à jour des couvertures - + Delete selected comics Supprimer le comics sélectionné - + Hide comic flow Cacher le comic flow - + Download tags from Comic Vine - + + Folder + + + + + Comic + + + + Update needed Mise à jour requise - + This library was created with a previous version of YACReaderLibrary. It needs to be updated. Update now? Cette librairie a été créée avec une ancienne version de YACReaderLibrary. Mise à jour necessaire. Mettre à jour? - + Update failed Echec de la mise à jour - + The current library can't be udpated. Check for write write permissions on: Cette librairie ne peut pas être mise à jour. Vérifiez les droits d'accès: - + Download new version Téléchrger la nouvelle version - + This library was created with a newer version of YACReaderLibrary. Download the new version now? Cette librairie a été créée avec une version plus récente de YACReaderLibrary. Télécharger la nouvelle version? - + Library '%1' is no longer available. Do you want to remove it? La librarie '%1' n'est plus disponible. Voulez-vous la supprimer? - + Old library Ancienne librairie - + Library '%1' has been created with an older version of YACReaderLibrary. It must be created again. Do you want to create the library now? La librarie '%1' a été créée avec une ancienne version de YACReaderLibrary. Elle doit être re-créée. Voulez-vous créer la librairie? - + YACReader not found - + YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary. - + Library not found Librairie introuvable - + The selected folder doesn't contain any library. Le dossier sélectionné ne contient aucune librairie. - + Are you sure? Êtes-vous sûr? - + Do you want remove Voulez-vous supprimer - + library? la librairie? - + Remove and delete metadata Supprimer les métadata - + Unable to delete - + There was an issue trying to delete the selected comics. Please, check for write permissions in the selected files or containing folder. - + Asign comics numbers Assigner les numéros aux comics - + Asign numbers starting in: Assigner les numéros: - + Error creating the library Erreur lors de la création de la librairie - + Error updating the library Erreur lors de la mise à jour de la librairie - + Error opening the library Erreur lors de l'ouverture de la librairie - + Delete comics Supprimer les comics - + All the selected comics will be deleted from your disk. Are you sure? Tous les comics sélectionnés vont être supprimés de votre disque. Êtes-vous sûr? - + Library name already exists Le nom de la librairie existe déjà - + There is another library with the name '%1'. Une autre librairie a le nom '%1'. @@ -825,102 +853,107 @@ Taille: - + Writer(s): Scénariste(s): - + Penciller(s): Dessinateur(s): - + Inker(s): Encreur(s): - + Colorist(s): Coloriste(s): - + Letterer(s): Lettreur(s): - + Cover Artist(s): Artiste(s) de couverture: - + Day: Jour: - + Month: Mois: - + Year: Année: - + Publisher: Editeur: - + Format: Format: - + Color/BW: Couleur/Noir et blanc: - + Age rating: Limite d'âge: - + Synopsis: Synopsis: - + Characters: Personnages: - + Notes: Notes: - + + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> view </a> + + + + Not found Introuvable - + Comic not found. You should update your library. Comic introuvable. Vous devriez mettre à jour votre librairie. - + Edit selected comics information Editer les informations du comic sélectionné - + Edit comic information Editer les informations du comic @@ -1164,47 +1197,47 @@ TableModel - + yes oui - + no non - + Title Titre - + File Name Nom du fichier - + Pages Pages - + Size Taille - + Read Lu - + Current Page - + Rating diff --git a/YACReaderLibrary/yacreaderlibrary_nl.ts b/YACReaderLibrary/yacreaderlibrary_nl.ts index a7e6f9e4..706c2aa4 100644 --- a/YACReaderLibrary/yacreaderlibrary_nl.ts +++ b/YACReaderLibrary/yacreaderlibrary_nl.ts @@ -60,14 +60,14 @@ - - + + Looking for volume... - + comic %1 of %2 - %3 @@ -87,18 +87,18 @@ - - + + Retrieving tags for : %1 - + Retrieving volume info... - + Looking for comic... @@ -360,370 +360,398 @@ LibraryWindow - + YACReader Library YACReader Bibliotheek - + + Library Bibliotheek - + <font color='white'> press 'F' to close fullscreen mode </font> <font color='white'>Druk op "F" om 'volledig scherm modus' te sluiten </font> - + Create a new library Maak een nieuwe Bibliotheek - + Open an existing library Open een bestaande Bibliotheek - - + + Export comics info Exporteren van strip info - - + + Import comics info Importeren van strip info - + Pack covers Inpakken strip voorbladen - + Pack the covers of the selected library Inpakken alle strip voorbladen van de geselecteerde Bibliotheek - + Unpack covers Uitpakken voorbladen - + Unpack a catalog Uitpaken van een catalogus - + Update library Bibliotheek bijwerken - + Update current library Huidige Bibliotheek bijwerken - + Rename library Bibliotheek hernoemen - + Rename current library Huidige Bibliotheek hernoemen - + Remove library Bibliotheek verwijderen - + Remove current library from your collection De huidige Bibliotheek verwijderen uit uw verzameling - + Open current comic Huidige strip openen - + Open current comic on YACReader Huidige strip openen in YACReader - + + Set as read Instellen als gelezen - + Set comic as read Strip Instellen als gelezen - + + Set as unread Instellen als ongelezen - + Set comic as unread Strip Instellen als ongelezen - + Show/Hide marks Toon/Verberg markeringen - + Show or hide readed marks Toon of Verberg gelezen markeringen - + Library not available Library ' Bibliotheek niet beschikbaar - + Fullscreen mode on/off Volledig scherm modus aan/of - + Fullscreen mode on/off (F) Volledig scherm modus aan/of (F) - + Help, About YACReader Help, Over YACReader - + Select root node Selecteer de hoofd categorie - + + + - + Expand all nodes Alle categorieën uitklappen - + - - - + Colapse all nodes Alle categorieën inklappen - + Show options dialog Toon opties dialoog - + Show comics server options dialog Toon strips-server opties dialoog - + Open folder... Map openen ... - + + Set as uncompleted + + + + + Set as completed + + + + Open containing folder... Open map ... - + + Reset comic rating + + + + Select all comics Selecteer alle strips - + Edit Bewerken - + Asign current order to comics Nummeren van strips - + Update cover Strip omslagen bijwerken - + Delete selected comics Geselecteerde strips verwijderen - + Hide comic flow Sluit de Omslagbrowser - + Download tags from Comic Vine - + + Folder + + + + + Comic + + + + Update needed Bijwerken is nodig - + This library was created with a previous version of YACReaderLibrary. It needs to be updated. Update now? Deze bibliotheek is gemaakt met een vorige versie van YACReaderLibrary. Het moet worden bijgewerkt. Nu bijwerken? - + Update failed Bijwerken mislukt - + The current library can't be udpated. Check for write write permissions on: De huidige bibliotheek kan niet worden bijgewerkt. Controleer bij of u schrijfbevoegdheid hebt: - + Download new version Nieuwe versie ophalen - + This library was created with a newer version of YACReaderLibrary. Download the new version now? Deze bibliotheek is gemaakt met een nieuwere versie van YACReaderLibrary. Download de nieuwe versie? - + Library '%1' is no longer available. Do you want to remove it? Bibliotheek ' %1' is niet langer beschikbaar. Wilt u het verwijderen? - + Old library Oude Bibliotheek - + Library '%1' has been created with an older version of YACReaderLibrary. It must be created again. Do you want to create the library now? Bibliotheek ' %1' is gemaakt met een oudere versie van YACReaderLibrary. Zij moet opnieuw worden aangemaakt. Wilt u de bibliotheek nu aanmaken? - + YACReader not found - + YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary. - + Library not found Bibliotheek niet gevonden - + The selected folder doesn't contain any library. De geselecteerde map bevat geen bibliotheek. - + Are you sure? Weet u het zeker? - + Do you want remove Wilt u verwijderen - + library? Bibliotheek? - + Remove and delete metadata Verwijder metagegevens - + Unable to delete - + There was an issue trying to delete the selected comics. Please, check for write permissions in the selected files or containing folder. - + Asign comics numbers Strips nummeren - + Asign numbers starting in: Strips nummeren beginnen bij: - + Error creating the library Fout bij aanmaken Bibliotheek - + Error updating the library Fout bij bijwerken Bibliotheek - + Error opening the library Fout bij openen Bibliotheek - + Delete comics Strips verwijderen - + All the selected comics will be deleted from your disk. Are you sure? Alle geselecteerde strips worden verwijderd van uw schijf. Weet u het zeker? - + Library name already exists Bibliotheek naam bestaat al - + There is another library with the name '%1'. Er is al een bibliotheek met de naam ' %1 '. @@ -825,102 +853,107 @@ Grootte(MB): - + Writer(s): Schrijver(s): - + Penciller(s): Tekenaar(s): - + Inker(s): Inker(s): - + Colorist(s): Inkleurder(s): - + Letterer(s): Letterzetter(s): - + Cover Artist(s): Omslag ontwikkelaar(s): - + Day: Dag: - + Month: Maand: - + Year: Jaar: - + Publisher: Uitgever: - + Format: Formaat: - + Color/BW: Kleur/ZW: - + Age rating: Leeftijdsbeperking: - + Synopsis: Synopsis: - + Characters: Personages: - + Notes: Opmerkingen: - + + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> view </a> + + + + Not found Niet gevonden - + Comic not found. You should update your library. Strip niet gevonden. U moet uw bibliotheek.bijwerken. - + Edit selected comics information Geselecteerde strip informatie bijwerken - + Edit comic information Strip informatie bijwerken @@ -1164,47 +1197,47 @@ TableModel - + yes Ja - + no neen - + Title Titel - + File Name Bestandsnaam - + Pages Pagina's - + Size Grootte(MB) - + Read Gelezen - + Current Page - + Rating diff --git a/YACReaderLibrary/yacreaderlibrary_pt.ts b/YACReaderLibrary/yacreaderlibrary_pt.ts index ef48b794..6636dc77 100644 --- a/YACReaderLibrary/yacreaderlibrary_pt.ts +++ b/YACReaderLibrary/yacreaderlibrary_pt.ts @@ -60,14 +60,14 @@ - - + + Looking for volume... - + comic %1 of %2 - %3 @@ -87,18 +87,18 @@ - - + + Retrieving tags for : %1 - + Retrieving volume info... - + Looking for comic... @@ -362,370 +362,398 @@ LibraryWindow - + <font color='white'> press 'F' to close fullscreen mode </font> <font color='white'> pressione 'F' para fechar o modo tela cheia </font> - + YACReader Library Biblioteca YACReader - + Create a new library Criar uma nova biblioteca - + Open an existing library Abrir uma biblioteca existente - - + + Export comics info - - + + Import comics info - + Pack covers - + Pack the covers of the selected library Pacote de capas da biblioteca selecionada - + Unpack covers - + Unpack a catalog Desempacotar um catálogo - + Update current library Atualizar biblioteca atual - + Rename library - + Rename current library Renomear biblioteca atual - + Remove current library from your collection Remover biblioteca atual da sua coleção - + Open current comic - + Open current comic on YACReader Abrir quadrinho atual no YACReader - + + Set as read - + Set comic as read - + + Set as unread - + Set comic as unread - + Show/Hide marks - + Show or hide readed marks - + Fullscreen mode on/off - + Fullscreen mode on/off (F) Modo tela cheia ligar/desligar (F) - + Help, About YACReader Ajuda, Sobre o YACReader - + Select root node Selecionar raiz - + + - + Expand all nodes Expandir todos - + - - + Colapse all nodes Contrair todos - + Show options dialog Mostrar opções - + Show comics server options dialog - + Open folder... Abrir pasta... - + + Set as uncompleted + + + + + Set as completed + + + + Open containing folder... Abrir a pasta contendo... - + + Reset comic rating + + + + Select all comics - + Edit - + Asign current order to comics - + Update cover - + Delete selected comics - + Hide comic flow - + Download tags from Comic Vine - + + Folder + + + + + Comic + + + + Library not available Library ' - + Old library - + YACReader not found - + YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary. - + Unable to delete - + There was an issue trying to delete the selected comics. Please, check for write permissions in the selected files or containing folder. - + Error creating the library - + Error updating the library - + Error opening the library - + Delete comics - + All the selected comics will be deleted from your disk. Are you sure? - + Library name already exists - + There is another library with the name '%1'. - + + Library Biblioteca - + Update library - + Remove library - + Update needed - + This library was created with a previous version of YACReaderLibrary. It needs to be updated. Update now? - + Update failed - + The current library can't be udpated. Check for write write permissions on: - + Download new version - + This library was created with a newer version of YACReaderLibrary. Download the new version now? - + Library '%1' is no longer available. Do you want to remove it? - + Library '%1' has been created with an older version of YACReaderLibrary. It must be created again. Do you want to create the library now? - + Library not found - + The selected folder doesn't contain any library. - + Are you sure? Você tem certeza? - + library? - + Remove and delete metadata - + Do you want remove Você deseja remover - + Asign comics numbers - + Asign numbers starting in: @@ -827,102 +855,107 @@ - + Writer(s): - + Penciller(s): - + Inker(s): - + Colorist(s): - + Letterer(s): - + Cover Artist(s): - + Day: - + Month: - + Year: - + Publisher: - + Format: - + Color/BW: - + Age rating: - + Synopsis: - + Characters: - + Notes: - + + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> view </a> + + + + Not found - + Comic not found. You should update your library. - + Edit selected comics information - + Edit comic information @@ -1167,47 +1200,47 @@ TableModel - + yes - + no - + Title - + File Name - + Pages - + Size - + Read - + Current Page - + Rating diff --git a/YACReaderLibrary/yacreaderlibrary_ru.ts b/YACReaderLibrary/yacreaderlibrary_ru.ts index 1fc6fe47..20cccb4f 100644 --- a/YACReaderLibrary/yacreaderlibrary_ru.ts +++ b/YACReaderLibrary/yacreaderlibrary_ru.ts @@ -60,14 +60,14 @@ - - + + Looking for volume... - + comic %1 of %2 - %3 @@ -87,18 +87,18 @@ - - + + Retrieving tags for : %1 - + Retrieving volume info... - + Looking for comic... @@ -362,370 +362,398 @@ LibraryWindow - + YACReader Library Библиотека YACReader - + <font color='white'> press 'F' to close fullscreen mode </font> <font color='white'> нажмите 'F' чтобы выйте из Полноэкранного режима </font> - + Create a new library Создать новую библиотеку - + Open an existing library Открыть существующую библиотеку - - + + Export comics info Експорт комикса - - + + Import comics info Импорт комикса - + Pack covers Запакавать обложки - + Pack the covers of the selected library Запакавать обложки выбранной библиотеки - + Unpack covers Распокавать обложки - + Unpack a catalog Распакавать каталог - + Update library Обновить библиотеку - + Update current library Обновить текущую библиотеку - + Rename library - + Rename current library Переименовать текущую бибилиотеку - + Remove current library from your collection Удалите текущую библиотеку из своей коллекции - + Open current comic - + Open current comic on YACReader - + + Set as read - + Set comic as read - + + Set as unread - + Set comic as unread - + Show/Hide marks - + Show or hide readed marks - + Fullscreen mode on/off Полноекранный режим включить/выключить - + Fullscreen mode on/off (F) полноекранный режим включить/выключить(F) - + Help, About YACReader Справка, о программе YACReader - + Select root node - + + - + Expand all nodes - + - - + Colapse all nodes - + Show options dialog Показать настройки диаога - + Show comics server options dialog - + Open folder... Открыть папку... - + + Set as uncompleted + + + + + Set as completed + + + + Open containing folder... - + + Reset comic rating + + + + Select all comics Выбрать все комиксы - + Edit Редактировать - + Asign current order to comics - + Update cover Обновить обложки - + Delete selected comics - + Hide comic flow Не показывать поток комиксов - + Download tags from Comic Vine - + + Folder + + + + + Comic + + + + Library not available Library ' Библиотека не доступна - + Library '%1' is no longer available. Do you want to remove it? - + Library '%1' has been created with an older version of YACReaderLibrary. It must be created again. Do you want to create the library now? - + Old library - + YACReader not found - + YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary. - + Unable to delete - + There was an issue trying to delete the selected comics. Please, check for write permissions in the selected files or containing folder. - + Error creating the library - + Error updating the library - + Error opening the library - + Delete comics - + All the selected comics will be deleted from your disk. Are you sure? - + Library name already exists - + There is another library with the name '%1'. - + + Library Библиотека - + Remove library - + Update needed Необходимо обновление - + This library was created with a previous version of YACReaderLibrary. It needs to be updated. Update now? Эта библиотека была создана с предыдущей версией YACReaderLibrary. Она должна быть обновлена. Обновить сейчас? - + Update failed Обновить неудалось - + The current library can't be udpated. Check for write write permissions on: В настоящее время библиотека не может быть обновлена. Проверьте права на чтение/запись: - + Download new version Загрузить новую версию - + This library was created with a newer version of YACReaderLibrary. Download the new version now? Эта библиотека был создан при новой версией YACReaderLibrary. Скачать новую версию сейчас? - + Library not found Библиотека не найдена - + The selected folder doesn't contain any library. Выбранная папка не содержит библиотеку. - + Are you sure? Вы уверены? - + library? - + Remove and delete metadata - + Do you want remove Вы хотите удалить - + Asign comics numbers Назначение номеров комикса - + Asign numbers starting in: Назначьте номера, начинающиеся на: @@ -827,102 +855,107 @@ Размер: - + Writer(s): - + Penciller(s): - + Inker(s): - + Colorist(s): - + Letterer(s): - + Cover Artist(s): - + Day: День: - + Month: месяц: - + Year: Год: - + Publisher: - + Format: Формат: - + Color/BW: - + Age rating: - + Synopsis: - + Characters: - + Notes: Примичяние: - + + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> view </a> + + + + Not found Не найдено - + Comic not found. You should update your library. - + Edit selected comics information Редактировать информацию выбранного комикса - + Edit comic information Реддактировать информацию @@ -1167,47 +1200,47 @@ TableModel - + yes - + no - + Title Заголовок - + File Name Имя файла - + Pages Страницы - + Size - + Read - + Current Page - + Rating diff --git a/YACReaderLibrary/yacreaderlibrary_source.ts b/YACReaderLibrary/yacreaderlibrary_source.ts index a8963b84..8998aef1 100644 --- a/YACReaderLibrary/yacreaderlibrary_source.ts +++ b/YACReaderLibrary/yacreaderlibrary_source.ts @@ -60,14 +60,14 @@ - - + + Looking for volume... - + comic %1 of %2 - %3 @@ -87,18 +87,18 @@ - - + + Retrieving tags for : %1 - + Retrieving volume info... - + Looking for comic... @@ -360,370 +360,398 @@ LibraryWindow - + YACReader Library - + + Library - + <font color='white'> press 'F' to close fullscreen mode </font> - + Create a new library - - - Open an existing library - - - - Export comics info + Open an existing library - Import comics info + Export comics info - Pack covers - - - - Pack the covers of the selected library + Import comics info - Unpack covers + Pack covers - Unpack a catalog + Pack the covers of the selected library - Update library + Unpack covers - Update current library + Unpack a catalog + + + + + Update library + Update current library + + + + Rename library - + Rename current library - + Remove library - + Remove current library from your collection - + Open current comic - + Open current comic on YACReader - + + Set as read - + Set comic as read - + + Set as unread - + Set comic as unread - + Show/Hide marks - + Show or hide readed marks - + Library not available Library ' - + Fullscreen mode on/off - + Fullscreen mode on/off (F) - + Help, About YACReader - + Select root node - + + - + Expand all nodes - + - - + Colapse all nodes - + Show options dialog - + Show comics server options dialog - + Open folder... - + + Set as uncompleted + + + + + Set as completed + + + + Open containing folder... - + + Reset comic rating + + + + Select all comics - + Edit - + Asign current order to comics - + Update cover - + Delete selected comics - + Hide comic flow - + Download tags from Comic Vine - + + Folder + + + + + Comic + + + + Update needed - + This library was created with a previous version of YACReaderLibrary. It needs to be updated. Update now? - + Update failed - + The current library can't be udpated. Check for write write permissions on: - + Download new version - + This library was created with a newer version of YACReaderLibrary. Download the new version now? - + Library '%1' is no longer available. Do you want to remove it? - + Old library - + Library '%1' has been created with an older version of YACReaderLibrary. It must be created again. Do you want to create the library now? - + YACReader not found - + YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary. - + Library not found - + The selected folder doesn't contain any library. - + Are you sure? - + Do you want remove - + library? - + Remove and delete metadata - + Unable to delete - + There was an issue trying to delete the selected comics. Please, check for write permissions in the selected files or containing folder. - + Asign comics numbers - + Asign numbers starting in: - + Error creating the library - + Error updating the library - + Error opening the library - + Delete comics - + All the selected comics will be deleted from your disk. Are you sure? - + Library name already exists - + There is another library with the name '%1'. @@ -825,102 +853,107 @@ - + Writer(s): - + Penciller(s): - + Inker(s): - + Colorist(s): - + Letterer(s): - + Cover Artist(s): - + Day: - + Month: - + Year: - + Publisher: - + Format: - + Color/BW: - + Age rating: - + Synopsis: - + Characters: - + Notes: - + + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> view </a> + + + + Not found - + Comic not found. You should update your library. - + Edit selected comics information - + Edit comic information @@ -1164,47 +1197,47 @@ TableModel - + yes - + no - + Title - + File Name - + Pages - + Size - + Read - + Current Page - + Rating diff --git a/YACReaderLibrary/yacreaderlibrary_tr.ts b/YACReaderLibrary/yacreaderlibrary_tr.ts index 93eb1dc6..6cbbbfbe 100644 --- a/YACReaderLibrary/yacreaderlibrary_tr.ts +++ b/YACReaderLibrary/yacreaderlibrary_tr.ts @@ -651,6 +651,26 @@ There was an issue trying to delete the selected comics. Please, check for write permissions in the selected files or containing folder. + + Set as uncompleted + + + + Set as completed + + + + Reset comic rating + + + + Folder + + + + Comic + + LocalComicListModel @@ -811,6 +831,10 @@ Letterer(s): Mesaj(lar): + + Comic Vine link: <a style='color: #FFCB00; text-decoration:none; font-weight:bold;' href="http://www.comicvine.com/comic/4000-%1/"> view </a> + + QObject diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp index 372c9642..77fc9b1e 100644 --- a/compressed_archive/compressed_archive.cpp +++ b/compressed_archive/compressed_archive.cpp @@ -197,8 +197,12 @@ bool CompressedArchive::loadFunctions() // fix2: rename 7z.so to 7z.dylib if(sevenzLib == 0) { -#ifdef Q_OS_UNIX - rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29"); +#if defined Q_OS_UNIX + #if defined Q_OS_MAC + rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29"); + #else + rarLib = new QLibrary(QString(LIBDIR)+"/p7zip/Codecs/Rar29.so"); + #endif if(!rarLib->load()) { qDebug() << "Error Loading Rar29.so : " + rarLib->errorString() << endl; @@ -206,7 +210,11 @@ bool CompressedArchive::loadFunctions() return false; } #endif - sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z"); +#if defined Q_OS_UNIX && !defined Q_OS_MAC + sevenzLib = new QLibrary(QString(LIBDIR)+"/p7zip/7z.so"); +#else + sevenzLib = new QLibrary(QApplication::applicationDirPath()+"/utils/7z"); +#endif } if(!sevenzLib->load()) { diff --git a/files/about.html b/files/about.html index 177eb06c..be68e4ae 100644 --- a/files/about.html +++ b/files/about.html @@ -31,6 +31,7 @@ by Luis Ángel San Martín Rodríguez
  • support: support@yacreader.com
  • suggestions and general information: info@yacreader.com
  • developer e-mail: luisangelsm@gmail.com
    • +
  • users' forum: http://www.yacreader.com/forum

    Web site

    web site: http://www.yacreader.com @@ -57,6 +58,24 @@ Find other users and help at:

    +

    Contributors

    +

    Translators

    + +

    Packages

    +
      +
    • alperenelhan : Arch Linux binaries
      • +
    • Robbie Holmes (robbiethegeek) : brew cask install
      • +
    + +

    Thank you to Elia Gregorio Méndez for developing the websites

    + +

    Third-party software and resources

    Compressed files are loaded using 7zip (Windows version) and p7zip (Linux/MacOS X versions) diff --git a/files/about_es_ES.html b/files/about_es_ES.html index 6b64b3ed..0ef88767 100644 --- a/files/about_es_ES.html +++ b/files/about_es_ES.html @@ -31,6 +31,7 @@ por Luis Ángel San Martín Rodríguez

  • soporte: support@yacreader.com
  • sugerencias e información general: info@yacreader.com
  • desarrollador e-mail: luisangelsm@gmail.com
    • +
  • foro de usuarios: http://www.yacreader.com/forum

    Sitio web

    sitio web: http://www.yacreader.com @@ -57,6 +58,23 @@ Encuentra otros usuarios y ayuda en:

    +

    Contribuidores

    +

    Traductores

    + +

    Paquetes

    +
      +
    • alperenelhan : Arch Linux binaries
      • +
    • Robbie Holmes (robbiethegeek) : brew cask install
      • +
    + +

    Gracias a Elia Gregorio Méndez por desarrollar los sitios web

    +

    Software de terceros y recursos

    Los archivos comprimidos se cargan usando 7zip (Windows) y p7zip (Linux/MacOS X) diff --git a/release/languages/yacreader_es.qm b/release/languages/yacreader_es.qm index 81466a6c..b2cee2ed 100644 Binary files a/release/languages/yacreader_es.qm and b/release/languages/yacreader_es.qm differ diff --git a/release/languages/yacreaderlibrary_es.qm b/release/languages/yacreaderlibrary_es.qm index 7c2ff7ff..370934a5 100644 Binary files a/release/languages/yacreaderlibrary_es.qm and b/release/languages/yacreaderlibrary_es.qm differ