diff --git a/YACReaderLibrary/empty_reading_list_widget.cpp b/YACReaderLibrary/empty_reading_list_widget.cpp index f325dc37..ddb13738 100644 --- a/YACReaderLibrary/empty_reading_list_widget.cpp +++ b/YACReaderLibrary/empty_reading_list_widget.cpp @@ -5,5 +5,5 @@ EmptyReadingListWidget::EmptyReadingListWidget(QWidget *parent) { setUpDefaultLayout(true); setPixmap(QPixmap(":/images/empty_reading_list")); - setText(tr("This reading list doesn't cotain comics yet")); + setText(tr("This reading list does not contain any comics yet")); } diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 0c264cdd..0c0a1ca8 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -128,7 +128,7 @@ void LibraryWindow::setupUI() createActions(); doModels(); - + doDialogs(); doLayout(); createToolBars(); @@ -250,7 +250,7 @@ void LibraryWindow::doLayout() #else sHorizontal->addWidget(comicsViewsManager->containerWidget()); #endif - + sHorizontal->setStretchFactor(0,0); sHorizontal->setStretchFactor(1,1); mainWidget = new QStackedWidget(this); @@ -566,7 +566,7 @@ void LibraryWindow::createActions() expandAllNodesAction->setIcon(QIcon(":/images/sidebar/expand.png")); colapseAllNodesAction = new QAction(this); - colapseAllNodesAction->setToolTip(tr("Colapse all nodes")); + colapseAllNodesAction->setToolTip(tr("Collapse all nodes")); colapseAllNodesAction->setData(COLAPSE_ALL_NODES_ACTION_YL); colapseAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(COLAPSE_ALL_NODES_ACTION_YL)); colapseAllNodesAction->setIcon(QIcon(":/images/sidebar/colapse.png")); @@ -654,7 +654,7 @@ void LibraryWindow::createActions() editSelectedComicsAction->setIcon(QIcon(":/images/comics_view_toolbar/editComic.png")); asignOrderAction = new QAction(this); - asignOrderAction->setText(tr("Asign current order to comics")); + asignOrderAction->setText(tr("Assign current order to comics")); asignOrderAction->setData(ASIGN_ORDER_ACTION_YL); asignOrderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ASIGN_ORDER_ACTION_YL)); asignOrderAction->setIcon(QIcon(":/images/comics_view_toolbar/asignNumber.png")); @@ -840,7 +840,7 @@ void LibraryWindow::createToolBars() libraryToolBar->attachToWindow(this->windowHandle()); - + #else libraryToolBar->backButton->setDefaultAction(backAction); libraryToolBar->forwardButton->setDefaultAction(forwardAction); @@ -858,9 +858,9 @@ void LibraryWindow::createToolBars() editInfoToolBar->addAction(editSelectedComicsAction); editInfoToolBar->addAction(getInfoAction); editInfoToolBar->addAction(asignOrderAction); - + editInfoToolBar->addSeparator(); - + editInfoToolBar->addAction(selectAllComicsAction); editInfoToolBar->addSeparator(); @@ -873,7 +873,7 @@ void LibraryWindow::createToolBars() editInfoToolBar->addAction(showHideMarksAction); editInfoToolBar->addSeparator(); - + editInfoToolBar->addAction(deleteComicsAction); @@ -897,7 +897,7 @@ void LibraryWindow::createMenus() foldersView->addAction(setFolderAsReadAction); foldersView->addAction(setFolderAsUnreadAction); - selectedLibrary->addAction(updateLibraryAction); + selectedLibrary->addAction(updateLibraryAction); selectedLibrary->addAction(renameLibraryAction); selectedLibrary->addAction(removeLibraryAction); YACReader::addSperator(selectedLibrary); @@ -911,7 +911,7 @@ void LibraryWindow::createMenus() - + //MacOSX app menus #ifdef Q_OS_MACX QMenuBar * menu = this->menuBar(); @@ -1120,7 +1120,7 @@ void LibraryWindow::createConnections() void LibraryWindow::loadLibrary(const QString & name) { if(!libraries.isEmpty()) //si hay bibliotecas... - { + { historyController->clear(); showRootWidget(); @@ -1230,7 +1230,7 @@ void LibraryWindow::loadLibrary(const QString & name) } else//si existe el path, puede ser que la librería sea alguna versión pre-5.0 ó que esté corrupta o que no haya drivers sql { - + if(d.exists(path+"/library.ydb")) { QSqlDatabase db = DataBaseManagement::loadDatabase(path); @@ -1310,7 +1310,7 @@ void LibraryWindow::copyAndImportComicsToFolder(const QList0) - { + { QModelIndex folderDestination = foldersModelProxy->mapToSource(miFolder); QString destFolderPath = QDir::cleanPath(currentPath()+foldersModel->getFolderPath(folderDestination)); @@ -1773,7 +1773,7 @@ void LibraryWindow::openComic() quint64 comicId = comic.id; //TODO generate IDS for libraries... quint64 libraryId = libraries.getId(selectedLibrary->currentText()); - + // %1 %2 %3 NO-->%4 %5 %6 %7 %8 %9 %10 //Invoke YACReader comicPath comicId libraryId NO-->currentPage bookmark1 bookmark2 bookmark3 brightness contrast gamma bool yacreaderFound = false; @@ -1854,7 +1854,7 @@ void LibraryWindow::reloadCurrentLibrary() { void LibraryWindow::openLastCreated() { - + selectedLibrary->disconnect(); selectedLibrary->setCurrentIndex(selectedLibrary->findText(_lastAdded)); @@ -1864,7 +1864,7 @@ void LibraryWindow::openLastCreated() libraries.save(); connect(selectedLibrary,SIGNAL(currentIndexChanged(QString)),this,SLOT(loadLibrary(QString))); - + loadLibrary(_lastAdded); } @@ -1875,12 +1875,12 @@ void LibraryWindow::showAddLibrary() } void LibraryWindow::openLibrary(QString path, QString name) -{ +{ if(!libraries.contains(name)) { //TODO: fix bug, /a/b/c/.yacreaderlibrary/d/e path.remove("/.yacreaderlibrary"); - QDir d; //TODO change this by static methods (utils class?? with delTree for example) + QDir d; //TODO change this by static methods (utils class?? with delTree for example) if(d.exists(path + "/.yacreaderlibrary")) { _lastAdded = name; @@ -2021,9 +2021,9 @@ void LibraryWindow::stopLibraryCreator() void LibraryWindow::setRootIndex() { if(!libraries.isEmpty()) - { + { QString path=libraries.getPath(selectedLibrary->currentText())+"/.yacreaderlibrary"; - QDir d; //TODO change this by static methods (utils class?? with delTree for example) + QDir d; //TODO change this by static methods (utils class?? with delTree for example) if(d.exists(path)) { navigationController->selectedFolder(QModelIndex()); @@ -2166,7 +2166,7 @@ void LibraryWindow::showProperties() propertiesDialog->databasePath = foldersModel->getDatabase(); propertiesDialog->basePath = currentPath(); propertiesDialog->setComics(comics); - + propertiesDialog->show(); } @@ -2240,15 +2240,15 @@ void LibraryWindow::asignNumbers() if(indexList.count()>1) { bool ok; - int n = QInputDialog::getInt(this, tr("Asign comics numbers"), - tr("Asign numbers starting in:"), startingNumber,0,2147483647,1,&ok); + int n = QInputDialog::getInt(this, tr("Assign comics numbers"), + tr("Assign numbers starting in:"), startingNumber,0,2147483647,1,&ok); if (ok) startingNumber = n; else return; } qint64 edited = comicsModel->asignNumbers(indexList,startingNumber); - + //TODO add resorting without reloading navigationController->loadFolderInfo(foldersModelProxy->mapToSource(foldersView->currentIndex())); @@ -2282,7 +2282,7 @@ QFileInfo file = QDir::cleanPath(currentPath() + comicsModel->getComicPath(model args << "end tell"; QProcess::startDetached("osascript", args); #endif - + #ifdef Q_OS_WIN QString filePath = file.absoluteFilePath(); QString cmdArgs = QString("/select,\"") + QDir::toNativeSeparators(filePath) + QStringLiteral("\""); @@ -2569,7 +2569,7 @@ void LibraryWindow::showFoldersContextMenu(const QPoint &point) /* void LibraryWindow::showSocial() -{ +{ socialDialog->move(this->mapToGlobal(QPoint(width()-socialDialog->width()-10, centralWidget()->pos().y()+10))); QModelIndexList indexList = getSelectedComics(); diff --git a/YACReaderLibrary/options_dialog.cpp b/YACReaderLibrary/options_dialog.cpp index 5c623a96..1bf6060a 100644 --- a/YACReaderLibrary/options_dialog.cpp +++ b/YACReaderLibrary/options_dialog.cpp @@ -63,7 +63,7 @@ OptionsDialog::OptionsDialog(QWidget * parent) backgroundImageBlurRadiusSlider = new QSlider(Qt::Horizontal); backgroundImageBlurRadiusSlider->setRange(0,100); - useCurrentComicCoverCheck = new QCheckBox(tr("Use selectec comic cover as background")); + useCurrentComicCoverCheck = new QCheckBox(tr("Use selected comic cover as background")); resetButton = new QPushButton(tr("Restore defautls")); diff --git a/YACReaderLibrary/properties_dialog.cpp b/YACReaderLibrary/properties_dialog.cpp index 8101c2a6..afa4fab8 100644 --- a/YACReaderLibrary/properties_dialog.cpp +++ b/YACReaderLibrary/properties_dialog.cpp @@ -89,7 +89,7 @@ void PropertiesDialog::createCoverBox() layout->addStretch(); coverPageEdit = new YACReaderFieldEdit(); - + showPreviousCoverPageButton = new QToolButton(); showPreviousCoverPageButton->setIcon(QIcon(":/images/previousCoverPage.png")); showPreviousCoverPageButton->setStyleSheet("QToolButton {border:none;}"); @@ -122,7 +122,7 @@ void PropertiesDialog::createCoverBox() connect(showPreviousCoverPageButton,SIGNAL(clicked()),this,SLOT(loadPreviousCover())); connect(showNextCoverPageButton,SIGNAL(clicked()),this,SLOT(loadNextCover())); - + } QFrame * createLine() @@ -145,7 +145,7 @@ void PropertiesDialog::createGeneralInfoBox() generalInfoLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); //generalInfoLayout->setRowWrapPolicy(QFormLayout::WrapAllRows); generalInfoLayout->addRow(tr("Title:"), title = new YACReaderFieldEdit()); - + QHBoxLayout * number = new QHBoxLayout; number->addWidget(numberEdit = new YACReaderFieldEdit()); @@ -161,7 +161,7 @@ void PropertiesDialog::createGeneralInfoBox() /*generalInfoLayout->addRow(tr("&Issue number:"), ); generalInfoLayout->addRow(tr("&Bis:"), );*/ generalInfoLayout->addRow(tr("Issue number:"), number); - + generalInfoLayout->addRow(tr("Volume:"), volumeEdit = new YACReaderFieldEdit()); QHBoxLayout * arc = new QHBoxLayout; @@ -176,9 +176,9 @@ void PropertiesDialog::createGeneralInfoBox() arcCountEdit->setValidator(&arcCountValidator); arc->addStretch(1); generalInfoLayout->addRow(tr("Story arc:"), arc); - - generalInfoLayout->addRow(tr("Genere:"), genereEdit = new YACReaderFieldEdit()); - + + generalInfoLayout->addRow(tr("Genre:"), genereEdit = new YACReaderFieldEdit()); + generalInfoLayout->addRow(tr("Size:"), size = new QLabel("size")); //generalInfoLayout->addRow(tr("Comic Vine link:"), comicVineLink = new QLabel("...")); @@ -196,7 +196,7 @@ void PropertiesDialog::createGeneralInfoBox() void PropertiesDialog::createAuthorsBox() { authorsBox = new QWidget; - + QVBoxLayout *authorsLayout = new QVBoxLayout; //authorsLayout->setRowWrapPolicy(QFormLayout::WrapAllRows); @@ -220,7 +220,7 @@ void PropertiesDialog::createAuthorsBox() vr2->addWidget(new QLabel(tr("Colorist(s):"))); vr2->addWidget(colorist = new YACReaderFieldPlainTextEdit()); h2->addLayout(vr2); - + //authorsLayout->addRow(tr("Inker(s):"), new YACReaderFieldPlainTextEdit()); //authorsLayout->addRow(tr("Colorist(s):"), new YACReaderFieldPlainTextEdit()); @@ -247,7 +247,7 @@ void PropertiesDialog::createAuthorsBox() void PropertiesDialog::createPublishingBox() { publishingBox = new QWidget; - + QFormLayout *publishingLayout = new QFormLayout; publishingLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); @@ -399,10 +399,10 @@ void PropertiesDialog::setComics(QList comics) int coverPage = comic.info.coverPage.toInt(); coverPageNumberLabel->setText(QString::number(coverPage)); coverPageNumberLabel->adjustSize(); - + showPreviousCoverPageButton->setEnabled(true); showNextCoverPageButton->setEnabled(true); - + if(coverPage == 1) showPreviousCoverPageButton->setDisabled(true); if(coverPage == comic.info.numPages.toInt()) @@ -496,7 +496,7 @@ void PropertiesDialog::setComics(QList comics) { if(itr->info.title.isNull() || itr->info.title.toString() != title->text()) title->clear(); - + if(itr->info.count.isNull() || itr->info.count.toString() != countEdit->text()) countEdit->clear(); @@ -605,7 +605,7 @@ void PropertiesDialog::setNumpages(int pagesNum) } void PropertiesDialog::setSize(float sizeFloat) { - + size->setText(QString::number(sizeFloat,'f',2) + " MB"); } @@ -813,7 +813,7 @@ void PropertiesDialog::closeEvent ( QCloseEvent * e ) synopsis->clear(); characters->clear(); notes->clear(); - + setDisableUniqueValues(false); tabBar->setCurrentIndex(0); @@ -850,7 +850,7 @@ void PropertiesDialog::loadNextCover() if(current < comics.at(0).info.numPages.toInt()) { updateCoverPageNumberLabel(current+1); - + ThumbnailCreator tc(basePath+comics[0].path,"",current+1); tc.create(); setCover(tc.getCover()); diff --git a/YACReaderLibrary/yacreaderlibrary_de.ts b/YACReaderLibrary/yacreaderlibrary_de.ts index caab3a44..5232af26 100644 --- a/YACReaderLibrary/yacreaderlibrary_de.ts +++ b/YACReaderLibrary/yacreaderlibrary_de.ts @@ -374,7 +374,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain comics yet @@ -1219,7 +1219,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k NoLibrariesWidget - You don't have any librarires yet + You don't have any libraries yet Sie haben im Augenblick keine Bibliothek @@ -1267,7 +1267,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background diff --git a/YACReaderLibrary/yacreaderlibrary_es.ts b/YACReaderLibrary/yacreaderlibrary_es.ts index 4bd8cda1..a5695c8c 100644 --- a/YACReaderLibrary/yacreaderlibrary_es.ts +++ b/YACReaderLibrary/yacreaderlibrary_es.ts @@ -374,7 +374,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain comics yet @@ -1220,7 +1220,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k NoLibrariesWidget - You don't have any librarires yet + You don't have any libraries yet Aún no tienes ninguna biblioteca @@ -1268,7 +1268,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background diff --git a/YACReaderLibrary/yacreaderlibrary_fr.ts b/YACReaderLibrary/yacreaderlibrary_fr.ts index db0c94ce..9786f715 100644 --- a/YACReaderLibrary/yacreaderlibrary_fr.ts +++ b/YACReaderLibrary/yacreaderlibrary_fr.ts @@ -370,7 +370,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain comics yet @@ -1214,7 +1214,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k NoLibrariesWidget - You don't have any librarires yet + You don't have any libraries yet Vous n'avez pas encore de librairie @@ -1262,7 +1262,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background diff --git a/YACReaderLibrary/yacreaderlibrary_nl.ts b/YACReaderLibrary/yacreaderlibrary_nl.ts index 4164c9f8..37c6299c 100644 --- a/YACReaderLibrary/yacreaderlibrary_nl.ts +++ b/YACReaderLibrary/yacreaderlibrary_nl.ts @@ -370,7 +370,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain comics yet @@ -1214,8 +1214,8 @@ YACReaderLibrary will not stop you from creating more libraries but you should k NoLibrariesWidget - You don't have any librarires yet - Je hebt geen nog librarires + You don't have any libraries yet + Je hebt geen nog libraries @@ -1262,7 +1262,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background diff --git a/YACReaderLibrary/yacreaderlibrary_pt.ts b/YACReaderLibrary/yacreaderlibrary_pt.ts index 7925609e..270d7168 100644 --- a/YACReaderLibrary/yacreaderlibrary_pt.ts +++ b/YACReaderLibrary/yacreaderlibrary_pt.ts @@ -370,7 +370,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain comics yet @@ -1200,7 +1200,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k NoLibrariesWidget - You don't have any librarires yet + You don't have any libraries yet @@ -1248,7 +1248,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background diff --git a/YACReaderLibrary/yacreaderlibrary_ru.ts b/YACReaderLibrary/yacreaderlibrary_ru.ts index d099759e..23c018f4 100644 --- a/YACReaderLibrary/yacreaderlibrary_ru.ts +++ b/YACReaderLibrary/yacreaderlibrary_ru.ts @@ -370,7 +370,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain comics yet @@ -1204,7 +1204,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k NoLibrariesWidget - You don't have any librarires yet + You don't have any libraries yet @@ -1252,7 +1252,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background diff --git a/YACReaderLibrary/yacreaderlibrary_source.ts b/YACReaderLibrary/yacreaderlibrary_source.ts index 28eed1e1..20faa0e2 100644 --- a/YACReaderLibrary/yacreaderlibrary_source.ts +++ b/YACReaderLibrary/yacreaderlibrary_source.ts @@ -370,7 +370,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain any comics yet @@ -1190,7 +1190,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k NoLibrariesWidget - You don't have any librarires yet + You don't have any libraries yet @@ -1238,7 +1238,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background diff --git a/YACReaderLibrary/yacreaderlibrary_tr.ts b/YACReaderLibrary/yacreaderlibrary_tr.ts index 1da49010..dddd80a2 100644 --- a/YACReaderLibrary/yacreaderlibrary_tr.ts +++ b/YACReaderLibrary/yacreaderlibrary_tr.ts @@ -297,7 +297,7 @@ EmptyReadingListWidget - This reading list doesn't cotain comics yet + This reading list doesn't contain comics yet @@ -1048,7 +1048,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k İlk kütüphaneni oluştur - You don't have any librarires yet + You don't have any libraries yet Henüz bir kütüphaneye sahip değilsin @@ -1087,7 +1087,7 @@ YACReaderLibrary will not stop you from creating more libraries but you should k - Use selectec comic cover as background + Use selected comic cover as background