From 0ccb4fcf9cf6aad203853ace26c2ca929c8dd436 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Sat, 7 May 2022 11:17:16 +0200 Subject: [PATCH 1/8] GIT_SILENT Upgrade release service version to 22.04.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cfd4a33b..7cb72d8a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "22") set (RELEASE_SERVICE_VERSION_MINOR "04") -set (RELEASE_SERVICE_VERSION_MICRO "0") +set (RELEASE_SERVICE_VERSION_MICRO "1") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(okular VERSION ${RELEASE_SERVICE_VERSION}) From 3144226af6f430242b134695361e3419af3aa24a Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Sat, 7 May 2022 11:34:30 +0200 Subject: [PATCH 2/8] GIT_SILENT Update Appstream for new release --- 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/markdown/org.kde.okular-md.metainfo.xml | 2 +- generators/mobipocket/org.kde.okular-mobipocket.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 +- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- shell/org.kde.okular.appdata.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/generators/chm/org.kde.okular-chm.metainfo.xml b/generators/chm/org.kde.okular-chm.metainfo.xml index a327ba82b..bd8af75e3 100644 --- a/generators/chm/org.kde.okular-chm.metainfo.xml +++ b/generators/chm/org.kde.okular-chm.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml index 0cbb9b901..9af2bf6fc 100644 --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -98,9 +98,9 @@ https://okular.kde.org + - diff --git a/generators/djvu/org.kde.okular-djvu.metainfo.xml b/generators/djvu/org.kde.okular-djvu.metainfo.xml index 4f216d65e..2b0223f59 100644 --- a/generators/djvu/org.kde.okular-djvu.metainfo.xml +++ b/generators/djvu/org.kde.okular-djvu.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/generators/dvi/org.kde.okular-dvi.metainfo.xml b/generators/dvi/org.kde.okular-dvi.metainfo.xml index 6730adfad..7d5ed61a6 100644 --- a/generators/dvi/org.kde.okular-dvi.metainfo.xml +++ b/generators/dvi/org.kde.okular-dvi.metainfo.xml @@ -97,9 +97,9 @@ https://okular.kde.org + - diff --git a/generators/epub/org.kde.okular-epub.metainfo.xml b/generators/epub/org.kde.okular-epub.metainfo.xml index 6e9413d11..788f9e0ac 100644 --- a/generators/epub/org.kde.okular-epub.metainfo.xml +++ b/generators/epub/org.kde.okular-epub.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/generators/fax/org.kde.okular-fax.metainfo.xml b/generators/fax/org.kde.okular-fax.metainfo.xml index f2f3c574c..0fe07665c 100644 --- a/generators/fax/org.kde.okular-fax.metainfo.xml +++ b/generators/fax/org.kde.okular-fax.metainfo.xml @@ -96,9 +96,9 @@ https://okular.kde.org + - diff --git a/generators/fictionbook/org.kde.okular-fb.metainfo.xml b/generators/fictionbook/org.kde.okular-fb.metainfo.xml index e6aac6661..64061ceb4 100644 --- a/generators/fictionbook/org.kde.okular-fb.metainfo.xml +++ b/generators/fictionbook/org.kde.okular-fb.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index 9e4e9b937..765ff1ea2 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -118,9 +118,9 @@ https://okular.kde.org + - diff --git a/generators/markdown/org.kde.okular-md.metainfo.xml b/generators/markdown/org.kde.okular-md.metainfo.xml index e8a7030e5..0f1264e19 100644 --- a/generators/markdown/org.kde.okular-md.metainfo.xml +++ b/generators/markdown/org.kde.okular-md.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml index 783a5a81b..baaa9586d 100644 --- a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml +++ b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml @@ -118,9 +118,9 @@ https://okular.kde.org + - diff --git a/generators/plucker/org.kde.okular-plucker.metainfo.xml b/generators/plucker/org.kde.okular-plucker.metainfo.xml index 8333c6fa1..114efb0ed 100644 --- a/generators/plucker/org.kde.okular-plucker.metainfo.xml +++ b/generators/plucker/org.kde.okular-plucker.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/generators/poppler/org.kde.okular-poppler.metainfo.xml b/generators/poppler/org.kde.okular-poppler.metainfo.xml index 29175f305..bf0de0e43 100644 --- a/generators/poppler/org.kde.okular-poppler.metainfo.xml +++ b/generators/poppler/org.kde.okular-poppler.metainfo.xml @@ -98,9 +98,9 @@ https://okular.kde.org + - diff --git a/generators/spectre/org.kde.okular-spectre.metainfo.xml b/generators/spectre/org.kde.okular-spectre.metainfo.xml index 2232b8117..eec4ea1e9 100644 --- a/generators/spectre/org.kde.okular-spectre.metainfo.xml +++ b/generators/spectre/org.kde.okular-spectre.metainfo.xml @@ -102,9 +102,9 @@ https://okular.kde.org + - diff --git a/generators/tiff/org.kde.okular-tiff.metainfo.xml b/generators/tiff/org.kde.okular-tiff.metainfo.xml index 0110d0877..0a96ac28c 100644 --- a/generators/tiff/org.kde.okular-tiff.metainfo.xml +++ b/generators/tiff/org.kde.okular-tiff.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/generators/txt/org.kde.okular-txt.metainfo.xml b/generators/txt/org.kde.okular-txt.metainfo.xml index 8b9aa4204..06eac4ca5 100644 --- a/generators/txt/org.kde.okular-txt.metainfo.xml +++ b/generators/txt/org.kde.okular-txt.metainfo.xml @@ -94,9 +94,9 @@ https://okular.kde.org + - diff --git a/generators/xps/org.kde.okular-xps.metainfo.xml b/generators/xps/org.kde.okular-xps.metainfo.xml index 3178856ad..7e47c74f9 100644 --- a/generators/xps/org.kde.okular-xps.metainfo.xml +++ b/generators/xps/org.kde.okular-xps.metainfo.xml @@ -95,9 +95,9 @@ https://okular.kde.org + - diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 3fa0f691d..7dce7e32f 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -335,9 +335,9 @@ okularkirigami + - diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index b04ea03bf..642306493 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -368,6 +368,7 @@ 251 + @@ -379,6 +380,5 @@ - From ff8932363b0bfd0c9d200ac959118d0053b2cf2b Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sun, 8 May 2022 18:34:14 +0200 Subject: [PATCH 3/8] Add Windows CI --- .gitlab-ci.yml | 1 + .kde-ci.yml | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f52bf2892..c4f4020ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml build_ubuntu_20_04: stage: build diff --git a/.kde-ci.yml b/.kde-ci.yml index a3257be92..91f2ceac8 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -16,10 +16,15 @@ Dependencies: 'require': 'frameworks/kactivities': '@stable' 'frameworks/khtml': '@stable' - 'frameworks/kjs': '@stable' 'frameworks/kpty': '@stable' 'graphics/libkexiv2': '@same' +- 'on': ['Linux', 'FreeBSD', 'Windows'] + 'require': + 'frameworks/kjs': '@stable' + 'frameworks/kwallet': '@stable' + 'frameworks/kparts': '@stable' + - 'on': ['Android'] 'require': 'frameworks/kirigami': '@stable' From c53a64c8da3bf5ea5cc24c5fe757d81129faedab Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 May 2022 02:50:27 +0000 Subject: [PATCH 4/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/xps/libokularGenerator_xps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/xps/libokularGenerator_xps.json b/generators/xps/libokularGenerator_xps.json index 81c2be2ca..591ef10e4 100644 --- a/generators/xps/libokularGenerator_xps.json +++ b/generators/xps/libokularGenerator_xps.json @@ -39,6 +39,7 @@ "Name[sr@latin]": "Bred Hards", "Name[sr]": "Бред Хардс", "Name[sv]": "Brad Hards", + "Name[ta]": "பிராட் ஹார்ட்ஸ்", "Name[tr]": "Brad Hards", "Name[uk]": "Brad Hards", "Name[vi]": "Brad Hards", From 9b57bb847ef1c621d6c75d0514457902fbaa16f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 13 May 2022 02:11:05 +0000 Subject: [PATCH 5/8] GIT_SILENT made messages (after extraction) --- generators/kimgio/org.kde.okular-kimgio.metainfo.xml | 2 +- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- shell/org.kde.okular.appdata.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index 765ff1ea2..2161407a8 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -86,7 +86,7 @@ பல படப் படிவங்களுக்கான ஆதரவை சேர்க்கும் Birçok resim biçimini okuma desteği ekler Додає підтримку читання зображень у багатьох форматах - Thêm hỗ trợ đọc nhiều dạng thức ảnh + Thêm hỗ trợ đọc nhiều định dạng ảnh xxAdds support for reading many image formatsxx 支持多种图片格式的阅读 加入讀取許多影像格式的支援 diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 7dce7e32f..90a1fc845 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -199,7 +199,7 @@
  • ஆதரிக்கப்படும் கோப்பு வகைகள்: PDF, PS, Tiff, CHM, DjVu, படங்கள், DVI, XPS, Fiction Book, வரைகதை புத்தகம், Plucker, EPub, Fax
  • Desteklenen Biçimler: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Підтримувані формати: PDF, PS, Tiff, CHM, DjVu, зображення, DVI, XPS, Fiction Book, комікси, Plucker, EPub, факси.
    • -
  • Hỗ trợ các dạng thức: PDF, PS, Tiff, CHM, DjVu, ảnh, DVI, XPS, FictionBook, truyện tranh, Plucker, EPub, Fax
    • +
  • Hỗ trợ các định dạng: PDF, PS, Tiff, CHM, DjVu, ảnh, DVI, XPS, FictionBook, truyện tranh, Plucker, EPub, Fax
  • xxSupported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Faxxx
  • 支持格式：PDF、PS、TIFF、CHM、DjVu、图像、DVI、XPS、ODT、FictionBook (FB*)、Comic Book (CB*)、Plucker、EPub、传真
  • Sidebar with contents, thumbnails, reviews and bookmarks
    • diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 642306493..ac8c5640a 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -213,7 +213,7 @@
  • ஆதரிக்கப்படும் கோப்பு வகைகள்: PDF, PS, Tiff, CHM, DjVu, படங்கள், DVI, XPS, Fiction Book, வரைகதை புத்தகம், Plucker, EPub, Fax
  • Desteklenen Biçimler: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Підтримувані формати: PDF, PS, Tiff, CHM, DjVu, зображення, DVI, XPS, Fiction Book, комікси, Plucker, EPub, факси.
    • -
  • Hỗ trợ các dạng thức: PDF, PS, Tiff, CHM, DjVu, ảnh, DVI, XPS, FictionBook, truyện tranh, Plucker, EPub, Fax
    • +
  • Hỗ trợ các định dạng: PDF, PS, Tiff, CHM, DjVu, ảnh, DVI, XPS, FictionBook, truyện tranh, Plucker, EPub, Fax
  • xxSupported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Faxxx
  • 支持格式：PDF、PS、TIFF、CHM、DjVu、图像、DVI、XPS、ODT、FictionBook (FB*)、Comic Book (CB*)、Plucker、EPub、传真
  • Sidebar with contents, thumbnails, reviews and bookmarks
    • From ad813d66677e2f0c02ef4e87a1b1b1b7f4947a13 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 13 May 2022 02:49:57 +0000 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" --- core/okularGenerator.desktop | 2 +- generators/comicbook/libokularGenerator_comicbook.json | 2 +- generators/poppler/okularApplication_pdf.desktop | 2 +- generators/poppler/org.kde.mobile.okular_pdf.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/okularGenerator.desktop b/core/okularGenerator.desktop index f0db46ec0..c0dde331e 100644 --- a/core/okularGenerator.desktop +++ b/core/okularGenerator.desktop @@ -56,7 +56,7 @@ Comment[ta]=ஆக்குலருக்கான கோப்புப் ப Comment[th]=แบ็กเอนด์รูปแบบแฟ้มสำหรับ Okular Comment[tr]=Okular için dosya biçimi arka ucu Comment[uk]=Модуль типів файлів для okular -Comment[vi]=Hậu phương dạng thức tệp cho Okular +Comment[vi]=Hậu phương định dạng tệp cho Okular Comment[x-test]=xxFile format backend for Okularxx Comment[zh_CN]=Okular 文件格式后端 Comment[zh_TW]=Okular 檔案格式後端 diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 301b4c958..86c3d58d1 100644 --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -125,7 +125,7 @@ "Description[sv]": "Ett återgivningsprogram för diverse format för serieböcker", "Description[tr]": "Çeşitli çizgi roman biçimleri için bir oluşturucu", "Description[uk]": "Програма для відображення коміксів у різних форматах", - "Description[vi]": "Một trình kết xuất cho nhiều dạng thức truyện tranh khác nhau", + "Description[vi]": "Một trình kết xuất cho nhiều định dạng truyện tranh khác nhau", "Description[x-test]": "xxA renderer for various comic book formatsxx", "Description[zh_CN]": "多种漫画书格式的渲染器", "Description[zh_TW]": "多種漫畫書的成像器", diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index 07f59df95..d9b78b46d 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -227,7 +227,7 @@ X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[ta]=PDF, Portable Document Format, பிடிஎஃப், பீடீஎஃப் X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[vi]=PDF, Dạng thức tài liệu linh động +X-KDE-Keywords[vi]=PDF, Định dạng tài liệu linh động X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format diff --git a/generators/poppler/org.kde.mobile.okular_pdf.desktop b/generators/poppler/org.kde.mobile.okular_pdf.desktop index 80a4fa340..4fbb553df 100644 --- a/generators/poppler/org.kde.mobile.okular_pdf.desktop +++ b/generators/poppler/org.kde.mobile.okular_pdf.desktop @@ -218,7 +218,7 @@ X-KDE-Keywords[sv]=PDF, Portabelt dokumentformat X-KDE-Keywords[ta]=PDF, Portable Document Format, பிடிஎஃப், பீடீஎஃப் X-KDE-Keywords[tr]=PDF, Taşınabilir Belge Biçimi X-KDE-Keywords[uk]=PDF,Portable Document Format,пдф -X-KDE-Keywords[vi]=PDF, Dạng thức tài liệu linh động +X-KDE-Keywords[vi]=PDF, Định dạng tài liệu linh động X-KDE-Keywords[x-test]=xxPDFxx,xx Portable Document Formatxx X-KDE-Keywords[zh_CN]=PDF, Portable Document Format,开放文档格式 X-KDE-Keywords[zh_TW]=PDF, Portable Document Format From dbe951e1039dd5d8f50131266a62fa7c4023b11c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 17 May 2022 02:10:46 +0000 Subject: [PATCH 7/8] GIT_SILENT made messages (after extraction) --- generators/comicbook/org.kde.okular-comicbook.metainfo.xml | 2 +- generators/epub/org.kde.okular-epub.metainfo.xml | 2 +- generators/kimgio/org.kde.okular-kimgio.metainfo.xml | 4 ++-- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- shell/org.kde.okular.appdata.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml index 9af2bf6fc..147f61ab5 100644 --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -41,7 +41,7 @@ Stripovi Comic Book காமிக் புத்தகங்கள் - Çizgiromanlar + Çizgi Romanlar Комікси Truyện tranh xxComic Booksxx diff --git a/generators/epub/org.kde.okular-epub.metainfo.xml b/generators/epub/org.kde.okular-epub.metainfo.xml index 788f9e0ac..87a2e8764 100644 --- a/generators/epub/org.kde.okular-epub.metainfo.xml +++ b/generators/epub/org.kde.okular-epub.metainfo.xml @@ -84,7 +84,7 @@ Podrška za čitanje e‑knjiga Lägger till stöd för att läsa e-böcker மின்புத்தகங்களைப் படிப்பதற்கான ஆதரவை சேர்க்கும் - E-Kitapları okumak için destek ekler + E-kitapları okumak için destek ekler Додає підтримку читання електронних книг Thêm hỗ trợ đọc sách điện tử xxAdds support for reading E-Booksxx diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index 2161407a8..b668f9f93 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -41,7 +41,7 @@ Slike Bilder படங்கள் - Resimler + Görseller Зображення Ảnh xxImagesxx @@ -84,7 +84,7 @@ Podrška za čitanje raznih formata slika Lägger till stöd för att läsa många bildformat பல படப் படிவங்களுக்கான ஆதரவை சேர்க்கும் - Birçok resim biçimini okuma desteği ekler + Birçok görsel biçimini okuma desteği ekler Додає підтримку читання зображень у багатьох форматах Thêm hỗ trợ đọc nhiều định dạng ảnh xxAdds support for reading many image formatsxx diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 90a1fc845..681299f3e 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -235,7 +235,7 @@
  • Stranska vrstica z vsebino, sličicami, pregledi in zaznamki
  • Sidorad med innehåll, miniatyrbilder, granskningar och bokmärken
  • பொருளடக்கம், சிறுபடங்கள், குறிப்புகள், மற்றும் நினைவுக்குறிகளை காட்டும் ஓரப்பட்டை
    • -
  • İçindekiler, küçük resimler, incelemeler ve yer imleri bulunan kenar çubuğu
    • +
  • İçindekiler, küçük görseller, incelemeler ve yer imleri bulunan kenar çubuğu
  • Бічні панелі зі списками змісту, мініатюрами сторінок, можливість рецензування та додавання закладок.
  • Thanh bên với mục lục, hình nhỏ, nhận xét và dấu nhớ
  • xxSidebar with contents, thumbnails, reviews and bookmarksxx
    • diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index ac8c5640a..896039b56 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -253,7 +253,7 @@
  • Bočna traka sa sadržajem, sličicama, recenzijama i obeleživačima.
  • Sidorad med innehåll, miniatyrbilder, granskningar och bokmärken
  • பொருளடக்கம், சிறுபடங்கள், குறிப்புகள், மற்றும் நினைவுக்குறிகளை காட்டும் ஓரப்பட்டை
    • -
  • İçindekiler, küçük resimler, incelemeler ve yer imleri bulunan kenar çubuğu
    • +
  • İçindekiler, küçük görseller, incelemeler ve yer imleri bulunan kenar çubuğu
  • Бічні панелі зі списками змісту, мініатюрами сторінок, можливість рецензування та додавання закладок.
  • Thanh bên với mục lục, hình nhỏ, nhận xét và dấu nhớ
  • xxSidebar with contents, thumbnails, reviews and bookmarksxx
    • From 1a980008be43e006c21254c45a06b7dd17a215bd Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 18 May 2022 23:12:18 +0200 Subject: [PATCH 8/8] Fix crash while undoing with the menu on an empty annotation BUGS: 453987 --- part/annotwindow.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/part/annotwindow.cpp b/part/annotwindow.cpp index c446c0d11..de408292c 100644 --- a/part/annotwindow.cpp +++ b/part/annotwindow.cpp @@ -326,7 +326,16 @@ void AnnotWindow::slotUpdateUndoAndRedoInContextMenu(QMenu *menu) QList actionList = menu->actions(); enum { UndoAct, RedoAct, CutAct, CopyAct, PasteAct, ClearAct, SelectAllAct, NCountActs }; - QAction *kundo = KStandardAction::create(KStandardAction::Undo, m_document, SLOT(undo()), menu); + QAction *kundo = KStandardAction::create( + KStandardAction::Undo, + m_document, + [doc = m_document] { + // We need a QueuedConnection because undoing may end up destroying the menu this action is on + // because it will undo the addition of the annotation. If it's not queued things gets unhappy + // because the menu is destroyed in the middle of processing the click on the menu itself + QMetaObject::invokeMethod(doc, &Okular::Document::undo, Qt::QueuedConnection); + }, + menu); QAction *kredo = KStandardAction::create(KStandardAction::Redo, m_document, SLOT(redo()), menu); connect(m_document, &Okular::Document::canUndoChanged, kundo, &QAction::setEnabled); connect(m_document, &Okular::Document::canRedoChanged, kredo, &QAction::setEnabled);