From 41da97b4602b71865e08c75dbed08683062c3a90 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 10 Nov 2019 11:49:24 +0100 Subject: [PATCH 1/8] GIT_SILENT Upgrade KDE Applications version to 19.11.80. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f664caaa..96f9072b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "11") -set (KDE_APPLICATIONS_VERSION_MICRO "70") +set (KDE_APPLICATIONS_VERSION_MICRO "80") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(okular VERSION 1.8.${KDE_APPLICATIONS_VERSION_MICRO}) From 35b7d057a260529bffc3b8401859c20697703c80 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Nov 2019 08:18:44 +0100 Subject: [PATCH 2/8] GIT_SILENT made messages (after extraction) --- generators/markdown/org.kde.okular-md.metainfo.xml | 2 ++ mobile/app/org.kde.okular.kirigami.appdata.xml | 8 ++++++++ shell/org.kde.okular.appdata.xml | 1 + 3 files changed, 11 insertions(+) diff --git a/generators/markdown/org.kde.okular-md.metainfo.xml b/generators/markdown/org.kde.okular-md.metainfo.xml index 7aa10e8d3..f12f1ea46 100644 --- a/generators/markdown/org.kde.okular-md.metainfo.xml +++ b/generators/markdown/org.kde.okular-md.metainfo.xml @@ -12,6 +12,7 @@ Markdown Markdown Markdown + Markdown Markdown Markdown Markdown @@ -45,6 +46,7 @@ Προσθέτει υποστήριξη για ανάγνωση Markdown εγγράφων Adds support for reading Markdown documents Permite la lectura de documentos Markdown + Markdowni dokumentide lugemise toetuse lisamine Markdown dokumentuak irakurtzeko euskarria gehitzen du Lisää Markdown-tiedostojen lukutuen Permet la lecture des documents Markdown diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index f08422279..584fc9f3a 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -10,6 +10,7 @@ Okular για κινητά Okular Mobile Okular Mobile + Okular Mobile Okular Mugikorra Okular Mobile Okular Mobile @@ -37,6 +38,7 @@ Πρόγραμμα προβολής εγγράφων Document Viewer Visor de documentos + Dokumendinäitaja Dokumentu erakuslea Asiakirjakatselin Afficheur de document @@ -66,6 +68,7 @@

Το Okular είναι ένα καθολικό πρόγραμμα προβολής εγγράφων που αναπτύχθηκε από το KDE. Το Okular λειτουργεί σε πολλές πλατφόρμες, συμπεριλαμβανομένων αλλά όχι μόνο των Linux, Windows, Mac OS X, *BSD, κλπ.

Okular is a universal document viewer developed by KDE. Okular works on multiple platforms, including but not limited to Linux, Windows, Mac OS X, *BSD, etc.

Okular es un visor universal de documentos desarrollado por KDE. Okular funciona en diversas plataformas, incluidas Linux, Windows, Mac OS X, *BSD, etc.

+

Okular on KDE loodud universaalne dokumendinäitaja. Okular töötab paljudel platvormidel, sealhulgas Linuxil, Windowsis, Mac OS X-is, *BSD-s jne.

Okular KDEk garatutako dokumentu erakusle unibertsal bat da. Okular hainbat plataformatan dabil, haien artean baino ez soilik haietara mugatua, Linux, windows, Mac OS X, *BSD, etab.

Okular on KDE:n kehittämä yleinen tiedostokatselin. Okular toimii monella alustalla kuten Linuxissa, Windowsissa, macOSissa, BSD:ssä jne.

Okular est un afficheur universel de documents développé par KDE. Okular fonctionne sur de multiples plate-formes, comme Linux, Windows, Mac OS X, etc.

@@ -93,6 +96,7 @@

Χαρακτηριστικά:

Features:

Funciones:

+

Omadused:

Eginbideak:

Ominaisuuksia:

Fonctionnalités :

@@ -121,6 +125,7 @@
  • Υποστηριζόμενοι τύποι αποθήκευσης: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Formatos permitidos: PDF, PS, Tiff, CHM, DjVu, imágenes, DVI, XPS, ODT, Fiction Book, libros de cómics, Plucker, EPub, Fax
    • +
  • Toetatud vormingud: PDF, PS, Tiff, CHM, DjVu, pildid, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Onartutako formatuak: PDF, PS, Tiff, CHM, DjVu, irudiak, DVI, XPS, ODT, FictionBook, Comic Book, Plucker, EPub, Fax
  • Tuetut tiedostomuodot: PDF, Postscript, TIFF, CHM, DjVu, kuvat, DVI, XPS, OpenDocument, Fiction Book, sarjakuvakirja, Plucker, EPub, faksi
  • Formats de fichiers gérés : PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
    • @@ -147,6 +152,7 @@
  • Πλευρική γραμμή με περιεχόμενα, εικόνες επισκόπησης, αναλύσεις και σελιδοδείκτες
  • Sidebar with contents, thumbnails, reviews and bookmarks
  • Barra lateral con contenido, miniaturas, revisiones y marcadores
    • +
  • Külgriba sisukorra, pisipiltide, arvustuste ja järjehoidjatega
  • Alboko-barra edukiekin, koadro-txikiekin, iritziekin eta laster-markekin
  • Sivupaneeli, jossa sisällys, pienoiskuvat, arvostelut ja kirjanmerkit
  • Barre latérale montrant les contenus, miniatures, informations de relecture et signets
    • @@ -173,6 +179,7 @@
  • Υποστήριξη σημειώσεων
  • Annotations support
  • Permite el uso de notas
    • +
  • Annotatsioonide toetus
  • Idatzoharrak onartzen ditu
  • Merkintöjen tuki
  • Gestion des annotations
    • @@ -203,6 +210,7 @@ Ανάγνωση οδηγού χρήσης στο Okular Reading manual in Okular Lectura del manual en Okular + Käsiraamatu lugemine Okularis Eskuliburua Okularren irakurtzea Oppaan lukeminen Okularissa Lecture d'un manuel dans Okular diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 91284b65e..35ba06dd3 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -255,6 +255,7 @@ Ανάγνωση οδηγού χρήσης στο Okular Reading manual in Okular Lectura del manual en Okular + Käsiraamatu lugemine Okularis Eskuliburua Okularren irakurtzea Oppaan lukeminen Okularissa Lecture d'un manuel dans Okular From 9e4c6cfb688e18aecda8f1bac003d5ce3bcc5bf4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Nov 2019 09:47:25 +0100 Subject: [PATCH 3/8] 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/comicbook/okularApplication_comicbook.desktop | 1 + generators/comicbook/org.kde.mobile.okular_comicbook.desktop | 1 + generators/markdown/libokularGenerator_md.json | 3 +++ generators/markdown/okularApplication_md.desktop | 1 + generators/markdown/org.kde.mobile.okular_md.desktop | 1 + 5 files changed, 7 insertions(+) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 7e2aff0f3..798330db8 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -172,6 +172,7 @@ X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic +X-KDE-Keywords[et]=cbr, cbz, cbt, cb7, Comic Book, koomiks X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index 36c2b1a87..60527f266 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -162,6 +162,7 @@ X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic +X-KDE-Keywords[et]=cbr, cbz, cbt, Comic Book, koomiks X-KDE-Keywords[eu]=cbr, cbz, cbt, komiki-liburua X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book diff --git a/generators/markdown/libokularGenerator_md.json b/generators/markdown/libokularGenerator_md.json index 0956f5315..10f8b71cb 100644 --- a/generators/markdown/libokularGenerator_md.json +++ b/generators/markdown/libokularGenerator_md.json @@ -12,6 +12,7 @@ "Name[el]": "Julian Wolff", "Name[en_GB]": "Julian Wolff", "Name[es]": "Julian Wolff", + "Name[et]": "Julian Wolff", "Name[eu]": "Julian Wolff", "Name[fi]": "Julian Wolff", "Name[fr]": "Julian Wolff", @@ -48,6 +49,7 @@ "Copyright[el]": "© 2017 Julian Wolff", "Copyright[en_GB]": "© 2017 Julian Wolff", "Copyright[es]": "© 2017 Julian Wolff", + "Copyright[et]": "© 2017: Julian Wolff", "Copyright[eu]": "© 2017 Julian Wolff", "Copyright[fi]": "© 2017 Julian Wolff", "Copyright[fr]": "© 2017 Julian Wolff", @@ -88,6 +90,7 @@ "Name[el]": "Σύστημα υποστήριξης markdown", "Name[en_GB]": "Markdown Backend", "Name[es]": "Motor para Markdown", + "Name[et]": "Markdowni taustaprogramm", "Name[eu]": "Markdown-en bizkarraldekoa", "Name[fi]": "Markdown-taustaosa", "Name[fr]": "Moteur de markdown", diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 12808aea1..66c059204 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -174,6 +174,7 @@ X-KDE-Keywords[de]=Markdown X-KDE-Keywords[el]=Markdown X-KDE-Keywords[en_GB]=Markdown X-KDE-Keywords[es]=Markdown +X-KDE-Keywords[et]=Markdown X-KDE-Keywords[eu]=Markdown X-KDE-Keywords[fi]=Markdown X-KDE-Keywords[fr]=Markdown diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index 833109b41..ca004572c 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -164,6 +164,7 @@ X-KDE-Keywords[de]=Markdown X-KDE-Keywords[el]=Markdown X-KDE-Keywords[en_GB]=Markdown X-KDE-Keywords[es]=Markdown +X-KDE-Keywords[et]=Markdown X-KDE-Keywords[eu]=Markdown X-KDE-Keywords[fi]=Markdown X-KDE-Keywords[fr]=Markdown From 2a3d99e8734f5d243027e927f79e3d488edc2945 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Nov 2019 07:55:32 +0100 Subject: [PATCH 4/8] GIT_SILENT made messages (after extraction) --- mobile/app/org.kde.okular.kirigami.appdata.xml | 1 + shell/org.kde.okular.appdata.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 584fc9f3a..18dfa1f52 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -175,6 +175,7 @@
  • Annotations support
  • Admet anotacions
  • Admet anotacions
    • +
  • Podpora poznámek
  • Unterstützung für Anmerkungen
  • Υποστήριξη σημειώσεων
  • Annotations support
    • diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 35ba06dd3..58b22f809 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -214,6 +214,7 @@
  • Annotations support
  • Admet anotacions
  • Admet anotacions
    • +
  • Podpora poznámek
  • Unterstützung für Anmerkungen
  • Υποστήριξη σημειώσεων
  • Annotations support
    • From 1850e8d1ec638b8666e94e560dc559cf97ed55c0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Nov 2019 07:54:36 +0100 Subject: [PATCH 5/8] GIT_SILENT made messages (after extraction) --- generators/markdown/org.kde.okular-md.metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/markdown/org.kde.okular-md.metainfo.xml b/generators/markdown/org.kde.okular-md.metainfo.xml index f12f1ea46..645b4a859 100644 --- a/generators/markdown/org.kde.okular-md.metainfo.xml +++ b/generators/markdown/org.kde.okular-md.metainfo.xml @@ -27,7 +27,7 @@ Markdown Markdown Markdown - Zrážka + Markdown Markdown Маркдаун Markdown From 1f0048c125d2446af3cc54810cd08c6f95dc22b2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Nov 2019 09:11:36 +0100 Subject: [PATCH 6/8] 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/markdown/okularApplication_md.desktop | 2 +- generators/markdown/org.kde.mobile.okular_md.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/markdown/okularApplication_md.desktop b/generators/markdown/okularApplication_md.desktop index 66c059204..91a5f77b7 100644 --- a/generators/markdown/okularApplication_md.desktop +++ b/generators/markdown/okularApplication_md.desktop @@ -189,7 +189,7 @@ X-KDE-Keywords[pl]=Markdown X-KDE-Keywords[pt]=Markdown X-KDE-Keywords[pt_BR]=Markdown X-KDE-Keywords[ru]=Markdown -X-KDE-Keywords[sk]=Zrážka +X-KDE-Keywords[sk]=Markdown X-KDE-Keywords[sl]=Markdown X-KDE-Keywords[sr]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун diff --git a/generators/markdown/org.kde.mobile.okular_md.desktop b/generators/markdown/org.kde.mobile.okular_md.desktop index ca004572c..808ba801d 100644 --- a/generators/markdown/org.kde.mobile.okular_md.desktop +++ b/generators/markdown/org.kde.mobile.okular_md.desktop @@ -179,7 +179,7 @@ X-KDE-Keywords[pl]=Markdown X-KDE-Keywords[pt]=Markdown X-KDE-Keywords[pt_BR]=Markdown X-KDE-Keywords[ru]=Markdown -X-KDE-Keywords[sk]=Zrážka +X-KDE-Keywords[sk]=Markdown X-KDE-Keywords[sl]=Markdown X-KDE-Keywords[sr]=Markdown,маркдаун X-KDE-Keywords[sr@ijekavian]=Markdown,маркдаун From ad50aa4b4eb60ccdeef28e0562af52bfc7a7c7bb Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 26 Nov 2019 23:27:08 +0100 Subject: [PATCH 7/8] GIT_SILENT Upgrade KDE Applications version to 19.11.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96f9072b5..22794f35d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "11") -set (KDE_APPLICATIONS_VERSION_MICRO "80") +set (KDE_APPLICATIONS_VERSION_MICRO "90") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(okular VERSION 1.8.${KDE_APPLICATIONS_VERSION_MICRO}) From 00640370d3b138ef247b5a67a4fc019b968a3cf3 Mon Sep 17 00:00:00 2001 From: Tobias Deiminger Date: Mon, 15 Jul 2019 21:45:28 +0200 Subject: [PATCH 8/8] Fix spurious dialogs in PickPointEngine In the case of multiple input events, the local event loop of QInputDialog was processing pending events before m_creationCompleted could be cleared. This allowed recursive calls to PickPointEngine::end, even on wrong events (e.g. MouseMove shouldn't cause end(), but it did). BUG: 409638 BUG: 413990 --- ui/pageviewannotator.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp index 51e130e1f..cf6aee149 100644 --- a/ui/pageviewannotator.cpp +++ b/ui/pageviewannotator.cpp @@ -799,6 +799,13 @@ QCursor PageViewAnnotator::cursor() const QRect PageViewAnnotator::performRouteMouseOrTabletEvent(const AnnotatorEngine::EventType & eventType, const AnnotatorEngine::Button & button, const QPointF & pos, PageViewItem * item ) { + // creationCompleted is intended to be set by event(), handled subsequently by end(), and cleared within end(). + // If it's set here, we recursed for some reason (e.g., stacked event loop). + // Just bail out, all we want to do is already on stack. + if ( m_engine->creationCompleted() ) { + return QRect(); + } + // if the right mouse button was pressed, we simply do nothing. In this way, we are still editing the annotation // and so this function will receive and process the right mouse button release event too. If we detach now the annotation tool, // the release event will be processed by the PageView class which would create the annotation property widget, and we do not want this.