Hello community, here is the log from the commit of package gwenview5 for openSUSE:Factory checked in at 2018-06-13 15:19:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenview5 (Old) and /work/SRC/openSUSE:Factory/.gwenview5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwenview5" Wed Jun 13 15:19:07 2018 rev:36 rq:615475 version:18.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gwenview5/gwenview5.changes 2018-05-16 11:27:27.267150883 +0200 +++ /work/SRC/openSUSE:Factory/.gwenview5.new/gwenview5.changes 2018-06-13 15:19:09.533186829 +0200 @@ -1,0 +2,16 @@ +Fri Jun 08 05:06:36 UTC 2018 - [email protected] + +- Update to 18.04.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.2.php +- Changes since 18.04.1: + * Fix share menu not showing the first time it is used + * Watch for installation of kipi-plugins only when needed + * Update thumbnail de-/select hover button on selection change (kde#394406) + * Update paste action on current directory and selection changes (kde#276255) + * Cleanup code for finishing undo/redo of image operations + * Enable redo for undone image operations + * Disable View mode shortcuts outside of View mode + +------------------------------------------------------------------- Old: ---- gwenview-18.04.1.tar.xz New: ---- gwenview-18.04.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview5.spec ++++++ --- /var/tmp/diff_new_pack.0w30kX/_old 2018-06-13 15:19:10.305158661 +0200 +++ /var/tmp/diff_new_pack.0w30kX/_new 2018-06-13 15:19:10.309158515 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: gwenview5 -Version: 18.04.1 +Version: 18.04.2 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ gwenview-18.04.1.tar.xz -> gwenview-18.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/CMakeLists.txt new/gwenview-18.04.2/CMakeLists.txt --- old/gwenview-18.04.1/CMakeLists.txt 2018-05-08 02:11:13.000000000 +0200 +++ new/gwenview-18.04.2/CMakeLists.txt 2018-06-05 02:29:19.000000000 +0200 @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "18") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(gwenview VERSION ${KDE_APPLICATIONS_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/app/fileopscontextmanageritem.cpp new/gwenview-18.04.2/app/fileopscontextmanageritem.cpp --- old/gwenview-18.04.1/app/fileopscontextmanageritem.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/app/fileopscontextmanageritem.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -215,7 +215,6 @@ connect(QApplication::clipboard(), SIGNAL(dataChanged()), SLOT(updatePasteAction())); - updatePasteAction(); // Delay action update because it must happen *after* main window has called // createGUI(), otherwise calling mXMLGUIClient->plugActionList() will @@ -257,6 +256,7 @@ mXMLGUIClient->plugActionList("file_action_list", list); updateSideBarContent(); + updatePasteAction(); } void FileOpsContextManagerItem::updatePasteAction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/app/kipiexportaction.cpp new/gwenview-18.04.2/app/kipiexportaction.cpp --- old/gwenview-18.04.1/app/kipiexportaction.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/app/kipiexportaction.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -104,11 +104,11 @@ } // We are done, don't come back next time menu is shown disconnect(menu(), SIGNAL(aboutToShow()), this, SLOT(init())); + d->updateMenu(); } else { // Loading is in progress, come back when it is done connect(d->mKIPIInterface, &KIPIInterface::loadingFinished, this, &KIPIExportAction::init); } - d->updateMenu(); } void KIPIExportAction::setDefaultAction(QAction* action) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/app/kipiinterface.cpp new/gwenview-18.04.2/app/kipiinterface.cpp --- old/gwenview-18.04.1/app/kipiinterface.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/app/kipiinterface.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -344,10 +344,11 @@ if (KIO::DesktopExecParser::hasSchemeHandler(QUrl(KIPI_PLUGINS_URL))) { d->mPluginMenu->addAction(d->mInstallPluginAction); d->mInstallPluginAction->setEnabled(true); - QObject::connect(d->mInstallPluginAction, &QAction::triggered, - this, [=](){QDesktopServices::openUrl(QUrl(KIPI_PLUGINS_URL));}); - d->mPluginWatcher.addPaths(QCoreApplication::libraryPaths()); - connect(&d->mPluginWatcher, &QFileSystemWatcher::directoryChanged, this, &KIPIInterface::packageFinished); + QObject::connect(d->mInstallPluginAction, &QAction::triggered, this, [&](){ + QDesktopServices::openUrl(QUrl(KIPI_PLUGINS_URL)); + d->mPluginWatcher.addPaths(QCoreApplication::libraryPaths()); + connect(&d->mPluginWatcher, &QFileSystemWatcher::directoryChanged, this, &KIPIInterface::packageFinished); + }); } else { d->mPluginMenu->addAction(d->mNoPluginAction); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/app/org.kde.gwenview.appdata.xml new/gwenview-18.04.2/app/org.kde.gwenview.appdata.xml --- old/gwenview-18.04.1/app/org.kde.gwenview.appdata.xml 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/app/org.kde.gwenview.appdata.xml 2018-06-03 08:10:57.000000000 +0200 @@ -92,7 +92,7 @@ <p xml:lang="fi">Gwenview on KDE:n nopea ja helppokäyttöinen kuvakatselin, joka on ihanteellinen kuvakokoelmien selaukseen ja esittämiseen.</p> <p xml:lang="fr">Gwenview est un afficheur d'images rapide et facile à utiliser pour KDE, idéal pour parcourir et afficher une collection d'images.</p> <p xml:lang="gl">Gwenview é un visor de imaxes por KDE rápido e doado de utilizar, ideal para examinar e mostrar unha colección de imaxes.</p> - <p xml:lang="id">Gwenview adalah cepat dan mudah untuk penggunaan penampil citra oleh KDE, sangat baik untuk menelusuri dan menayangkan citra dari sebuah koleksi.</p> + <p xml:lang="id">Gwenview adalah cepat dan mudah untuk penggunaan penampil citra oleh KDE, sangat baik untuk menelusuri dan menampilkan citra dari sebuah koleksi.</p> <p xml:lang="it">Gwenview è un visore di immagini veloce e semplice da usare di KDE, ideale per sfogliare e visualizzare una collezione di immagini.</p> <p xml:lang="ko">Gwenview는 KDE의 빠르고 사용하기 편한 그림 뷰어입니다.</p> <p xml:lang="nl">Gwenview is een snelle en gemakkelijk te gebruiken viewer voor afbeeldingen door KDE, ideaal voor bladeren door en weergeven van een verzameling afbeeldingen.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/app/viewmainpage.cpp new/gwenview-18.04.2/app/viewmainpage.cpp --- old/gwenview-18.04.1/app/viewmainpage.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/app/viewmainpage.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -724,7 +724,7 @@ void ViewMainPage::reset() { - d->mDocumentViewController->setView(0); + d->mDocumentViewController->reset(); d->mDocumentViewContainer->reset(); d->mDocumentViews.clear(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/abstractimageoperation.cpp new/gwenview-18.04.2/lib/abstractimageoperation.cpp --- old/gwenview-18.04.1/lib/abstractimageoperation.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/abstractimageoperation.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -52,6 +52,11 @@ mOp->undo(); } + void redo() override + { + mOp->redo(); + } + private: AbstractImageOperation* mOp; }; @@ -60,6 +65,7 @@ { QString mText; QUrl mUrl; + ImageOperationCommand* mCommand; }; AbstractImageOperation::AbstractImageOperation() @@ -75,7 +81,11 @@ void AbstractImageOperation::applyToDocument(Document::Ptr doc) { d->mUrl = doc->url(); - redo(); + + d->mCommand = new ImageOperationCommand(this); + d->mCommand->setText(d->mText); + // QUndoStack::push() executes command by calling its redo() function + doc->undoStack()->push(d->mCommand); } Document::Ptr AbstractImageOperation::document() const @@ -88,12 +98,15 @@ void AbstractImageOperation::finish(bool ok) { if (ok) { - ImageOperationCommand* command = new ImageOperationCommand(this); - command->setText(d->mText); - document()->undoStack()->push(command); - document()->imageOperationCompleted(); + // Give QUndoStack time to update in case the redo/undo is executed immediately + // (e.g. undo crop just sets the previous image) + QTimer::singleShot(0, document().data(), &Document::imageOperationCompleted); } else { - deleteLater(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) + // Remove command from undo stack without executing undo() + d->mCommand->setObsolete(true); +#endif + document()->undoStack()->undo(); } } @@ -102,13 +115,6 @@ finish(job->error() == KJob::NoError); } -void AbstractImageOperation::finishUndoJob() -{ - // Give QUndoStack time to update in case the undo is executed immediately - // (e.g. undo crop just sets the previous image) - QTimer::singleShot(0, document().data(), &Document::imageOperationCompleted); -} - void AbstractImageOperation::setText(const QString& text) { d->mText = text; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/abstractimageoperation.h new/gwenview-18.04.2/lib/abstractimageoperation.h --- old/gwenview-18.04.1/lib/abstractimageoperation.h 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/abstractimageoperation.h 2018-06-03 08:10:57.000000000 +0200 @@ -58,8 +58,6 @@ void applyToDocument(Document::Ptr); Document::Ptr document() const; - void finishUndoJob(); - protected: virtual void redo() = 0; virtual void undo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/crop/cropimageoperation.cpp new/gwenview-18.04.2/lib/crop/cropimageoperation.cpp --- old/gwenview-18.04.1/lib/crop/cropimageoperation.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/crop/cropimageoperation.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -89,7 +89,7 @@ return; } document()->editor()->setImage(d->mOriginalImage); - finishUndoJob(); + finish(true); } } // namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/documentview/documentviewcontroller.cpp new/gwenview-18.04.2/lib/documentview/documentviewcontroller.cpp --- old/gwenview-18.04.1/lib/documentview/documentviewcontroller.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/documentview/documentviewcontroller.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -273,6 +273,12 @@ } } +void DocumentViewController::reset() +{ + setView(0); + d->updateActions(); +} + void DocumentViewController::setToolContainer(SlideContainer* container) { d->mToolContainer = container; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/documentview/documentviewcontroller.h new/gwenview-18.04.2/lib/documentview/documentviewcontroller.h --- old/gwenview-18.04.1/lib/documentview/documentviewcontroller.h 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/documentview/documentviewcontroller.h 2018-06-03 08:10:57.000000000 +0200 @@ -60,6 +60,8 @@ void setToolContainer(SlideContainer* container); + void reset(); + private Q_SLOTS: void slotAdapterChanged(); void updateZoomToFitActionFromView(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/redeyereduction/redeyereductionimageoperation.cpp new/gwenview-18.04.2/lib/redeyereduction/redeyereductionimageoperation.cpp --- old/gwenview-18.04.1/lib/redeyereduction/redeyereductionimageoperation.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/redeyereduction/redeyereductionimageoperation.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -104,7 +104,7 @@ painter.drawImage(rect.topLeft(), d->mOriginalImage); } document()->editor()->setImage(img); - finishUndoJob(); + finish(true); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/resize/resizeimageoperation.cpp new/gwenview-18.04.2/lib/resize/resizeimageoperation.cpp --- old/gwenview-18.04.1/lib/resize/resizeimageoperation.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/resize/resizeimageoperation.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -89,7 +89,7 @@ return; } document()->editor()->setImage(d->mOriginalImage); - finishUndoJob(); + finish(true); } } // namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/thumbnailview/previewitemdelegate.cpp new/gwenview-18.04.2/lib/thumbnailview/previewitemdelegate.cpp --- old/gwenview-18.04.1/lib/thumbnailview/previewitemdelegate.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/thumbnailview/previewitemdelegate.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -599,6 +599,9 @@ SLOT(slotRowsChanged())); connect(view, SIGNAL(rowsInsertedSignal(QModelIndex,int,int)), SLOT(slotRowsChanged())); + connect(view, &ThumbnailView::selectionChangedSignal, [this]() { + d->updateToggleSelectionButton(); + }); #ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE d->mRatingPainter.setAlignment(Qt::AlignHCenter | Qt::AlignBottom); @@ -883,7 +886,6 @@ void PreviewItemDelegate::slotToggleSelectionClicked() { d->mView->selectionModel()->select(d->mIndexUnderCursor, QItemSelectionModel::Toggle); - d->updateToggleSelectionButton(); } PreviewItemDelegate::ThumbnailDetails PreviewItemDelegate::thumbnailDetails() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/thumbnailview/thumbnailbarview.cpp new/gwenview-18.04.2/lib/thumbnailview/thumbnailbarview.cpp --- old/gwenview-18.04.1/lib/thumbnailview/thumbnailbarview.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/thumbnailview/thumbnailbarview.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -162,6 +162,10 @@ view->viewport()->setAttribute(Qt::WA_Hover); d->mBorderColor = PaintUtils::alphaAdjustedF(QColor(Qt::white), 0.65); + + connect(view, &ThumbnailView::selectionChangedSignal, [this]() { + d->updateToggleSelectionButton(); + }); } QSize ThumbnailBarItemDelegate::sizeHint(const QStyleOptionViewItem & /*option*/, const QModelIndex & index) const @@ -243,7 +247,6 @@ void ThumbnailBarItemDelegate::toggleSelection() { d->mView->selectionModel()->select(d->mIndexUnderCursor, QItemSelectionModel::Toggle); - d->updateToggleSelectionButton(); } ThumbnailBarItemDelegate::~ThumbnailBarItemDelegate() @@ -510,7 +513,7 @@ void ThumbnailBarView::selectionChanged(const QItemSelection& selected, const QItemSelection& deselected) { - QListView::selectionChanged(selected, deselected); + ThumbnailView::selectionChanged(selected, deselected); QModelIndexList oldList = deselected.indexes(); QModelIndexList newList = selected.indexes(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/lib/transformimageoperation.cpp new/gwenview-18.04.2/lib/transformimageoperation.cpp --- old/gwenview-18.04.1/lib/transformimageoperation.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/lib/transformimageoperation.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -102,9 +102,7 @@ break; } - TransformJob* job = new TransformJob(orientation); - connect(job, &TransformJob::result, this, &AbstractImageOperation::finishUndoJob); - document()->enqueueJob(job); + redoAsDocumentJob(new TransformJob(orientation)); } } // namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/po/cs/gwenview.po new/gwenview-18.04.2/po/cs/gwenview.po --- old/gwenview-18.04.1/po/cs/gwenview.po 2018-05-08 02:11:12.000000000 +0200 +++ new/gwenview-18.04.2/po/cs/gwenview.po 2018-06-05 02:29:11.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: gwenview\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-22 06:28+0200\n" -"PO-Revision-Date: 2018-02-06 14:33+0100\n" +"PO-Revision-Date: 2018-05-31 16:24+0100\n" "Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" @@ -552,7 +552,7 @@ #: app/generalconfigpage.ui:135 #, kde-format msgid "All buttons" -msgstr "" +msgstr "Všechna tlačítka" #. i18n: ectx: property (text), widget (QRadioButton, selectionOnlyThumbnailActionsRadioButton) #: app/generalconfigpage.ui:142 @@ -1386,7 +1386,7 @@ #, kde-format msgctxt "@action Recent Folders view" msgid "Forget All Folders" -msgstr "" +msgstr "Zapomenout všechny složky" #: app/startmainpage.cpp:282 #, kde-format @@ -1398,13 +1398,13 @@ #, kde-format msgctxt "@action Recent Files view" msgid "Forget This File" -msgstr "" +msgstr "Zapomenout tento soubor" #: app/startmainpage.cpp:284 #, kde-format msgctxt "@action Recent Files view" msgid "Forget All Files" -msgstr "" +msgstr "Zapomenout všechny soubory" #. i18n: ectx: property (text), widget (QLabel, mHistoryDisabledLabel) #: app/startmainpage.ui:34 @@ -1782,7 +1782,7 @@ #: lib/crop/cropwidget.cpp:193 lib/crop/cropwidget.cpp:200 #, kde-format msgid "ISO (A4, A3...)" -msgstr "" +msgstr "ISO (A4, A3...)" #: lib/crop/cropwidget.cpp:194 lib/crop/cropwidget.cpp:201 #, kde-format @@ -1936,7 +1936,7 @@ "@action:button Zoom to fill (fit width or height), shown in status bar, keep " "it short please" msgid "Fill" -msgstr "" +msgstr "Vyplnit" #: lib/documentview/documentviewcontroller.cpp:112 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/po/id/gwenview.po new/gwenview-18.04.2/po/id/gwenview.po --- old/gwenview-18.04.1/po/id/gwenview.po 2018-05-08 02:11:12.000000000 +0200 +++ new/gwenview-18.04.2/po/id/gwenview.po 2018-06-05 02:29:13.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: KDE Frameworks 5 Applications\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-22 06:28+0200\n" -"PO-Revision-Date: 2018-04-16 08:17+0700\n" +"PO-Revision-Date: 2018-05-31 22:01+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -340,7 +340,7 @@ #, kde-format msgctxt "Verb" msgid "Trash" -msgstr "Tong Sampah" +msgstr "Sesampahan" #: app/fileopscontextmanageritem.cpp:171 #, kde-format @@ -1493,7 +1493,7 @@ msgid "One document has been skipped because it had already been imported." msgid_plural "" "%1 documents have been skipped because they had already been imported." -msgstr[0] "%1 dokumen telah dilewati karena mereka telah diimpor." +msgstr[0] "%1 dokumen telah dilewatkan karena mereka telah diimpor." #: importer/importdialog.cpp:87 #, kde-format @@ -1517,14 +1517,14 @@ #, kde-format msgid "Delete the skipped document from the device?" msgid_plural "Delete the %1 skipped documents from the device?" -msgstr[0] "Hapus %1 dokumen terlewat dari perangkat?" +msgstr[0] "Hapus %1 dokumen terlewatkan dari perangkat?" #: importer/importdialog.cpp:107 #, kde-format msgctxt "Singular sentence is actually never used." msgid "Delete the imported or skipped document from the device?" msgid_plural "Delete the %1 imported and skipped documents from the device?" -msgstr[0] "Hapus %1 dokumen terimpor dan terlewat dari perangkat?" +msgstr[0] "Hapus %1 dokumen terimpor dan terlewatkan dari perangkat?" #: importer/importdialog.cpp:114 #, kde-format @@ -1638,7 +1638,7 @@ msgid "" "The device UDI, used to retrieve information about the device (name, icon...)" msgstr "" -"Peranti UDI, digunakan untuk menerima informasi tentang (nama, ikon...) " +"Perangkat UDI, digunakan untuk menerima informasi tentang (nama, ikon...) " "perangkat" #: importer/main.cpp:56 @@ -1664,7 +1664,7 @@ #: importer/main.cpp:74 #, kde-format msgid "Invalid source folder." -msgstr "Folder sumber tidak sah." +msgstr "Folder sumber tidak absah." #. i18n: ectx: property (text), widget (QLabel, label) #: importer/progresspage.ui:30 @@ -1858,7 +1858,7 @@ #, kde-format msgctxt "@info:tooltip" msgid "Trash" -msgstr "Tong Sampah" +msgstr "Sesampahan" #: lib/documentview/documentview.cpp:190 #, kde-format @@ -1937,9 +1937,10 @@ " load. We exclude *.new as well because this is the extension\n" " used for temporary files by KSaveFile." msgstr "" -"Ekstensi file nama yang tidak harus dicoba untuk\n" -"dimuat Gwenview. Kamu mengecualikan *.new juga karena merupakan ekstensi\n" -"yang pernah dipakai untuk file temporer KSaveFile." +"Sebuah daftar ekstensi nama file yang seharusnya Gwenview tidak coba untuk\n" +" memuatnya. Kami mengecualikan *.new juga karena merupakan " +"ekstensi\n" +" yang pernah digunakan untuk file temporer oleh KSaveFile." #. i18n: ectx: whatsthis, entry (ZoomMode), group (ImageView) #: lib/gwenviewconfig.kcfg:177 @@ -1964,7 +1965,7 @@ " semua citra berbagi perbesaran dan posisi yang sama: citra B " "disetel ke\n" " parameter perbesaran yang sama sebagai citra A (dan jika mereka\n" -" diubah, citra A kemudian akan ditayangkan dengan perbesaran\n" +" diubah, citra A kemudian akan ditampilkan dengan perbesaran\n" " dan posisi yang baru). Jika disetel ke Individual, semua citra " "mengingat\n" " perbesaran dan posisi mereka: citra B telah secara inisial " @@ -1973,7 +1974,7 @@ "namun\n" " kemudian akan mengingat perbesaran dan posisinya (jika tidak " "diubah, citra A\n" -" TIDAK akan ditayangkan dengan perbesaran dan posisi baru)." +" TIDAK akan ditampilkan dengan perbesaran dan posisi baru)." #. i18n: ectx: whatsthis, entry (RenderingIntent), group (ImageView) #: lib/gwenviewconfig.kcfg:191 @@ -1993,14 +1994,14 @@ " pas dengan gamut warna profil. \"Persepsi\" akan menskala\n" " warna seluruh citra sehingga semuanya pas dengan kemampuan\n" " tayang. \"Relatif\" hanya akan menipiskan warna yang tidak dapat " -"ditayangkan,\n" +"ditampilkan,\n" " dan meninggalkan warna lain sendirian." #. i18n: ectx: label, entry (random), group (slide show) #: lib/gwenviewconfig.kcfg:272 #, kde-format msgid "Display slide show images in random order" -msgstr "Tayangkan slidshow citra dalam urutan acak" +msgstr "Tampilkan slidshow citra dalam urutan acak" #. i18n: ectx: label, entry (fullscreen), group (slide show) #: lib/gwenviewconfig.kcfg:276 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/po/nn/gwenview.po new/gwenview-18.04.2/po/nn/gwenview.po --- old/gwenview-18.04.1/po/nn/gwenview.po 2018-05-08 02:11:12.000000000 +0200 +++ new/gwenview-18.04.2/po/nn/gwenview.po 2018-06-05 02:29:14.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: gwenview\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-22 06:28+0200\n" -"PO-Revision-Date: 2018-01-30 22:26+0100\n" +"PO-Revision-Date: 2018-05-16 21:23+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -72,7 +72,7 @@ #: app/advancedconfigpage.ui:127 #, kde-format msgid "Rendering intent:" -msgstr "" +msgstr "Fargeframstilling:" #. i18n: ectx: property (text), widget (QRadioButton, perceptualRenderingIntentRadioButton) #: app/advancedconfigpage.ui:142 @@ -88,6 +88,8 @@ "Scale all colors equally to fit them within the active color profile's color " "gamut" msgstr "" +"Skaler alle fargane likt for å få plass til dei i fargespennet til den " +"aktive fargeprofilen." #. i18n: ectx: property (text), widget (QRadioButton, relativeRenderingIntentRadioButton) #: app/advancedconfigpage.ui:182 @@ -103,6 +105,8 @@ "Squash colors that don't fit within the active color profile's color gamut, " "leaving other colors untouched" msgstr "" +"Avgrens fargar som ikkje får plass i fargespennet til den aktive " +"fargeprofilen, men ikkje endra andre fargar." # unreviewed-context #: app/browsemainpage.cpp:134 app/mainwindow.cpp:363 app/viewmainpage.cpp:407 @@ -544,19 +548,19 @@ #: app/generalconfigpage.ui:128 #, kde-format msgid "Thumbnail actions:" -msgstr "" +msgstr "Handlingar for miniatyrbilete:" #. i18n: ectx: property (text), widget (QRadioButton, allButtonsThumbnailActionsRadioButton) #: app/generalconfigpage.ui:135 #, kde-format msgid "All buttons" -msgstr "" +msgstr "Alle knappar" #. i18n: ectx: property (text), widget (QRadioButton, selectionOnlyThumbnailActionsRadioButton) #: app/generalconfigpage.ui:142 #, kde-format msgid "Show selection button only" -msgstr "" +msgstr "Vis berre utvalsknapp" #. i18n: ectx: property (text), widget (QRadioButton, noneThumbnailActionsRadioButton) #. i18n: ectx: property (text), widget (QRadioButton, noAnimationRadioButton) @@ -742,7 +746,7 @@ #: app/imageviewconfigpage.ui:199 #, kde-format msgid "Zoom mode:" -msgstr "Førringsmodus:" +msgstr "Forstørringsmodus:" #. i18n: ectx: property (text), widget (QRadioButton, autofitZoomModeRadioButton) #: app/imageviewconfigpage.ui:214 @@ -993,7 +997,7 @@ #, kde-format msgctxt "@action Open Recent menu" msgid "Forget All Files && Folders" -msgstr "" +msgstr "Alle filer og mapper" #: app/mainwindow.cpp:380 #, kde-format @@ -1150,12 +1154,12 @@ #: app/mainwindow.cpp:1436 #, kde-format msgid "Pause Slideshow" -msgstr "" +msgstr "Pausa lysbiletvising" #: app/mainwindow.cpp:1439 #, kde-format msgid "Resume Slideshow" -msgstr "" +msgstr "Hald fram lysbiletvising" #: app/mainwindow.cpp:1440 #, kde-format @@ -1218,7 +1222,7 @@ #, kde-format msgctxt "@action:button" msgid "Rename" -msgstr "" +msgstr "Endra namn" #: app/renamedialog.cpp:63 #, kde-kuit-format @@ -1367,37 +1371,37 @@ #, kde-format msgctxt "@action Recent Folders view" msgid "Add Folder to Places" -msgstr "" +msgstr "Legg mappa til i «Stadar»" #: app/startmainpage.cpp:279 #, kde-format msgctxt "@action Recent Folders view" msgid "Forget This Folder" -msgstr "" +msgstr "Gløym denne mappa" #: app/startmainpage.cpp:280 #, kde-format msgctxt "@action Recent Folders view" msgid "Forget All Folders" -msgstr "" +msgstr "Gløym alle mappene" #: app/startmainpage.cpp:282 #, kde-format msgctxt "@action Recent Files view" msgid "Add Containing Folder to Places" -msgstr "" +msgstr "Legg foreldermappa til «Stadar»" #: app/startmainpage.cpp:283 #, kde-format msgctxt "@action Recent Files view" msgid "Forget This File" -msgstr "" +msgstr "Gløym denne fila" #: app/startmainpage.cpp:284 #, kde-format msgctxt "@action Recent Files view" msgid "Forget All Files" -msgstr "" +msgstr "Gløym alle filer" #. i18n: ectx: property (text), widget (QLabel, mHistoryDisabledLabel) #: app/startmainpage.ui:34 @@ -1748,7 +1752,7 @@ #: lib/crop/cropwidget.cpp:183 #, kde-format msgid "Current Image" -msgstr "" +msgstr "Gjeldande bilete" #: lib/crop/cropwidget.cpp:186 #, kde-format @@ -1768,7 +1772,7 @@ #: lib/crop/cropwidget.cpp:193 lib/crop/cropwidget.cpp:200 #, kde-format msgid "ISO (A4, A3...)" -msgstr "" +msgstr "ISO (A4, A3, …)" # skip-rule: klammeform #: lib/crop/cropwidget.cpp:194 lib/crop/cropwidget.cpp:201 @@ -1821,7 +1825,7 @@ #: lib/crop/cropwidget.ui:166 #, kde-format msgid "Preserve aspect ratio" -msgstr "" +msgstr "Hald fast breidd/høgd-forhold" #: lib/document/document.cpp:304 #, kde-format @@ -1904,7 +1908,7 @@ #: lib/documentview/documentviewcontroller.cpp:96 #, kde-format msgid "Zoom to fit" -msgstr "" +msgstr "Forstørr til ledig plass" #: lib/documentview/documentviewcontroller.cpp:98 #, kde-format @@ -1915,7 +1919,7 @@ #: lib/documentview/documentviewcontroller.cpp:104 #, kde-format msgid "Zoom to fill window by fitting to width or height" -msgstr "" +msgstr "Forstørr til å fylla vindauget i breidda eller høgda" #: lib/documentview/documentviewcontroller.cpp:106 #, kde-format @@ -1923,7 +1927,7 @@ "@action:button Zoom to fill (fit width or height), shown in status bar, keep " "it short please" msgid "Fill" -msgstr "" +msgstr "Fyll" #: lib/documentview/documentviewcontroller.cpp:112 #, kde-format @@ -2009,6 +2013,16 @@ "colors\n" " that cannot be displayed, and leave the other colors alone." msgstr "" +"Avgjer korleis fargar skal visast når skjermen brukar ein ICC-fargeprofil\n" +" og eit bilete inneheld fargar som ikkje får plass i fargespennet " +"til\n" +" profilen. «Perseptuell» vil skalera alle fargane til biletet " +"likt og\n" +" slik at dei får plass i fargespennet. «Relativ» vil berre berre " +"avgrensa\n" +" dei fargane som ikkje får plass i fargespennet og vil la dei " +"andre\n" +" verta verande slik dei er." #. i18n: ectx: label, entry (random), group (slide show) #: lib/gwenviewconfig.kcfg:272 @@ -2045,24 +2059,26 @@ #, kde-format msgid "Restrict crop to image ratio when Advanced Settings disabled" msgstr "" +"Avgrens avskjering til breidd/høgd-forholdet når avanserte innstillingar er " +"slått av" #. i18n: ectx: label, entry (CropRatioIndex), group (Crop) #: lib/gwenviewconfig.kcfg:308 #, kde-format msgid "Index representing selected ratio in the Advanced settings combobox" -msgstr "" +msgstr "Indeksen representerer det forholdet valt i avanserte innstillingar" #. i18n: ectx: label, entry (CropRatioWidth), group (Crop) #: lib/gwenviewconfig.kcfg:312 #, kde-format msgid "Last used crop ratio width when Advanced Settings enabled" -msgstr "" +msgstr "Sist brukte relativ breidd når avanserte innstillingar er på" #. i18n: ectx: label, entry (CropRatioHeight), group (Crop) #: lib/gwenviewconfig.kcfg:316 #, kde-format msgid "Last used crop ratio height when Advanced Settings enabled" -msgstr "" +msgstr "Sist brukte relativ høgd når avanserte innstillingar er på" #: lib/historymodel.cpp:148 #, kde-format @@ -2264,7 +2280,7 @@ #: lib/resize/resizeimagewidget.ui:88 #, kde-format msgid "New Size:" -msgstr "" +msgstr "Ny storleik:" #. i18n: ectx: property (text), widget (QCheckBox, mKeepAspectCheckBox) #: lib/resize/resizeimagewidget.ui:129 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/po/pt_BR/gwenview.po new/gwenview-18.04.2/po/pt_BR/gwenview.po --- old/gwenview-18.04.1/po/pt_BR/gwenview.po 2018-05-08 02:11:12.000000000 +0200 +++ new/gwenview-18.04.2/po/pt_BR/gwenview.po 2018-06-05 02:29:14.000000000 +0200 @@ -13,9 +13,9 @@ "Project-Id-Version: gwenview\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-22 06:28+0200\n" -"PO-Revision-Date: 2018-03-05 22:43-0300\n" -"Last-Translator: Frederico Gonçalves Guimarães <[email protected]>\n" -"Language-Team: Portuguese <[email protected]>\n" +"PO-Revision-Date: 2018-06-02 01:43-0300\n" +"Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" +"Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -993,11 +993,10 @@ msgstr "Um arquivo inicial ou pastas" #: app/mainwindow.cpp:373 -#, fuzzy, kde-format -#| msgid "Forget this Folder" +#, kde-format msgctxt "@action Open Recent menu" msgid "Forget All Files && Folders" -msgstr "Omitir esta pasta" +msgstr "Omitir todas os arquivos e pastas" #: app/mainwindow.cpp:380 #, kde-format @@ -1151,16 +1150,14 @@ msgstr "Abrir imagem" #: app/mainwindow.cpp:1436 -#, fuzzy, kde-format -#| msgid "Slideshow" +#, kde-format msgid "Pause Slideshow" -msgstr "Apresentação de slides" +msgstr "Pausar apresentação de slides" #: app/mainwindow.cpp:1439 -#, fuzzy, kde-format -#| msgid "Slideshow" +#, kde-format msgid "Resume Slideshow" -msgstr "Apresentação de slides" +msgstr "Continuar apresentação de slides" #: app/mainwindow.cpp:1440 #, kde-format @@ -1369,26 +1366,22 @@ msgstr "Descrição" #: app/startmainpage.cpp:278 -#, fuzzy, kde-format -#| msgctxt "@action:inmenu" -#| msgid "Add Folder to Places" +#, kde-format msgctxt "@action Recent Folders view" msgid "Add Folder to Places" msgstr "Adicionar pasta aos Locais" #: app/startmainpage.cpp:279 -#, fuzzy, kde-format -#| msgid "Forget this Folder" +#, kde-format msgctxt "@action Recent Folders view" msgid "Forget This Folder" msgstr "Omitir esta pasta" #: app/startmainpage.cpp:280 -#, fuzzy, kde-format -#| msgid "Forget this Folder" +#, kde-format msgctxt "@action Recent Folders view" msgid "Forget All Folders" -msgstr "Omitir esta pasta" +msgstr "Omitir todas as pasta" #: app/startmainpage.cpp:282 #, fuzzy, kde-format @@ -1399,18 +1392,16 @@ msgstr "Adicionar pasta aos Locais" #: app/startmainpage.cpp:283 -#, fuzzy, kde-format -#| msgid "Forget this Folder" +#, kde-format msgctxt "@action Recent Files view" msgid "Forget This File" -msgstr "Omitir esta pasta" +msgstr "Omitir este arquivo" #: app/startmainpage.cpp:284 -#, fuzzy, kde-format -#| msgid "Forget All" +#, kde-format msgctxt "@action Recent Files view" msgid "Forget All Files" -msgstr "Omitir tudo" +msgstr "Omitir todos os arquivos" #. i18n: ectx: property (text), widget (QLabel, mHistoryDisabledLabel) #: app/startmainpage.ui:34 @@ -1761,10 +1752,9 @@ msgstr "Desenvolvedor" #: lib/crop/cropwidget.cpp:183 -#, fuzzy, kde-format -#| msgid "Print Image" +#, kde-format msgid "Current Image" -msgstr "Imprimir imagem" +msgstr "Imagem atual" #: lib/crop/cropwidget.cpp:186 #, kde-format @@ -1782,10 +1772,9 @@ msgstr "Paisagem" #: lib/crop/cropwidget.cpp:193 lib/crop/cropwidget.cpp:200 -#, fuzzy, kde-format -#| msgid "ISO Size (A4, A3...)" +#, kde-format msgid "ISO (A4, A3...)" -msgstr "Tamanho ISO (A4, A3...)" +msgstr "ISO (A4, A3...)" #: lib/crop/cropwidget.cpp:194 lib/crop/cropwidget.cpp:201 #, kde-format @@ -1818,10 +1807,9 @@ # TRADUÇÃO REDUZIDA PARA MELHOR ADAPTAÇÃO AO DIÁLOGO. #. i18n: ectx: property (text), widget (QLabel, label_6) #: lib/crop/cropwidget.ui:55 -#, fuzzy, kde-format -#| msgid "Keep aspect ratio" +#, kde-format msgid "Aspect ratio:" -msgstr "Manter proporção" +msgstr "Taxa de proporção:" #. i18n: ectx: property (text), widget (QLabel, label) #: lib/crop/cropwidget.ui:84 @@ -1838,10 +1826,9 @@ # TRADUÇÃO REDUZIDA PARA MELHOR ADAPTAÇÃO AO DIÁLOGO. #. i18n: ectx: property (text), widget (QCheckBox, preserveAspectRatioCheckBox) #: lib/crop/cropwidget.ui:166 -#, fuzzy, kde-format -#| msgid "Keep aspect ratio" +#, kde-format msgid "Preserve aspect ratio" -msgstr "Manter proporção" +msgstr "Manter taxa de proporção" #: lib/document/document.cpp:304 #, kde-format @@ -2251,9 +2238,7 @@ #. i18n: ectx: property (text), widget (QLabel, label) #: lib/redeyereduction/redeyereductionwidget.ui:24 -#, fuzzy, kde-format -#| msgctxt "@addAction:inmenu" -#| msgid "Size" +#, kde-format msgid "Size" msgstr "Tamanho" @@ -2289,10 +2274,9 @@ #. i18n: ectx: property (text), widget (QLabel, label_2) #: lib/resize/resizeimagewidget.ui:88 -#, fuzzy, kde-format -#| msgid "New Si&ze:" +#, kde-format msgid "New Size:" -msgstr "Novo &tamanho:" +msgstr "Novo tamanho:" # TRADUÇÃO REDUZIDA PARA MELHOR ADAPTAÇÃO AO DIÁLOGO. #. i18n: ectx: property (text), widget (QCheckBox, mKeepAspectCheckBox) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/po/sr/gwenview.po new/gwenview-18.04.2/po/sr/gwenview.po --- old/gwenview-18.04.1/po/sr/gwenview.po 2018-05-08 02:11:12.000000000 +0200 +++ new/gwenview-18.04.2/po/sr/gwenview.po 2018-06-05 02:29:15.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gwenview\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-03-23 06:05+0100\n" +"POT-Creation-Date: 2018-04-22 06:28+0200\n" "PO-Revision-Date: 2017-10-30 23:08+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -106,7 +106,7 @@ "leaving other colors untouched" msgstr "" -#: app/browsemainpage.cpp:134 app/mainwindow.cpp:363 app/viewmainpage.cpp:404 +#: app/browsemainpage.cpp:134 app/mainwindow.cpp:363 app/viewmainpage.cpp:407 #: lib/documentview/documentviewcontroller.cpp:90 #, kde-format msgctxt "@title actions category - means actions changing smth in interface" @@ -598,50 +598,40 @@ msgid "None" msgstr "никакве" -#: app/gvcore.cpp:74 +#: app/gvcore.cpp:72 #, kde-format msgctxt "@title:window" msgid "Save Image" msgstr "Уписивање слике" -#: app/gvcore.cpp:106 +#: app/gvcore.cpp:104 #, kde-format msgctxt "@info" msgid "Gwenview cannot save images as %1." msgstr "Гвенвју не може да сачува слике као %1." -#: app/gvcore.cpp:341 +#: app/gvcore.cpp:339 #, kde-format msgid "Save using another format" msgstr "Сачувај у другом формату" -#: app/gvcore.cpp:344 +#: app/gvcore.cpp:342 #, kde-format msgid "Gwenview cannot save images in '%1' format." msgstr "Гвенвју не може да записује слике у формату %1." -#: app/gvcore.cpp:369 -#, kde-kuit-format -msgctxt "@info" -msgid "" -"A file named <filename>%1</filename> already exists.\n" -"Are you sure you want to overwrite it?" -msgstr "" -"Фајл по имену <filename>%1</filename> већ постоји.\n" -"Желите ли заиста да га пребришете?" - -#: app/gvcore.cpp:384 app/gvcore.cpp:407 +#: app/gvcore.cpp:365 app/gvcore.cpp:388 #, kde-kuit-format msgctxt "@info" msgid "<b>Saving <filename>%1</filename> failed:</b><br />%2" msgstr "<b>Неуспешно уписивање <filename>%1</filename>:</b><br />%2" -#: app/gvcore.cpp:427 +#: app/gvcore.cpp:408 #, kde-format msgid "You are now viewing the new document." msgstr "Сада гледате нови документ." -#: app/gvcore.cpp:429 +#: app/gvcore.cpp:410 #, kde-format msgid "Go back to the original" msgstr "Назад на оригинал" @@ -1241,32 +1231,32 @@ msgid "If you quit now, your changes will be lost." msgstr "Ако напустите програм, измене ће бити изгубљене." -#: app/mainwindow.cpp:1661 +#: app/mainwindow.cpp:1666 #, kde-format msgid "You reached the first document, what do you want to do?" msgstr "Досегли сте први документ, шта бисте даље?" -#: app/mainwindow.cpp:1662 app/mainwindow.cpp:1676 +#: app/mainwindow.cpp:1667 app/mainwindow.cpp:1681 #, kde-format msgid "Stay There" msgstr "Стани овде" -#: app/mainwindow.cpp:1663 +#: app/mainwindow.cpp:1668 #, kde-format msgid "Go to the Last Document" msgstr "На последњи документ" -#: app/mainwindow.cpp:1664 app/mainwindow.cpp:1678 +#: app/mainwindow.cpp:1669 app/mainwindow.cpp:1683 #, kde-format msgid "Go Back to the Document List" msgstr "Назад на списак докумената" -#: app/mainwindow.cpp:1675 +#: app/mainwindow.cpp:1680 #, kde-format msgid "You reached the last document, what do you want to do?" msgstr "Досегли сте последњи документ, шта бисте даље?" -#: app/mainwindow.cpp:1677 +#: app/mainwindow.cpp:1682 #, kde-format msgid "Go to the First Document" msgstr "На први документ" @@ -1510,23 +1500,23 @@ "Преглед по ознакама није доступан. Проверите да ли је Непомук правилно " "инсталиран на рачунару." -#: app/viewmainpage.cpp:283 app/viewmainpage.cpp:414 +#: app/viewmainpage.cpp:283 app/viewmainpage.cpp:417 #, kde-format msgid "Synchronize" msgstr "Синхронизуј" -#: app/viewmainpage.cpp:407 +#: app/viewmainpage.cpp:410 #, kde-format msgid "Thumbnail Bar" msgstr "Трака сличица" -#: app/viewmainpage.cpp:707 +#: app/viewmainpage.cpp:710 #, kde-format msgctxt "@action:button" msgid "Discard Changes and Reload" msgstr "Одбаци промене и учитај поново" -#: app/viewmainpage.cpp:709 +#: app/viewmainpage.cpp:712 #, kde-format msgctxt "@info" msgid "" @@ -1930,7 +1920,7 @@ msgid "Preserve aspect ratio" msgstr "Одржи пропорцију" -#: lib/document/document.cpp:305 +#: lib/document/document.cpp:304 #, kde-format msgctxt "@info" msgid "Gwenview cannot save this kind of documents." @@ -1965,8 +1955,9 @@ msgid "Could not load document %1" msgstr "Не могу да учитам документ %1." -#: lib/document/savejob.cpp:107 -#, kde-kuit-format +#. i18n* with markup substitution here, this is done in GvCore::slotSaveResult or SaveAllHelper::slotResult +#: lib/document/savejob.cpp:108 +#, kde-format msgctxt "@info" msgid "" "Could not open file for writing, check that you have the necessary rights in " @@ -1975,7 +1966,7 @@ "Не могу да отворим фајл за писање, проверите да ли имате потребне дозволе за " "<filename>%1</filename>." -#: lib/document/savejob.cpp:132 +#: lib/document/savejob.cpp:135 #, kde-kuit-format msgctxt "@info" msgid "" @@ -1997,12 +1988,12 @@ msgid "Deselect" msgstr "Поништи избор" -#: lib/documentview/documentview.cpp:388 +#: lib/documentview/documentview.cpp:391 #, kde-format msgid "Gwenview does not know how to display this kind of document" msgstr "Гвенвју не зна како да прикаже ову врсту документа." -#: lib/documentview/documentview.cpp:487 +#: lib/documentview/documentview.cpp:493 #, kde-kuit-format msgid "Loading <filename>%1</filename> failed" msgstr "Неуспешно учитавање фајла <filename>%1</filename>." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/po/zh_CN/gwenview.po new/gwenview-18.04.2/po/zh_CN/gwenview.po --- old/gwenview-18.04.1/po/zh_CN/gwenview.po 2018-05-08 02:11:12.000000000 +0200 +++ new/gwenview-18.04.2/po/zh_CN/gwenview.po 2018-06-05 02:29:15.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-22 06:28+0200\n" -"PO-Revision-Date: 2018-04-26 06:10-0400\n" +"PO-Revision-Date: 2018-05-18 06:31-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -1352,7 +1352,7 @@ #, kde-format msgctxt "@action Recent Folders view" msgid "Add Folder to Places" -msgstr "新增要放置的文件夹" +msgstr "将文件夹添加到位置" #: app/startmainpage.cpp:279 #, kde-format @@ -1767,7 +1767,7 @@ #: lib/crop/cropwidget.ui:55 #, kde-format msgid "Aspect ratio:" -msgstr "宽高比：" +msgstr "长宽比：" #. i18n: ectx: property (text), widget (QLabel, label) #: lib/crop/cropwidget.ui:84 @@ -1866,7 +1866,7 @@ #: lib/documentview/documentviewcontroller.cpp:96 #, kde-format msgid "Zoom to fit" -msgstr "缩放以适应" +msgstr "自适应缩放" #: lib/documentview/documentviewcontroller.cpp:98 #, kde-format @@ -2308,4 +2308,4 @@ #: part/gvpart.rc:8 #, kde-format msgid "&View" -msgstr "查看(&V)" +msgstr "视图(&V)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/tests/auto/documenttest.cpp new/gwenview-18.04.2/tests/auto/documenttest.cpp --- old/gwenview-18.04.1/tests/auto/documenttest.cpp 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/tests/auto/documenttest.cpp 2018-06-03 08:10:57.000000000 +0200 @@ -534,6 +534,7 @@ QVERIFY(doc->editor()); TestOperation* op = new TestOperation; op->applyToDocument(doc); + QTest::qWait(100); QVERIFY(doc->isModified()); QCOMPARE(modifiedDocumentListChangedSpy.count(), 1); modifiedDocumentListChangedSpy.clear(); @@ -841,3 +842,66 @@ QTest::qWait(100); QVERIFY(doc->undoStack()->isClean()); } + +void DocumentTest::testUndoRedo() +{ + class SuccessOperation : public AbstractImageOperation + { + public: + int mRedoCount = 0; + int mUndoCount = 0; + + protected: + virtual void redo() + { + mRedoCount++; + finish(true); + } + + virtual void undo() + { + mUndoCount++; + finish(true); + } + }; + + Document::Ptr doc = DocumentFactory::instance()->load(urlForTestFile("orient6.jpg")); + QSignalSpy modifiedSpy(doc.data(), &Document::modified); + QSignalSpy savedSpy(doc.data(), &Document::saved); + + SuccessOperation* op = new SuccessOperation; + QCOMPARE(op->mRedoCount, 0); + QCOMPARE(op->mUndoCount, 0); + + // Apply (redo) operation + op->applyToDocument(doc); + QVERIFY(modifiedSpy.wait()); + QCOMPARE(op->mRedoCount, 1); + QCOMPARE(op->mUndoCount, 0); + QCOMPARE(doc->undoStack()->count(), 1); + QVERIFY(!doc->undoStack()->isClean()); + + // Undo operation + doc->undoStack()->undo(); + QVERIFY(savedSpy.wait()); + QCOMPARE(op->mRedoCount, 1); + QCOMPARE(op->mUndoCount, 1); + QCOMPARE(doc->undoStack()->count(), 1); + QVERIFY(doc->undoStack()->isClean()); + + // Redo operation + doc->undoStack()->redo(); + QVERIFY(modifiedSpy.wait()); + QCOMPARE(op->mRedoCount, 2); + QCOMPARE(op->mUndoCount, 1); + QCOMPARE(doc->undoStack()->count(), 1); + QVERIFY(!doc->undoStack()->isClean()); + + // Undo operation again + doc->undoStack()->undo(); + QVERIFY(savedSpy.wait()); + QCOMPARE(op->mRedoCount, 2); + QCOMPARE(op->mUndoCount, 2); + QCOMPARE(doc->undoStack()->count(), 1); + QVERIFY(doc->undoStack()->isClean()); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-18.04.1/tests/auto/documenttest.h new/gwenview-18.04.2/tests/auto/documenttest.h --- old/gwenview-18.04.1/tests/auto/documenttest.h 2018-05-07 08:57:24.000000000 +0200 +++ new/gwenview-18.04.2/tests/auto/documenttest.h 2018-06-03 08:10:57.000000000 +0200 @@ -129,6 +129,7 @@ void testJobQueue(); void testCheckDocumentEditor(); void testUndoStackPush(); + void testUndoRedo(); void initTestCase(); void init();
