From 15e0e24d6375700eb0b11bfb54f22083ac1931d7 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sun, 8 Oct 2017 04:45:01 +0200 Subject: [PATCH 1/4] GIT_SILENT Upgrade KDE Applications version to 17.08.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c358cfc4..d3113f3ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "08") -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) From 76a4ad63233b0e18149b903bd0672c41280f8f61 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 11 Oct 2017 09:30:36 +0200 Subject: [PATCH 2/4] GIT_SILENT made messages (after extraction) --- generators/chm/org.kde.okular-chm.metainfo.xml | 2 ++ generators/comicbook/org.kde.okular-comicbook.metainfo.xml | 2 ++ generators/djvu/org.kde.okular-djvu.metainfo.xml | 2 ++ generators/dvi/org.kde.okular-dvi.metainfo.xml | 2 ++ generators/epub/org.kde.okular-epub.metainfo.xml | 2 ++ generators/fax/org.kde.okular-fax.metainfo.xml | 2 ++ generators/fictionbook/org.kde.okular-fb.metainfo.xml | 2 ++ generators/kimgio/org.kde.okular-kimgio.metainfo.xml | 2 ++ generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml | 2 ++ generators/ooo/org.kde.okular-ooo.metainfo.xml | 2 ++ generators/plucker/org.kde.okular-plucker.metainfo.xml | 2 ++ generators/poppler/org.kde.okular-poppler.metainfo.xml | 2 ++ generators/spectre/org.kde.okular-spectre.metainfo.xml | 2 ++ generators/tiff/org.kde.okular-tiff.metainfo.xml | 2 ++ generators/txt/org.kde.okular-txt.metainfo.xml | 2 ++ generators/xps/org.kde.okular-xps.metainfo.xml | 2 ++ shell/org.kde.okular.appdata.xml | 3 +++ 17 files changed, 35 insertions(+) diff --git a/generators/chm/org.kde.okular-chm.metainfo.xml b/generators/chm/org.kde.okular-chm.metainfo.xml index 9f8df2018..694cab386 100644 --- a/generators/chm/org.kde.okular-chm.metainfo.xml +++ b/generators/chm/org.kde.okular-chm.metainfo.xml @@ -22,6 +22,7 @@ CHM-dokument Dokumenty CHM Documentos CHM + Документы CHM CHM dokumenty Dokumenti CHM ЦХМ документи @@ -52,6 +53,7 @@ Legg til støtte for å lesa CHM-dokument Dodaje obsługę dokumnetów CHM Adiciona o suporte para a leitura de documentos CHM + Поддержка чтения документов CHM Pridá podporu pre čítanie CHM dokumentov Doda podporo za branje dokumentov CHM Подршка за читање ЦХМ докумената diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml index cc2a373bb..9521956a4 100644 --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -22,6 +22,7 @@ Teikneseriar Komiksy Banda Desenhada + Комиксы Knihy komiksov Stripi Стрипови @@ -52,6 +53,7 @@ Legg til støtte for å lesa teikneseriefiler Dodaje obsługę komiksów Adiciona o suporte para ler livros de banda desenhada + Поддержка чтения комиксов Pridá podporu pre čítanie komiksov Doda podporo za branje stripov Подршка за читање стрипова diff --git a/generators/djvu/org.kde.okular-djvu.metainfo.xml b/generators/djvu/org.kde.okular-djvu.metainfo.xml index dfb363447..e03b1bd81 100644 --- a/generators/djvu/org.kde.okular-djvu.metainfo.xml +++ b/generators/djvu/org.kde.okular-djvu.metainfo.xml @@ -22,6 +22,7 @@ DjVu-dokument Dokumenty DjVu Documentos DjVu + Документы DjVu DjVu dokumenty Dokumenti DjVu ДјВу документи @@ -52,6 +53,7 @@ Legg til støtte for å lesa DjVu-dokument Dodaje obsługę czytania dokumentów DjVu Adiciona o suporte para a leitura de documentos DjVu + Поддержка чтения документов DjVu Pridá podporu pre čítanie DjVu dokumentov Doda podporo za branje dokumentov DjVu Подршка за читање ДјВу докумената diff --git a/generators/dvi/org.kde.okular-dvi.metainfo.xml b/generators/dvi/org.kde.okular-dvi.metainfo.xml index 4423f8147..c75556e23 100644 --- a/generators/dvi/org.kde.okular-dvi.metainfo.xml +++ b/generators/dvi/org.kde.okular-dvi.metainfo.xml @@ -22,6 +22,7 @@ DVI-dokument Dokumenty DVI Documentos DVI + Документы DVI DVI dokumenty Dokumenti DVI ДВИ документи @@ -52,6 +53,7 @@ Legg til støtte for å lesa DVI-dokument Dodaje obsługę dokumnetów DVI Adiciona o suporte para a leitura de documentos DVI + Поддержка чтения документов DVI Pridá podporu pre čítanie DVI dokumentov Doda podporo za branje dokumentov DVI Подршка за читање ДВИ докумената diff --git a/generators/epub/org.kde.okular-epub.metainfo.xml b/generators/epub/org.kde.okular-epub.metainfo.xml index d43b6c5b0..54d622f26 100644 --- a/generators/epub/org.kde.okular-epub.metainfo.xml +++ b/generators/epub/org.kde.okular-epub.metainfo.xml @@ -22,6 +22,7 @@ EPUB EPub EPub + EPub EPub EPub ЕПУБ @@ -52,6 +53,7 @@ Legg til støtte for å lesa e-bøker i EPUB-formatet Dodaje obsługę czytania ebooków Adiciona o suporte para a leitura de E-Books + Поддержка чтения электронных книг EPub Pridá podporu pre čítanie e-kníh Doda podporo za branje e-knjig Подршка за читање е‑књига diff --git a/generators/fax/org.kde.okular-fax.metainfo.xml b/generators/fax/org.kde.okular-fax.metainfo.xml index 68a9eef05..bd78dc4d9 100644 --- a/generators/fax/org.kde.okular-fax.metainfo.xml +++ b/generators/fax/org.kde.okular-fax.metainfo.xml @@ -22,6 +22,7 @@ Faks Fax Fax + Факсы Fax Faks Факс @@ -52,6 +53,7 @@ Legg til støtte for å lesa faksdokument Dodaje obsługę czytania faksów Adiciona o suporte para a leitura de documentos de Fax + Поддержка чтения документов факсов Pridá podporu pre čítanie faxových dokumentov Doda podporo za branje faksiranih dokumentov Подршка за читање факс докумената diff --git a/generators/fictionbook/org.kde.okular-fb.metainfo.xml b/generators/fictionbook/org.kde.okular-fb.metainfo.xml index 755513092..2f192a682 100644 --- a/generators/fictionbook/org.kde.okular-fb.metainfo.xml +++ b/generators/fictionbook/org.kde.okular-fb.metainfo.xml @@ -22,6 +22,7 @@ FictionBook Fikcja FictionBook + FictionBook FictionBook FictionBook Фикшнбук @@ -52,6 +53,7 @@ Legg til støtte for å lesa e-bøker i FictionBook-formatet Dodaje obsługę czytania fikcji Adiciona o suporte para a leitura de livros no formato FictionBooks + Поддержка чтения электронных книг FictionBook Pridá podporu pre čítanie FictionBook Doda podporo za branje dokumentov FictionBook Подршка за читање фикшнбук е‑књига diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index 010551e93..eea2facf5 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -22,6 +22,7 @@ Bilete Obrazy Imagens + Изображения Obrázky Slike Слике @@ -52,6 +53,7 @@ Legg til støtte for å lesa mange ulike biletformat Dodaje obsługę czytania wielu formatów obrazów Adiciona o suporte para ler muitos formatos de imagem + Поддержка чтения многих форматов изображений Pridá podporu pre čítanie mnohých obrazových formátov Doda podporo za branje številnih slikovnih vrst Подршка за читање разних формата слика diff --git a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml index f5840f07c..7d2a199d4 100644 --- a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml +++ b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml @@ -22,6 +22,7 @@ Mobipocket Mobipocket Mobipocket + Mobipocket Mobipocket Mobipocket Мобипокет @@ -52,6 +53,7 @@ Legg til støtte for å lesa e-bøker i Mobipocket-formatet Dodaje obsługę czytania ebooków Mobipocket Adiciona o suporte para ler E-books da Mobipocket + Поддержка чтения электронных книг Mobipocket Pridá podporu pre čítanie e-kníh Mobipocket Doda podporo za branje e-knjig Mobipocket Подршка за читање мобипокет е‑књига diff --git a/generators/ooo/org.kde.okular-ooo.metainfo.xml b/generators/ooo/org.kde.okular-ooo.metainfo.xml index f31a4a590..daf786a94 100644 --- a/generators/ooo/org.kde.okular-ooo.metainfo.xml +++ b/generators/ooo/org.kde.okular-ooo.metainfo.xml @@ -22,6 +22,7 @@ OpenDocument OpenDocument OpenDocument + OpenDocument OpenDocument OpenDocument Отворени документ @@ -52,6 +53,7 @@ Legg til støtte for å lesa tekstfiler i OpenDocument-formatet Dodaje obsługę czytania plików tekstowych OpenDocument Adiciona o suporte para ler documentos de texto em OpenDocument + Поддержка чтения текстовых документов OpenDocument Pridá podporu pre čítanie textových súborov OpenDocument Doda podporo za branje besedilnih datotek OpenDocument Подршка за читање отворенодокументских текстуалних фајлова diff --git a/generators/plucker/org.kde.okular-plucker.metainfo.xml b/generators/plucker/org.kde.okular-plucker.metainfo.xml index 26e4263f6..7130ed71d 100644 --- a/generators/plucker/org.kde.okular-plucker.metainfo.xml +++ b/generators/plucker/org.kde.okular-plucker.metainfo.xml @@ -22,6 +22,7 @@ Plucker Plucker Plucker + Plucker Plucker Plucker Плакер @@ -52,6 +53,7 @@ Legg til støtte for å lesa Plucker-dokument Dodaje obsługę czytania dokumnetów Plucker Adiciona o suporte para ler documentos do Plucker + Поддержка чтения документов Plucker Pridá podporu pre čítanie dokumentov Plucker Doda podporo za branje dokumentov Plucker Подршка за читање плакер докумената diff --git a/generators/poppler/org.kde.okular-poppler.metainfo.xml b/generators/poppler/org.kde.okular-poppler.metainfo.xml index 0ccc0bca1..1f2a28a09 100644 --- a/generators/poppler/org.kde.okular-poppler.metainfo.xml +++ b/generators/poppler/org.kde.okular-poppler.metainfo.xml @@ -22,6 +22,7 @@ PDF PDF PDF + PDF PDF PDF ПДФ @@ -52,6 +53,7 @@ Legg til støtte for å lesa PDF-dokument Dodaje obsługę czytania PDFów Adiciona o suporte para ler documentos em PDF + Поддержка чтения документов PDF Pridá podporu pre čítanie PDF dokumentov Doda podporo za branje dokumentov PDF Подршка за читање ПДФ докумената diff --git a/generators/spectre/org.kde.okular-spectre.metainfo.xml b/generators/spectre/org.kde.okular-spectre.metainfo.xml index 6c7c3fc92..881d5609d 100644 --- a/generators/spectre/org.kde.okular-spectre.metainfo.xml +++ b/generators/spectre/org.kde.okular-spectre.metainfo.xml @@ -23,6 +23,7 @@ PostScript PostScript PostScript + PostScript PostScript PostScript Постскрипт @@ -54,6 +55,7 @@ Legg til støtte for å lesa PostScript-dokument Dodaje obsługę czytania dokumentów PostScript Adiciona o suporte para ler documentos em PostScript + Поддержка чтения документов PostScript Pridá podporu pre čítanie dokumentov PostScript Doda podporo za branje dokumentov PostScript Подршка за читање постскрипт докумената diff --git a/generators/tiff/org.kde.okular-tiff.metainfo.xml b/generators/tiff/org.kde.okular-tiff.metainfo.xml index 34c618f86..972a60df4 100644 --- a/generators/tiff/org.kde.okular-tiff.metainfo.xml +++ b/generators/tiff/org.kde.okular-tiff.metainfo.xml @@ -22,6 +22,7 @@ TIFF Tiff TIFF + TIFF Tiff Tiff ТИФФ @@ -52,6 +53,7 @@ Legg til støtte for å lesa TIFF-dokument Dodaje obsługę czytania dokumentów Tiff Adiciona o suporte para ler documentos em TIFF + Поддержка чтения документов TIFF Pridá podporu pre čítanie Tiff dokumentov Doda podporo za branje dokumentov Tiff Подршка за читање ТИФФ докумената diff --git a/generators/txt/org.kde.okular-txt.metainfo.xml b/generators/txt/org.kde.okular-txt.metainfo.xml index cfd30dc80..a498f8160 100644 --- a/generators/txt/org.kde.okular-txt.metainfo.xml +++ b/generators/txt/org.kde.okular-txt.metainfo.xml @@ -22,6 +22,7 @@ Tekst Tekst Texto + Текст Text Besedilo Текст @@ -52,6 +53,7 @@ Legg til støtte for å lesa reintekstdokument Dodaje obsługę czytania zwykłych plików tekstowych Adiciona o suporte para ler documentos em texto simples + Поддержка чтения простых текстовых документов Pridá podporu pre čítanie čistých textových dokumentov Doda podporo za branje besedilnih dokumentov Подршка за читање докумената у обичном тексту diff --git a/generators/xps/org.kde.okular-xps.metainfo.xml b/generators/xps/org.kde.okular-xps.metainfo.xml index 67050a07c..86811f086 100644 --- a/generators/xps/org.kde.okular-xps.metainfo.xml +++ b/generators/xps/org.kde.okular-xps.metainfo.xml @@ -22,6 +22,7 @@ XPS XPS XPS + XPS XPS XPS ИксПС @@ -52,6 +53,7 @@ Legg til støtte for å lesa XPS-dokument Dodaje obsługę dokumnetów XPS Adiciona o suporte para ler documentos em XPS + Поддержка чтения документов XPS Pridá podporu pre čítanie XPS dokumentov Doda podporo za branje dokumentov XPS Подршка за читање ИксПС докумената diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index cdd615e24..522011075 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -21,6 +21,7 @@ Okular Okular Okular + Okular Okular Okular Окулар @@ -51,6 +52,7 @@ Dokumentvisar Przeglądarka dokumentów Visualizador do Documento + Просмотр документов Prehliadač dokumentov Pregledovalnik dokumentov Приказивач докумената @@ -113,6 +115,7 @@

Funksjonar:

Możliwości:

Funcionalidades:

+

Возможности:

Funkcie:

Zmožnosti:

Могућности:

From e7702e0a8cdf9947536a27d48f3184659a07df35 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 Oct 2017 06:24:28 +0200 Subject: [PATCH 3/4] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- generators/epub/okularApplication_epub.desktop | 2 +- generators/epub/org.kde.mobile.okular_epub.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index df27ea062..b3a6398f4 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -183,7 +183,7 @@ X-KDE-Keywords[et]=epub, e-book, e-raamat X-KDE-Keywords[fi]=epub, e-book, e-kirja, sähkökirja X-KDE-Keywords[fr]=epub, e-book X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar -X-KDE-Keywords[gl]=epub, e-book,libro dixital +X-KDE-Keywords[gl]=epub, e-book, libro dixital X-KDE-Keywords[hu]=epub, e-book X-KDE-Keywords[ia]=epub, e-book X-KDE-Keywords[is]=epub, e-book, rafbók diff --git a/generators/epub/org.kde.mobile.okular_epub.desktop b/generators/epub/org.kde.mobile.okular_epub.desktop index c058b7e66..ead3f3d5e 100644 --- a/generators/epub/org.kde.mobile.okular_epub.desktop +++ b/generators/epub/org.kde.mobile.okular_epub.desktop @@ -173,7 +173,7 @@ X-KDE-Keywords[et]=epub, e-book, e-raamat X-KDE-Keywords[fi]=epub, e-book, e-kirja, sähkökirja X-KDE-Keywords[fr]=epub, e-book X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar -X-KDE-Keywords[gl]=epub, e-book,libro dixital +X-KDE-Keywords[gl]=epub, e-book, libro dixital X-KDE-Keywords[hu]=epub, e-book X-KDE-Keywords[ia]=epub, e-book X-KDE-Keywords[is]=epub, e-book, rafbók From 662fa69a2dcc0c1403b1773262368943d5cacd52 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 2 Nov 2017 17:47:35 +0100 Subject: [PATCH 4/4] Fix crash on rotation jobs We don't need to delete the threadweaver job, threadweaver does it by itself, and if we call deleteLater it may happen that the main thread deletes it and then when the threadweaver thread tries to call the delete things are gone and it goes kaboom BUGS: 382725 --- core/pagecontroller.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/pagecontroller.cpp b/core/pagecontroller.cpp index 36a8dfeb7..eb75c10b2 100644 --- a/core/pagecontroller.cpp +++ b/core/pagecontroller.cpp @@ -43,8 +43,6 @@ void PageController::imageRotationDone(const ThreadWeaver::JobPointer &j) emit rotationFinished( job->page()->m_number, job->page()->m_page ); } - - job->deleteLater(); } #include "moc_pagecontroller_p.cpp"