Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2017-02-13 07:40:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2017-01-25 23:14:59.578257138 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2017-02-13 07:40:38.595276325 +0100 @@ -1,0 +2,8 @@ +Thu Feb 9 07:23:05 UTC 2017 - [email protected] + +- Update to KDE Applications 16.12.2 + * KDE Applications 16.12.2 + * https://www.kde.org/announcements/announce-applications-16.12.2.php + + +------------------------------------------------------------------- Old: ---- okular-16.12.1.tar.xz New: ---- okular-16.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.FOoZcS/_old 2017-02-13 07:40:40.059065359 +0100 +++ /var/tmp/diff_new_pack.FOoZcS/_new 2017-02-13 07:40:40.063064783 +0100 @@ -17,10 +17,10 @@ Name: okular -Version: 16.12.1 +Version: 16.12.2 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Document Viewer License: GPL-2.0+ ++++++ okular-16.12.1.tar.xz -> okular-16.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/CMakeLists.txt new/okular-16.12.2/CMakeLists.txt --- old/okular-16.12.1/CMakeLists.txt 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/CMakeLists.txt 2017-02-06 07:51:00.000000000 +0100 @@ -11,7 +11,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -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}") include(ECMInstallIcons) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/autotests/shelltest.cpp new/okular-16.12.2/autotests/shelltest.cpp --- old/okular-16.12.1/autotests/shelltest.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/autotests/shelltest.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -23,6 +23,16 @@ return url; } +static bool fileExist_always_Func( const QString& ) +{ + return true; +} + +static bool fileExist_never_Func( const QString& ) +{ + return false; +} + class ShellTest : public QObject { @@ -42,28 +52,39 @@ void ShellTest::testUrlArgs_data() { QTest::addColumn<QString>( "arg" ); + QTest::addColumn<bool>( "exists" ); QTest::addColumn<QUrl>( "resUrl" ); // local files QTest::newRow( "foo.pdf, exist" ) << "foo.pdf" + << true << makeUrlFromCwd( QStringLiteral("foo.pdf") ); QTest::newRow( "foo.pdf, !exist" ) << "foo.pdf" + << false << makeUrlFromCwd( QStringLiteral("foo.pdf") ); - QTest::newRow( "foo#bar.pdf, !exist" ) + QTest::newRow( "foo#bar.pdf, exist" ) << "foo#bar.pdf" + << true << makeUrlFromCwd( QStringLiteral("foo#bar.pdf") ); + QTest::newRow( "foo#bar.pdf, !exist" ) + << "foo#bar.pdf" + << false + << makeUrlFromCwd( QStringLiteral("foo"), QStringLiteral("bar.pdf") ); QTest::newRow( "foo.pdf#anchor, !exist" ) << "foo.pdf#anchor" + << false << makeUrlFromCwd( QStringLiteral("foo.pdf"), QStringLiteral("anchor") ); QTest::newRow( "#207461" ) << "file:///tmp/file%20with%20spaces.pdf" + << true << QUrl( QStringLiteral("file:///tmp/file%20with%20spaces.pdf") ); // non-local files QTest::newRow( "http://kde.org/foo.pdf"; ) << "http://kde.org/foo.pdf"; + << true << QUrl( QStringLiteral("http://kde.org/foo.pdf";) ); // make sure we don't have a fragment QUrl hashInName( QStringLiteral("http://kde.org";) ); @@ -72,28 +93,33 @@ QVERIFY( hashInName.fragment().isEmpty() ); QTest::newRow( "http://kde.org/foo#bar.pdf"; ) << "http://kde.org/foo#bar.pdf"; + << true << hashInName; QUrl withAnchor( QStringLiteral("http://kde.org/foo.pdf";) ); withAnchor.setFragment( QStringLiteral("anchor") ); QTest::newRow( "http://kde.org/foo.pdf#anchor"; ) << "http://kde.org/foo.pdf#anchor"; + << true << withAnchor; QTest::newRow( "#207461" ) << "http://homepages.inf.ed.ac.uk/mef/file%20with%20spaces.pdf"; + << true << QUrl( QStringLiteral("http://homepages.inf.ed.ac.uk/mef/file%20with%20spaces.pdf";) ); QUrl openOnPage3 = QUrl( QStringLiteral("http://itzsimpl.info/lectures/CG/L2-transformations.pdf";) ); openOnPage3.setFragment( QStringLiteral("3") ); QTest::newRow( "RR124738" ) << "http://itzsimpl.info/lectures/CG/L2-transformations.pdf#3"; + << true << openOnPage3; } void ShellTest::testUrlArgs() { QFETCH( QString, arg ); + QFETCH( bool, exists ); QFETCH( QUrl, resUrl ); qDebug() << "Expected url:" << resUrl << "path =" << resUrl.path() << "fragment =" << resUrl.fragment(); - QUrl url = ShellUtils::urlFromArg( arg ); + QUrl url = ShellUtils::urlFromArg( arg, exists ? fileExist_always_Func : fileExist_never_Func ); QCOMPARE( url, resUrl ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/core/document.cpp new/okular-16.12.2/core/document.cpp --- old/okular-16.12.1/core/document.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/core/document.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -1422,7 +1422,7 @@ o->notifyPageChanged( page, DocumentObserver::Pixmap | DocumentObserver::Annotations ); } -void DocumentPrivate::fontReadingProgress( int page ) +void DocumentPrivate::slotFontReadingProgress( int page ) { emit m_parent->fontReadingProgress( page ); @@ -2800,7 +2800,7 @@ d->m_fontThread = new FontExtractionThread( d->m_generator, pages() ); connect( d->m_fontThread, SIGNAL(gotFont(Okular::FontInfo)), this, SLOT(fontReadingGotFont(Okular::FontInfo)) ); - connect( d->m_fontThread.data(), &FontExtractionThread::progress, this, &Document::fontReadingProgress ); + connect( d->m_fontThread.data(), SIGNAL(progress(int)), this, SLOT(slotFontReadingProgress(int)) ); d->m_fontThread->startExtraction( /*d->m_generator->hasFeature( Generator::Threaded )*/true ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/core/document.h new/okular-16.12.2/core/document.h --- old/okular-16.12.1/core/document.h 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/core/document.h 2017-02-06 07:51:00.000000000 +0100 @@ -588,8 +588,8 @@ NextMatch, ///< Search next match PreviousMatch, ///< Search previous match AllDocument, ///< Search complete document - GoogleAll, ///< Search all words in google style - GoogleAny ///< Search any words in google style + GoogleAll, ///< Search complete document (all words in google style) + GoogleAny ///< Search complete document (any words in google style) }; /** @@ -1117,7 +1117,7 @@ Q_PRIVATE_SLOT( d, void slotTimedMemoryCheck() ) Q_PRIVATE_SLOT( d, void sendGeneratorPixmapRequest() ) Q_PRIVATE_SLOT( d, void rotationFinished( int page, Okular::Page *okularPage ) ) - Q_PRIVATE_SLOT( d, void fontReadingProgress( int page ) ) + Q_PRIVATE_SLOT( d, void slotFontReadingProgress( int page ) ) Q_PRIVATE_SLOT( d, void fontReadingGotFont( const Okular::FontInfo& font ) ) Q_PRIVATE_SLOT( d, void slotGeneratorConfigChanged( const QString& ) ) Q_PRIVATE_SLOT( d, void refreshPixmaps( int ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/core/document_p.h new/okular-16.12.2/core/document_p.h --- old/okular-16.12.1/core/document_p.h 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/core/document_p.h 2017-02-06 07:51:00.000000000 +0100 @@ -150,7 +150,7 @@ void slotTimedMemoryCheck(); void sendGeneratorPixmapRequest(); void rotationFinished( int page, Okular::Page *okularPage ); - void fontReadingProgress( int page ); + void slotFontReadingProgress( int page ); void fontReadingGotFont( const Okular::FontInfo& font ); void slotGeneratorConfigChanged( const QString& ); void refreshPixmaps( int ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/core/textdocumentgenerator.cpp new/okular-16.12.2/core/textdocumentgenerator.cpp --- old/okular-16.12.1/core/textdocumentgenerator.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/core/textdocumentgenerator.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -19,9 +19,7 @@ #include <QtGui/QImage> #include <QtGui/QPainter> #include <QtPrintSupport/QPrinter> -#if QT_VERSION >= 0x040500 #include <QtGui/QTextDocumentWriter> -#endif #include "action.h" #include "annotations.h" @@ -476,14 +474,12 @@ if ( formats.isEmpty() ) { formats.append( Okular::ExportFormat::standardFormat( Okular::ExportFormat::PlainText ) ); formats.append( Okular::ExportFormat::standardFormat( Okular::ExportFormat::PDF ) ); -#if QT_VERSION >= 0x040500 if ( QTextDocumentWriter::supportedDocumentFormats().contains( "ODF" ) ) { formats.append( Okular::ExportFormat::standardFormat( Okular::ExportFormat::OpenDocumentText ) ); } if ( QTextDocumentWriter::supportedDocumentFormats().contains( "HTML" ) ) { formats.append( Okular::ExportFormat::standardFormat( Okular::ExportFormat::HTML ) ); } -#endif } return formats; @@ -515,7 +511,6 @@ out << d->mDocument->toPlainText(); return true; -#if QT_VERSION >= 0x040500 } else if ( format.mimeType().name() == QLatin1String( "application/vnd.oasis.opendocument.text" ) ) { QTextDocumentWriter odfWriter( fileName, "odf" ); @@ -524,7 +519,6 @@ QTextDocumentWriter odfWriter( fileName, "html" ); return odfWriter.write( d->mDocument ); -#endif } return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/chm/libokularGenerator_chmlib.json new/okular-16.12.2/generators/chm/libokularGenerator_chmlib.json --- old/okular-16.12.1/generators/chm/libokularGenerator_chmlib.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/chm/libokularGenerator_chmlib.json 2017-02-06 07:51:00.000000000 +0100 @@ -24,6 +24,7 @@ "Copyright[et]": "© 2005-2007: Piotr Szymański\n© 2008: Albert Astals Cid", "Copyright[fi]": "© 2005–2007 Piotr Szymański\n© 2008 Albert Astals Cid", "Copyright[nn]": "© 2005–2007 Piotr Szymański\n© 2008 Albert Astals Cid", + "Copyright[ru]": "© Piotr Szymański, 2005-2007\n© Albert Astals Cid, 2008", "Copyright[sr@ijekavian]": "© 2005—2007, Пјотр Шимањски\n© 2008, Алберт Асталс Сид", "Copyright[sr@ijekavianlatin]": "© 2005—2007, Pjotr Šimanjski\n© 2008, Albert Astals Sid", "Copyright[sr@latin]": "© 2005—2007, Pjotr Šimanjski\n© 2008, Albert Astals Sid", @@ -45,6 +46,7 @@ "Description[nn]": "Ein framvisar for Microsoft Windows-hjelpefiler", "Description[pl]": "System zajmujący się wyświetlaniem plików pomocy Microsoft Windows", "Description[pt]": "Um visualizador de ficheiros de ajuda do Microsoft Windows", + "Description[ru]": "Модуль поддержки формата CHM (справка Microsoft Windows)", "Description[sk]": "Vykresľovanie súborov pomocníka Microsoft Windows", "Description[sl]": "Izrisovalnik datotek za pomoč za Microsoft Windows", "Description[sr@ijekavian]": "Рендерер за фајлове Виндоузове помоћи", @@ -75,6 +77,7 @@ "Name[nn]": "CHM-motor", "Name[pl]": "Silnik CHM", "Name[pt]": "Infra-Estrutura de CHM", + "Name[ru]": "Модуль поддержки формата CHM", "Name[sl]": "Zaledje za CHM", "Name[sr@ijekavian]": "Позадина за ЦХМ", "Name[sr@ijekavianlatin]": "Pozadina za CHM", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/chm/okularApplication_chm.desktop new/okular-16.12.2/generators/chm/okularApplication_chm.desktop --- old/okular-16.12.1/generators/chm/okularApplication_chm.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/chm/okularApplication_chm.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/comicbook/libokularGenerator_comicbook.json new/okular-16.12.2/generators/comicbook/libokularGenerator_comicbook.json --- old/okular-16.12.1/generators/comicbook/libokularGenerator_comicbook.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/comicbook/libokularGenerator_comicbook.json 2017-02-06 07:51:00.000000000 +0100 @@ -5,6 +5,7 @@ "Email": "[email protected]", "Name": "Tobias Koenig", "Name[nn]": "Tobias König", + "Name[ru]": "Tobias König", "Name[sr@ijekavian]": "Тобијас Кениг", "Name[sr@ijekavianlatin]": "Tobijas Kenig", "Name[sr@latin]": "Tobijas Kenig", @@ -16,6 +17,7 @@ "Copyright[et]": "© 2007-2008: Tobias Koenig", "Copyright[fi]": "© 2007–2008 Tobias Koenig", "Copyright[nn]": "© 2007–2008 Tobias König", + "Copyright[ru]": "© Tobias König, 2007-2008", "Copyright[sr@ijekavian]": "© 2007–2008, Тобијас Кениг", "Copyright[sr@ijekavianlatin]": "© 2007–2008, Tobijas Kenig", "Copyright[sr@latin]": "© 2007–2008, Tobijas Kenig", @@ -37,6 +39,7 @@ "Description[nn]": "Ein gjengjevar for ulike teikneserieformat", "Description[pl]": "Wyświetlanie różnych formatów comic book.", "Description[pt]": "Um visualizador de diversos formatos de banda desenhada", + "Description[ru]": "Модуль поддержки различных форматов комиксов", "Description[sk]": "Vykresľovanie rôznych formátov kníh komiksov", "Description[sl]": "Izrisovalnik za različne vrste stripov", "Description[sr@ijekavian]": "Рендерер различитих формата стрипова", @@ -70,6 +73,7 @@ "Name[nn]": "ComicBook-motor", "Name[pl]": "Moduł ComicBook", "Name[pt]": "Infra-Estrutura de ComicBook (BD)", + "Name[ru]": "Модуль поддержки формата ComicBook", "Name[sk]": "Backend pre knihy komiksov", "Name[sl]": "Zaledje za stripe", "Name[sr@ijekavian]": "Позадина за комикбук", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/comicbook/okularApplication_comicbook.desktop new/okular-16.12.2/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-16.12.1/generators/comicbook/okularApplication_comicbook.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/comicbook/okularApplication_comicbook.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/djvu/libokularGenerator_djvu.json new/okular-16.12.2/generators/djvu/libokularGenerator_djvu.json --- old/okular-16.12.1/generators/djvu/libokularGenerator_djvu.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/djvu/libokularGenerator_djvu.json 2017-02-06 07:51:00.000000000 +0100 @@ -15,6 +15,7 @@ "Copyright[et]": "© 2006-2008: Pino Toscano", "Copyright[fi]": "© 2006–2008 Pino Toscano", "Copyright[nn]": "© 2006–2008 Pino Toscano", + "Copyright[ru]": "© Pino Toscano, 2006-2008", "Copyright[sr@ijekavian]": "© 2006–2008, Пино Тоскано", "Copyright[sr@ijekavianlatin]": "© 2006–2008, Pino Toskano", "Copyright[sr@latin]": "© 2006–2008, Pino Toskano", @@ -36,6 +37,7 @@ "Description[nn]": "DjVu-motor basert på DjVuLibre", "Description[pl]": "Silnik DjVu oparty na DjVuLibre", "Description[pt]": "Infra-estrutura do DjVu com base no DjVuLibre", + "Description[ru]": "Модуль поддержки формата DjVu на основе библиотеки DjVuLibre", "Description[sk]": "DjVu backend postavený na DjVuLibre", "Description[sl]": "Zaledje za DjVu, ki temelji na DjVuLibre", "Description[sr@ijekavian]": "Позадина за ДјВу заснована на ДјВу‑либреу", @@ -66,6 +68,7 @@ "Name[nn]": "DjVu-motor", "Name[pl]": "Silnik DjVu", "Name[pt]": "Infra-Estrutura do DjVu", + "Name[ru]": "Модуль поддержки формата DjVu", "Name[sl]": "Zaledje za DjVu", "Name[sr@ijekavian]": "Позадина за ДјВу", "Name[sr@ijekavianlatin]": "Pozadina za DjVu", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/djvu/okularApplication_djvu.desktop new/okular-16.12.2/generators/djvu/okularApplication_djvu.desktop --- old/okular-16.12.1/generators/djvu/okularApplication_djvu.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/djvu/okularApplication_djvu.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/dvi/libokularGenerator_dvi.json new/okular-16.12.2/generators/dvi/libokularGenerator_dvi.json --- old/okular-16.12.1/generators/dvi/libokularGenerator_dvi.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/dvi/libokularGenerator_dvi.json 2017-02-06 07:51:00.000000000 +0100 @@ -13,6 +13,7 @@ ], "Copyright": "© 2006 Luigi Toscano", "Copyright[et]": "© 2006: Luigi Toscano", + "Copyright[ru]": "© Luigi Toscano, 2006", "Copyright[sr@ijekavian]": "© 2006, Луиђи Тоскано", "Copyright[sr@ijekavianlatin]": "© 2006, Luiđi Toskano", "Copyright[sr@latin]": "© 2006, Luiđi Toskano", @@ -34,6 +35,7 @@ "Description[nn]": "Ein gjengjevar for DVI-filer", "Description[pl]": "Wyświetlanie pliku DVI", "Description[pt]": "Um visualizador de ficheiros DVI", + "Description[ru]": "Модуль поддержки формата DVI", "Description[sk]": "Vykresľovanie DVI súborov", "Description[sl]": "Izrisovalnik datotek DVI", "Description[sr@ijekavian]": "Рендерер ДВИ фајлова", @@ -64,6 +66,7 @@ "Name[nn]": "DVI-motor", "Name[pl]": "Obsługa DVI", "Name[pt]": "Infra-Estrutura de DVI", + "Name[ru]": "Модуль поддержки формата DVI", "Name[sl]": "Zaledje za DVI", "Name[sr@ijekavian]": "Позадина за ДВИ", "Name[sr@ijekavianlatin]": "Pozadina za DVI", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/dvi/okularApplication_dvi.desktop new/okular-16.12.2/generators/dvi/okularApplication_dvi.desktop --- old/okular-16.12.1/generators/dvi/okularApplication_dvi.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/dvi/okularApplication_dvi.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/epub/libokularGenerator_epub.json new/okular-16.12.2/generators/epub/libokularGenerator_epub.json --- old/okular-16.12.1/generators/epub/libokularGenerator_epub.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/epub/libokularGenerator_epub.json 2017-02-06 07:51:00.000000000 +0100 @@ -13,6 +13,7 @@ ], "Copyright": "© 2008 Ely Levy", "Copyright[et]": "© 2008: Ely Levy", + "Copyright[ru]": "© Ely Levy, 2008", "Copyright[sr@ijekavian]": "© 2008, Ели Леви", "Copyright[sr@ijekavianlatin]": "© 2008, Eli Levi", "Copyright[sr@latin]": "© 2008, Eli Levi", @@ -34,6 +35,7 @@ "Description[nn]": "Ein EPUB-motor", "Description[pl]": "Moduł EPub", "Description[pt]": "Uma infra-estrutura de EPub", + "Description[ru]": "Модуль поддержки формата EPub", "Description[sk]": "EPub backend", "Description[sl]": "Zaledje za EPub", "Description[sr@ijekavian]": "Позадина за ЕПУБ", @@ -64,6 +66,7 @@ "Name[nn]": "EPUB-motor", "Name[pl]": "Moduł EPub", "Name[pt]": "Infra-Estrutura de EPub", + "Name[ru]": "Модуль поддержки формата EPub", "Name[sl]": "Zaledje za EPub", "Name[sr@ijekavian]": "Позадина за ЕПУБ", "Name[sr@ijekavianlatin]": "Pozadina za EPUB", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/epub/okularApplication_epub.desktop new/okular-16.12.2/generators/epub/okularApplication_epub.desktop --- old/okular-16.12.1/generators/epub/okularApplication_epub.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/epub/okularApplication_epub.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/fax/libokularGenerator_fax.json new/okular-16.12.2/generators/fax/libokularGenerator_fax.json --- old/okular-16.12.1/generators/fax/libokularGenerator_fax.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/fax/libokularGenerator_fax.json 2017-02-06 07:51:00.000000000 +0100 @@ -5,6 +5,7 @@ "Email": "[email protected]", "Name": "Tobias Koenig", "Name[nn]": "Tobias König", + "Name[ru]": "Tobias König", "Name[sr@ijekavian]": "Тобијас Кениг", "Name[sr@ijekavianlatin]": "Tobijas Kenig", "Name[sr@latin]": "Tobijas Kenig", @@ -15,6 +16,7 @@ "Copyright": "© 2008 Tobias Koenig", "Copyright[et]": "© 2008: Tobias Koenig", "Copyright[nn]": "© 2008 Tobias König", + "Copyright[ru]": "© Tobias König, 2008", "Copyright[sr@ijekavian]": "© 2008, Тобијас Кениг", "Copyright[sr@ijekavianlatin]": "© 2008, Tobijas Kenig", "Copyright[sr@latin]": "© 2008, Tobijas Kenig", @@ -36,6 +38,7 @@ "Description[nn]": "Ein motor for G3/G4-faksdokument", "Description[pl]": "Obsługa dokumentów faksowych G3/G4", "Description[pt]": "Uma infra-estrutura de documentos de fax G3/G4", + "Description[ru]": "Модуль поддержки формата факсов G3/G4", "Description[sk]": "Backend dokumentu faxu G3/G4", "Description[sl]": "Zaledje za dokumente faksov G3/G4", "Description[sr@ijekavian]": "Позадина за Г3 факс и Г4 факс документе", @@ -66,6 +69,7 @@ "Name[nl]": "Faxbackend", "Name[nn]": "Faksmotor", "Name[pl]": "Obsługa faksu", + "Name[ru]": "Модуль поддержки форматов факсов", "Name[sl]": "Zaledje za faks", "Name[sr@ijekavian]": "Позадина за факсове", "Name[sr@ijekavianlatin]": "Pozadina za faksove", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/fax/okularApplication_fax.desktop new/okular-16.12.2/generators/fax/okularApplication_fax.desktop --- old/okular-16.12.1/generators/fax/okularApplication_fax.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/fax/okularApplication_fax.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/fictionbook/libokularGenerator_fb.json new/okular-16.12.2/generators/fictionbook/libokularGenerator_fb.json --- old/okular-16.12.1/generators/fictionbook/libokularGenerator_fb.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/fictionbook/libokularGenerator_fb.json 2017-02-06 07:51:00.000000000 +0100 @@ -5,6 +5,7 @@ "Email": "[email protected]", "Name": "Tobias Koenig", "Name[nn]": "Tobias König", + "Name[ru]": "Tobias König", "Name[sr@ijekavian]": "Тобијас Кениг", "Name[sr@ijekavianlatin]": "Tobijas Kenig", "Name[sr@latin]": "Tobijas Kenig", @@ -16,6 +17,7 @@ "Copyright[et]": "© 2007-2008: Tobias Koenig", "Copyright[fi]": "© 2007–2008 Tobias Koenig", "Copyright[nn]": "© 2007–2008 Tobias König", + "Copyright[ru]": "© Tobias König, 2007-2008", "Copyright[sr@ijekavian]": "© 2007–2008, Тобијас Кениг", "Copyright[sr@ijekavianlatin]": "© 2007–2008, Tobijas Kenig", "Copyright[sr@latin]": "© 2007–2008, Tobijas Kenig", @@ -37,6 +39,7 @@ "Description[nn]": "Ein lesar for e-bøker av typen FictionBook", "Description[pl]": "Wyświetlanie eksiążek FictionBook", "Description[pt]": "Um visualizador de eBooks em FictionBook", + "Description[ru]": "Модуль поддержки формата электронных книг FictionBook", "Description[sk]": "Vykresľovanie e-kníh FictionBook", "Description[sl]": "Izrisovalnik za e-knjige FictionBook", "Description[sr@ijekavian]": "Рендерер за фикшнбук електронске књиге", @@ -67,6 +70,7 @@ "Name[nn]": "FictionBook-motor", "Name[pl]": "Obsługa Fiction Book", "Name[pt]": "Infra-Estrutura de Livros de Ficção", + "Name[ru]": "Модуль поддержки формата FictionBook", "Name[sl]": "Zaledje za FictionBook", "Name[sr@ijekavian]": "Позадина за фикшнбук", "Name[sr@ijekavianlatin]": "Pozadina za FictionBook", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/fictionbook/okularApplication_fb.desktop new/okular-16.12.2/generators/fictionbook/okularApplication_fb.desktop --- old/okular-16.12.1/generators/fictionbook/okularApplication_fb.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/fictionbook/okularApplication_fb.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/kimgio/generator_kimgio.cpp new/okular-16.12.2/generators/kimgio/generator_kimgio.cpp --- old/okular-16.12.1/generators/kimgio/generator_kimgio.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/kimgio/generator_kimgio.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -79,17 +79,7 @@ // Apply transformations dictated by Exif metadata KExiv2Iface::KExiv2 exifMetadata; if ( exifMetadata.loadFromData( fileData ) ) { -#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2) - // Qt 5.4 (up to 5.4.1) rotates jpeg images automatically with no way of disabling it - // See https://bugreports.qt.io/browse/QTBUG-37946 - // and https://codereview.qt-project.org/#/c/98013/ - // and https://codereview.qt-project.org/#/c/110668/ - if (reader.format() != QByteArrayLiteral("jpeg")) { - exifMetadata.rotateExifQImage( m_img, exifMetadata.getImageOrientation() ); - } -#else exifMetadata.rotateExifQImage(m_img, exifMetadata.getImageOrientation()); -#endif } pagesVector.resize( 1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/kimgio/libokularGenerator_kimgio.json new/okular-16.12.2/generators/kimgio/libokularGenerator_kimgio.json --- old/okular-16.12.1/generators/kimgio/libokularGenerator_kimgio.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/kimgio/libokularGenerator_kimgio.json 2017-02-06 07:51:00.000000000 +0100 @@ -23,6 +23,7 @@ "Email": "[email protected]", "Name": "Tobias Koenig", "Name[nn]": "Tobias König", + "Name[ru]": "Tobias König", "Name[sr@ijekavian]": "Тобијас Кениг", "Name[sr@ijekavianlatin]": "Tobijas Kenig", "Name[sr@latin]": "Tobijas Kenig", @@ -34,6 +35,7 @@ "Copyright[et]": "© 2005, 2009: Albert Astals Cid\n© 2006-2007: Pino Toscano\n© 2006-2007: Tobias Koenig", "Copyright[fi]": "© 2005, 2009 Albert Astals Cid\n© 2006–2007 Pino Toscano\n© 2006–2007 Tobias Koenig", "Copyright[nn]": "© 2005, 2009 Albert Astals Cid\n© 2006–2007 Pino Toscano\n© 2006–2007 Tobias Koenig", + "Copyright[ru]": "© Albert Astals Cid, 2005, 2009\n© Pino Toscano, 2006-2007\n© Tobias König, 2006-2007", "Copyright[sr@ijekavian]": "© 2005, 2009, Алберт Асталс Сид\n© 2006–2007, Пино Тоскано\n© 2006–2007, Тобијас Кениг", "Copyright[sr@ijekavianlatin]": "© 2005, 2009, Albert Astals Sid\n© 2006–2007, Pino Toskano\n© 2006–2007, Tobijas Kenig", "Copyright[sr@latin]": "© 2005, 2009, Albert Astals Sid\n© 2006–2007, Pino Toskano\n© 2006–2007, Tobijas Kenig", @@ -56,6 +58,7 @@ "Description[nn]": "Ein enkel biletmotor", "Description[pl]": "Silnik prostych obrazków", "Description[pt]": "Uma infra-estrutura de imagens simples", + "Description[ru]": "Модуль поддержки форматов изображений", "Description[sk]": "Backend jednoduchých obrázkov", "Description[sl]": "Preprosto zaledje za slike", "Description[sr@ijekavian]": "Једноставна позадина за слике", @@ -107,6 +110,7 @@ "Name[nn]": "Biletmotor", "Name[pl]": "Silnik obrazów", "Name[pt]": "Infra-Estrutura de Imagens", + "Name[ru]": "Модуль поддержки форматов изображений", "Name[sk]": "Backend obrázkov", "Name[sl]": "Zaledje za slike", "Name[sr@ijekavian]": "Позадина за слике", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/kimgio/okularApplication_kimgio.desktop new/okular-16.12.2/generators/kimgio/okularApplication_kimgio.desktop --- old/okular-16.12.1/generators/kimgio/okularApplication_kimgio.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/kimgio/okularApplication_kimgio.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/mobipocket/libokularGenerator_mobi.json new/okular-16.12.2/generators/mobipocket/libokularGenerator_mobi.json --- old/okular-16.12.1/generators/mobipocket/libokularGenerator_mobi.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/mobipocket/libokularGenerator_mobi.json 2017-02-06 07:51:00.000000000 +0100 @@ -15,6 +15,7 @@ "Copyright[et]": "© 2008-2009: Jakub Stachowski", "Copyright[fi]": "© 2008–2009 Jakub Stachowski", "Copyright[nn]": "© 2008–2009 Jakub Stachowski", + "Copyright[ru]": "© Jakub Stachowski, 2008-2009", "Copyright[sr@ijekavian]": "© 2008—2009, Јакуб Стаховски", "Copyright[sr@ijekavianlatin]": "© 2008—2009, Jakub Stahovski", "Copyright[sr@latin]": "© 2008—2009, Jakub Stahovski", @@ -36,6 +37,7 @@ "Description[nn]": "Ein Mobipocket-motor", "Description[pl]": "Obsługa mobipocket", "Description[pt]": "Uma infra-estrutura de Mobipocket", + "Description[ru]": "Модуль поддержки формата Mobipocket", "Description[sk]": "Mobipocket backend", "Description[sl]": "Zaledje za Mobipocket", "Description[sr@ijekavian]": "Позадина за Мобипокет", @@ -66,6 +68,7 @@ "Name[nn]": "Mobipocket-motor", "Name[pl]": "Obsługa Mobipocket", "Name[pt]": "Infra-Estrutura de Mobipocket", + "Name[ru]": "Модуль поддержки формата Mobipocket", "Name[sl]": "Zaledje za Mobipocket", "Name[sr@ijekavian]": "Позадина за Мобипокет", "Name[sr@ijekavianlatin]": "Pozadina za Mobipocket", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/mobipocket/okularApplication_mobi.desktop new/okular-16.12.2/generators/mobipocket/okularApplication_mobi.desktop --- old/okular-16.12.1/generators/mobipocket/okularApplication_mobi.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/mobipocket/okularApplication_mobi.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/ooo/libokularGenerator_ooo.json new/okular-16.12.2/generators/ooo/libokularGenerator_ooo.json --- old/okular-16.12.1/generators/ooo/libokularGenerator_ooo.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/ooo/libokularGenerator_ooo.json 2017-02-06 07:51:00.000000000 +0100 @@ -5,6 +5,7 @@ "Email": "[email protected]", "Name": "Tobias Koenig", "Name[nn]": "Tobias König", + "Name[ru]": "Tobias König", "Name[sr@ijekavian]": "Тобијас Кениг", "Name[sr@ijekavianlatin]": "Tobijas Kenig", "Name[sr@latin]": "Tobijas Kenig", @@ -16,6 +17,7 @@ "Copyright[et]": "© 2006-2008: Tobias Koenig", "Copyright[fi]": "© 2006–2008 Tobias Koenig", "Copyright[nn]": "© 2006–2008 Tobias Koenig", + "Copyright[ru]": "© Tobias König, 2006-2008", "Copyright[sr@ijekavian]": "© 2000–2009, Тобијас Кениг", "Copyright[sr@ijekavianlatin]": "© 2000–2009, Tobijas Kenig", "Copyright[sr@latin]": "© 2000–2009, Tobijas Kenig", @@ -37,6 +39,7 @@ "Description[nn]": "Ein lesar for OpenDocument-tekstdokument", "Description[pl]": "Program wyświetlający dokumentów tekstowych OpenDocument", "Description[pt]": "Um visualizador de documentos de texto em OpenDocument", + "Description[ru]": "Модуль поддержки текстовых документов формата OpenDocument", "Description[sk]": "Vykresľovač pre textové dokumenty OpenDocument", "Description[sl]": "Izrisovalnik besedilnih dokumentov OpenDocument", "Description[sr@ijekavian]": "Рендерер за отворенодокументске текстуалне документе", @@ -67,6 +70,7 @@ "Name[nn]": "OpenDocument-tekstmotor", "Name[pl]": "Silnik dokumentów OpenDocument", "Name[pt]": "Infra-Estrutura de Texto em OpenDocument", + "Name[ru]": "Модуль поддержки формата OpenDocument", "Name[sk]": "Backend OpenDocument Text", "Name[sl]": "Zaledje za dokumente OpenDocument", "Name[sr@ijekavian]": "Позадина за отворенодокументски текст", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/ooo/okularApplication_ooo.desktop new/okular-16.12.2/generators/ooo/okularApplication_ooo.desktop --- old/okular-16.12.1/generators/ooo/okularApplication_ooo.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/ooo/okularApplication_ooo.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/plucker/libokularGenerator_plucker.json new/okular-16.12.2/generators/plucker/libokularGenerator_plucker.json --- old/okular-16.12.1/generators/plucker/libokularGenerator_plucker.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/plucker/libokularGenerator_plucker.json 2017-02-06 07:51:00.000000000 +0100 @@ -5,6 +5,7 @@ "Email": "[email protected]", "Name": "Tobias Koenig", "Name[nn]": "Tobias König", + "Name[ru]": "Tobias König", "Name[sr@ijekavian]": "Тобијас Кениг", "Name[sr@ijekavianlatin]": "Tobijas Kenig", "Name[sr@latin]": "Tobijas Kenig", @@ -16,6 +17,7 @@ "Copyright[et]": "© 2007-2008: Tobias Koenig", "Copyright[fi]": "© 2007–2008 Tobias Koenig", "Copyright[nn]": "© 2007–2008 Tobias König", + "Copyright[ru]": "© Tobias König, 2007-2008", "Copyright[sr@ijekavian]": "© 2007–2008, Тобијас Кениг", "Copyright[sr@ijekavianlatin]": "© 2007–2008, Tobijas Kenig", "Copyright[sr@latin]": "© 2007–2008, Tobijas Kenig", @@ -37,6 +39,7 @@ "Description[nn]": "Ein gjengjevar for Plucker-e-bøker", "Description[pl]": "Wyświetlanie eksiążek w formacie Plucker", "Description[pt]": "Um visualizador de eBooks do Plucker", + "Description[ru]": "Модуль поддержки формата электронных книг Plucker", "Description[sk]": "Vykresľovanie e-kníh Plucker", "Description[sl]": "Izrisovalnik za e-knjige Plucker", "Description[sr@ijekavian]": "Рендерер за Плакерове е‑књиге", @@ -67,6 +70,7 @@ "Name[nn]": "Plucker-dokumentmotor", "Name[pl]": "Obsługa dokumentów Plucker", "Name[pt]": "Infra-Estrutura de Documentos do Plucker", + "Name[ru]": "Модуль поддержки формата Plucker", "Name[sk]": "Backend dokumentov Plucker", "Name[sl]": "Zaledje za dokumente Plucker", "Name[sr@ijekavian]": "Позадина за Плакерови документе", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/plucker/okularApplication_plucker.desktop new/okular-16.12.2/generators/plucker/okularApplication_plucker.desktop --- old/okular-16.12.1/generators/plucker/okularApplication_plucker.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/plucker/okularApplication_plucker.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/poppler/libokularGenerator_poppler.json new/okular-16.12.2/generators/poppler/libokularGenerator_poppler.json --- old/okular-16.12.1/generators/poppler/libokularGenerator_poppler.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/poppler/libokularGenerator_poppler.json 2017-02-06 07:51:00.000000000 +0100 @@ -15,6 +15,7 @@ "Copyright[et]": "© 2005-2008: Albert Astals Cid", "Copyright[fi]": "© 2005–2008 Albert Astals Cid", "Copyright[nn]": "© 2005–2008 Albert Astals Cid", + "Copyright[ru]": "© Albert Astals Cid, 2005-2008", "Copyright[sr@ijekavian]": "© 2005–2008, Алберт Асталс Сид", "Copyright[sr@ijekavianlatin]": "© 2005–2008, Albert Astals Sid", "Copyright[sr@latin]": "© 2005–2008, Albert Astals Sid", @@ -36,6 +37,7 @@ "Description[nn]": "Ein gjengjevar for PDF-filer", "Description[pl]": "Wyświetlanie pliku PDF", "Description[pt]": "Um visualizador de ficheiros PDF", + "Description[ru]": "Модуль поддержки формата PDF", "Description[sk]": "Vykresľovanie PDF súborov", "Description[sl]": "Izrisovalnik datotek PDF", "Description[sr@ijekavian]": "Рендерер ПДФ фајлова", @@ -68,6 +70,7 @@ "Name[nn]": "PDF-motor", "Name[pl]": "Silnik PDF", "Name[pt]": "Infra-Estrutura de PDF", + "Name[ru]": "Модуль поддержки формата PDF", "Name[sl]": "Zaledje za PDF", "Name[sr@ijekavian]": "Позадина за ПДФ", "Name[sr@ijekavianlatin]": "Pozadina za PDF", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/poppler/okularApplication_pdf.desktop new/okular-16.12.2/generators/poppler/okularApplication_pdf.desktop --- old/okular-16.12.1/generators/poppler/okularApplication_pdf.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/poppler/okularApplication_pdf.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/spectre/libokularGenerator_ghostview.json new/okular-16.12.2/generators/spectre/libokularGenerator_ghostview.json --- old/okular-16.12.1/generators/spectre/libokularGenerator_ghostview.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/spectre/libokularGenerator_ghostview.json 2017-02-06 07:51:00.000000000 +0100 @@ -15,6 +15,7 @@ "Copyright[et]": "© 2007-2008: Albert Astals Cid", "Copyright[fi]": "© 2007–2008 Albert Astals Cid", "Copyright[nn]": "© 2007–2008 Albert Astals Cid", + "Copyright[ru]": "© Albert Astals Cid, 2007-2008", "Copyright[sr@ijekavian]": "© 2007–2008, Алберт Асталс Сид", "Copyright[sr@ijekavianlatin]": "© 2007–2008, Albert Astals Sid", "Copyright[sr@latin]": "© 2007–2008, Albert Astals Sid", @@ -24,6 +25,7 @@ "Description": "A PostScript file renderer based on the Spectre library", "Description[ca@valencia]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre", "Description[ca]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre", + "Description[cs]": "Vykreslovač souborů PostScript založený na knihovně Spectre.", "Description[de]": "Ein Renderer für PostScript-Dateien entwickelt aus der Spectre-Bibliothek", "Description[es]": "Un visor de archivos PostScript basado en la biblioteca Spectre", "Description[et]": "PostScript-faili renderdaja Spectre teegi alusel", @@ -35,6 +37,7 @@ "Description[nn]": "Ein gjengjevar for PostScript-filer, basert på Spectre-biblioteket", "Description[pl]": "Wyświetlanie plików PostScript oparte o bibliotekę Spectre", "Description[pt]": "Um visualzador de ficheiros PostScript com base na biblioteca Spectre", + "Description[ru]": "Модуль поддержки формата PostScript на основе библиотеки Spectre", "Description[sk]": "Renderovač PostScript súborov založený na knižnici Spectre", "Description[sl]": "Izrisovalnik datotek PostScript, ki temelji na knjižnici Spectre", "Description[sr@ijekavian]": "Рендерер постскрипт фајлова на основу библиотеке Спектер", @@ -66,6 +69,7 @@ "Name[nn]": "PS-motor", "Name[pl]": "Silnik PS", "Name[pt]": "Infra-Estrutura de PS", + "Name[ru]": "Модуль поддержки формата PS", "Name[sl]": "Zaledje za PS", "Name[sr@ijekavian]": "Позадина за постскрипт", "Name[sr@ijekavianlatin]": "Pozadina za PostScript", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/spectre/okularApplication_ghostview.desktop new/okular-16.12.2/generators/spectre/okularApplication_ghostview.desktop --- old/okular-16.12.1/generators/spectre/okularApplication_ghostview.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/spectre/okularApplication_ghostview.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/tiff/libokularGenerator_tiff.json new/okular-16.12.2/generators/tiff/libokularGenerator_tiff.json --- old/okular-16.12.1/generators/tiff/libokularGenerator_tiff.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/tiff/libokularGenerator_tiff.json 2017-02-06 07:51:00.000000000 +0100 @@ -15,6 +15,7 @@ "Copyright[et]": "© 2006-2008: Pino Toscano", "Copyright[fi]": "© 2006–2008 Pino Toscano", "Copyright[nn]": "© 2006–2008 Pino Toscano", + "Copyright[ru]": "© Pino Toscano, 2006-2008", "Copyright[sr@ijekavian]": "© 2006–2008, Пино Тоскано", "Copyright[sr@ijekavianlatin]": "© 2006–2008, Pino Toskano", "Copyright[sr@latin]": "© 2006–2008, Pino Toskano", @@ -36,6 +37,7 @@ "Description[nn]": "Ein TIFF-motor", "Description[pl]": "Jeden z silników TIFF", "Description[pt]": "Uma infra-estrutura de TIFF", + "Description[ru]": "Модуль поддержки формата TIFF", "Description[sk]": "TIFF backend", "Description[sl]": "Zaledje za TIFF", "Description[sr@ijekavian]": "Позадина за ТИФФ", @@ -66,6 +68,7 @@ "Name[nn]": "TIFF-motor", "Name[pl]": "Silnik TIFF", "Name[pt]": "Infra-Estrutura de TIFF", + "Name[ru]": "Модуль поддержки формата TIFF", "Name[sl]": "Zaledje za TIFF", "Name[sr@ijekavian]": "Позадина за ТИФФ", "Name[sr@ijekavianlatin]": "Pozadina za TIFF", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/tiff/okularApplication_tiff.desktop new/okular-16.12.2/generators/tiff/okularApplication_tiff.desktop --- old/okular-16.12.1/generators/tiff/okularApplication_tiff.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/tiff/okularApplication_tiff.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/txt/libokularGenerator_txt.json new/okular-16.12.2/generators/txt/libokularGenerator_txt.json --- old/okular-16.12.1/generators/txt/libokularGenerator_txt.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/txt/libokularGenerator_txt.json 2017-02-06 07:51:00.000000000 +0100 @@ -4,6 +4,7 @@ { "Email": "[email protected]", "Name": "Azat Khuzhin", + "Name[ru]": "Азат Хужин", "Name[sr@ijekavian]": "Азат Хужин", "Name[sr@ijekavianlatin]": "Azat Hužin", "Name[sr@latin]": "Azat Hužin", @@ -13,6 +14,7 @@ ], "Copyright": "© 2013 Azat Khuzhin", "Copyright[et]": "© 2013: Azat Khuzhin", + "Copyright[ru]": "© Азат Хужин, 2013", "Copyright[sr@ijekavian]": "© 2013, Азат Хужин", "Copyright[sr@ijekavianlatin]": "© 2013, Azat Hužin", "Copyright[sr@latin]": "© 2013, Azat Hužin", @@ -34,6 +36,7 @@ "Description[nn]": "Txt-motor", "Description[pl]": "Silnik tekstowy", "Description[pt]": "Infra-estrutura de TXT", + "Description[ru]": "Модуль поддержки формата Txt", "Description[sl]": "Zaledje za txt", "Description[sr@ijekavian]": "Позадина за текст", "Description[sr@ijekavianlatin]": "Pozadina za tekst", @@ -63,6 +66,7 @@ "Name[nn]": "Txt-motor", "Name[pl]": "Silnik tekstowy", "Name[pt]": "Infra-Estrutura de TXT", + "Name[ru]": "Модуль поддержки формата Txt", "Name[sk]": "Txt backend", "Name[sl]": "Zaledje za txt", "Name[sr@ijekavian]": "Позадина за текст", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/txt/okularApplication_txt.desktop new/okular-16.12.2/generators/txt/okularApplication_txt.desktop --- old/okular-16.12.1/generators/txt/okularApplication_txt.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/txt/okularApplication_txt.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/xps/generator_xps.cpp new/okular-16.12.2/generators/xps/generator_xps.cpp --- old/okular-16.12.1/generators/xps/generator_xps.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/xps/generator_xps.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -2066,10 +2066,8 @@ // 1) QFontDatabase says so // 2) Qt >= 4.4.0 (see Trolltech task ID: 169502) // 3) Qt >= 4.4.2 (see Trolltech task ID: 215090) -#if QT_VERSION >= 0x040402 if ( QFontDatabase::supportsThreadedFontRendering() ) setFeature( Threaded ); -#endif userMutex(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/xps/libokularGenerator_xps.json new/okular-16.12.2/generators/xps/libokularGenerator_xps.json --- old/okular-16.12.1/generators/xps/libokularGenerator_xps.json 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/xps/libokularGenerator_xps.json 2017-02-06 07:51:00.000000000 +0100 @@ -34,6 +34,7 @@ "Copyright[et]": "© 2006-2007: Brad Hards\n© 2007: Jiri Klement\n© 2008: Pino Toscano", "Copyright[fi]": "© 2006–2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano", "Copyright[nn]": "© 2006–2007 Brad Hards\n© 2007 Jiri Klement\n© 2008 Pino Toscano", + "Copyright[ru]": "© Brad Hards, 2006-2007\n© Jiri Klement, 2007\n© Pino Toscano, 2008", "Copyright[sr@ijekavian]": "© 2006–2007, Бред Хардс\n© 2007, Јиржи Клемент\n© 2008, Пино Тоскано", "Copyright[sr@ijekavianlatin]": "© 2006–2007, Bred Hards\n© 2007, Jirži Klement\n© 2008, Pino Toskano", "Copyright[sr@latin]": "© 2006–2007, Bred Hards\n© 2007, Jirži Klement\n© 2008, Pino Toskano", @@ -55,6 +56,7 @@ "Description[nn]": "Ein XPS-motor", "Description[pl]": "Jeden z silników XPS", "Description[pt]": "Uma infra-estrutura de XPS", + "Description[ru]": "Модуль поддержки формата XPS", "Description[sk]": "XPS backend", "Description[sl]": "Zaledje za XPS", "Description[sr@ijekavian]": "Позадина за ИксПС", @@ -86,6 +88,7 @@ "Name[nn]": "XPS-motor", "Name[pl]": "Silnik XPS", "Name[pt]": "Infra-Estrutura de XPS", + "Name[ru]": "Модуль поддержки формата XPS", "Name[sl]": "Zaledje za XPS", "Name[sr@ijekavian]": "Позадина за ИксПС", "Name[sr@ijekavianlatin]": "Pozadina za XPS", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/generators/xps/okularApplication_xps.desktop new/okular-16.12.2/generators/xps/okularApplication_xps.desktop --- old/okular-16.12.1/generators/xps/okularApplication_xps.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/generators/xps/okularApplication_xps.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -127,7 +127,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -146,6 +146,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/shell/okular_main.cpp new/okular-16.12.2/shell/okular_main.cpp --- old/okular-16.12.1/shell/okular_main.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/shell/okular_main.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -33,7 +33,7 @@ return false; const QString page = ShellUtils::page(serializedOptions); - iface.call(QStringLiteral("openDocument"), ShellUtils::urlFromArg(paths[0], page).url(), serializedOptions); + iface.call(QStringLiteral("openDocument"), ShellUtils::urlFromArg(paths[0], ShellUtils::qfileExistFunc(), page).url(), serializedOptions); if (!ShellUtils::noRaise(serializedOptions)) { iface.call(QStringLiteral("tryRaise")); } @@ -103,7 +103,7 @@ { // Page only makes sense if we are opening one file const QString page = ShellUtils::page(serializedOptions); - path = ShellUtils::urlFromArg(arg, page).url(); + path = ShellUtils::urlFromArg(arg, ShellUtils::qfileExistFunc(), page).url(); } // Returns false if it can't fit another document @@ -166,7 +166,7 @@ { // Page only makes sense if we are opening one file const QString page = ShellUtils::page(serializedOptions); - const QUrl url = ShellUtils::urlFromArg(paths[i], page); + const QUrl url = ShellUtils::urlFromArg(paths[i], ShellUtils::qfileExistFunc(), page); if ( shell->openDocument( url, serializedOptions) ) { ++i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/shell/org.kde.okular.desktop new/okular-16.12.2/shell/org.kde.okular.desktop --- old/okular-16.12.1/shell/org.kde.okular.desktop 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/shell/org.kde.okular.desktop 2017-02-06 07:51:00.000000000 +0100 @@ -126,7 +126,7 @@ Comment=Universal document viewer Comment[ca]=Visualitzador universal de documents Comment[ca@valencia]=Visualitzador universal de documents -Comment[cs]=Uneverzální prohlížeč dokumentů +Comment[cs]=Univerzální prohlížeč dokumentů Comment[da]=Universel dokumentfremviser Comment[de]=Universeller Dokumentenbetrachter Comment[el]=Καθολικός προβολέας εγγράφων @@ -145,6 +145,7 @@ Comment[pl]=Wszechstronna przeglądarka dokumentów Comment[pt]=Visualizador de documentos universal Comment[pt_BR]=Visualizador de documentos universal +Comment[ru]=Универсальная программа просмотра документов Comment[sk]=Univerzálny prehliadač dokumentov Comment[sl]=Vsestranski pregledovalnik dokumentov Comment[sr]=Универзални приказивач докумената diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/shell/shellutils.cpp new/okular-16.12.2/shell/shellutils.cpp --- old/okular-16.12.1/shell/shellutils.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/shell/shellutils.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -20,31 +20,32 @@ namespace ShellUtils { -QUrl urlFromArg( const QString& _arg, const QString& pageArg ) +namespace detail +{ + +bool qfileExistFunc( const QString& fileName ) +{ + return QFile::exists( fileName ); +} + +} + +FileExistFunc qfileExistFunc() +{ + return detail::qfileExistFunc; +} + +QUrl urlFromArg( const QString& _arg, FileExistFunc exist_func, const QString& pageArg ) { -#if QT_VERSION >= 0x050400 QUrl url = QUrl::fromUserInput(_arg, QDir::currentPath(), QUrl::AssumeLocalFile); -#else - // Code from QUrl::fromUserInput(QString, QString) - QUrl url = QUrl::fromUserInput(_arg); - QUrl testUrl = QUrl(_arg, QUrl::TolerantMode); - if (testUrl.isRelative() && !QDir::isAbsolutePath(_arg)) { - QFileInfo fileInfo(QDir::current(), _arg); - if (fileInfo.exists()) - url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); - } -#endif if ( url.isLocalFile() ) { // make sure something like /tmp/foo#bar.pdf is treated as a path name (default) // but something like /tmp/foo.pdf#bar is foo.pdf plus an anchor "bar" const QString path = url.path(); int hashIndex = path.lastIndexOf( QLatin1Char ( '#' ) ); - int lastDotIndex = path.lastIndexOf( QLatin1Char ( '.' ) ); - // make sure that we don't change the path if .pdf comes after the # - if ( hashIndex != -1 && hashIndex > lastDotIndex) { + if ( hashIndex != -1 && !exist_func(path) ) { url.setPath( path.left( hashIndex ) ); url.setFragment( path.mid( hashIndex + 1 ) ); - qDebug() << "Added fragment to url:" << url.path() << url.fragment(); } } else if ( !url.fragment().isEmpty() ) { // make sure something like http://example.org/foo#bar.pdf is treated as a path name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/shell/shellutils.h new/okular-16.12.2/shell/shellutils.h --- old/okular-16.12.1/shell/shellutils.h 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/shell/shellutils.h 2017-02-06 07:51:00.000000000 +0100 @@ -19,7 +19,10 @@ namespace ShellUtils { -QUrl urlFromArg(const QString& _arg, const QString& pageArg = QString() ); +typedef bool (*FileExistFunc)( const QString& fileName ); + +FileExistFunc qfileExistFunc(); +QUrl urlFromArg(const QString& _arg, FileExistFunc exist_func, const QString& pageArg = QString() ); QString serializeOptions(const QCommandLineParser &args); QString serializeOptions(bool startInPresentation, bool showPrintDialog, bool unique, bool noRaise, const QString &page); bool unserializeOptions(const QString &serializedOptions, bool *presentation, bool *print, bool *unique, bool *noraise, QString *page); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/ui/pagepainter.cpp new/okular-16.12.2/ui/pagepainter.cpp --- old/okular-16.12.1/ui/pagepainter.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/ui/pagepainter.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -836,7 +836,7 @@ { if ( limitsEnlarged.intersects( rect->boundingRect( scaledWidth, scaledHeight ).translated( -scaledCrop.topLeft() ) ) ) { - mixedPainter->strokePath( rect->region(), QPen( normalColor ) ); + mixedPainter->strokePath( rect->region(), QPen( normalColor, 0 ) ); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/ui/pagepainter.h new/okular-16.12.2/ui/pagepainter.h --- old/okular-16.12.1/ui/pagepainter.h 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/ui/pagepainter.h 2017-02-06 07:51:00.000000000 +0100 @@ -71,8 +71,8 @@ static void drawShapeOnImage( QImage & image, const NormalizedPath & imagePoints, - bool closeShape = true, - const QPen & pen = QPen(), + bool closeShape, + const QPen & pen, const QBrush & brush = QBrush(), double penWidthMultiplier = 1.0, RasterOperation op = Normal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/ui/pageview.cpp new/okular-16.12.2/ui/pageview.cpp --- old/okular-16.12.1/ui/pageview.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/ui/pageview.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -4830,7 +4830,7 @@ void PageView::slotConfigureWebShortcuts() { - KToolInvocation::kdeinitExec( QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("ebrowsing") ); + KToolInvocation::kdeinitExec( QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("webshortcuts") ); } void PageView::slotZoom() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.1/ui/searchlineedit.cpp new/okular-16.12.2/ui/searchlineedit.cpp --- old/okular-16.12.1/ui/searchlineedit.cpp 2017-01-08 19:38:42.000000000 +0100 +++ new/okular-16.12.2/ui/searchlineedit.cpp 2017-02-06 07:51:00.000000000 +0100 @@ -39,7 +39,6 @@ connect(m_inputDelayTimer, &QTimer::timeout, this, &SearchLineEdit::startSearch); connect(this, &SearchLineEdit::textChanged, this, &SearchLineEdit::slotTextChanged); - connect(this, &SearchLineEdit::returnPressed, this, &SearchLineEdit::slotReturnPressed); connect(document, &Okular::Document::searchFinished, this, &SearchLineEdit::searchFinished); } @@ -65,8 +64,16 @@ if ( type == m_searchType ) return; + disconnect(this, &SearchLineEdit::returnPressed, this, &SearchLineEdit::slotReturnPressed); + m_searchType = type; + // Only connect Enter for next/prev searches, the rest of searches are document global so + // next/prev serach does not make sense for them + if (m_searchType == Okular::Document::NextMatch || m_searchType == Okular::Document::PreviousMatch) { + connect(this, &SearchLineEdit::returnPressed, this, &SearchLineEdit::slotReturnPressed); + } + if ( !m_changed ) m_changed = ( m_searchType != Okular::Document::NextMatch && m_searchType != Okular::Document::PreviousMatch ); }
