From 74b78c1ca2eb2c9f9378ae47318b91c2345841ee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 28 May 2022 03:02:18 +0000 Subject: [PATCH 1/8] GIT_SILENT made messages (after extraction) --- mobile/app/org.kde.okular.kirigami.appdata.xml | 2 +- shell/org.kde.okular.appdata.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index 681299f3e..665391a4c 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -92,7 +92,7 @@

اوكلار هو عارض مستندات عالمي تم تطويره بواسطة كدي. يعمل اوكلار على أنظمة أساسية متعددة، بما في ذلك على سبيل المثال لا الحصر Linux و Windows و Mac OS X و * BSD وما إلى ذلك.

Okular KDE tərəfindən yaradılan sənədlərə universal baxış vasitəsidir. Okular Linux, Windows, Mac OS X, * BSD və s. digər bir çox platformada işləyir.

L'Okular és un visor universal de documents desenvolupat pel KDE. L'Okular funciona en múltiples plataformes, incloent-hi però sense limitar-se a Linux, Windows, Mac OS X, *BSD, etc.

-

Okular és un visor universal de documents desenvolupat per KDE. Okular funciona en múltiples plataformes, incloent-hi però sense limitar-se a Linux, Windows, Mac OS X, *BSD, etc.

+

Okular és un visor universal de documents desenvolupat per KDE. Okular funciona en múltiples plataformes, incloent-hi pero sense llimitar-se a Linux, Windows, Mac OS X, *BSD, etc.

Okular ist ein universeller Dokumentenbetrachter, der von KDE entwickelt wird. Okular ist auf mehreren Plattformen verfügbar, darunter auch Linux, Windows, Mac OS X, *BSD usw.

Το 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.

diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 896039b56..83ca51ffe 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -99,7 +99,7 @@

اوكلار هو عارض مستندات عالمي تم تطويره بواسطة كدي. يعمل اوكلار على أنظمة أساسية متعددة، بما في ذلك على سبيل المثال لا الحصر Linux و Windows و Mac OS X و * BSD وما إلى ذلك.

Okular KDE tərəfindən yaradılan sənədlərə universal baxış vasitəsidir. Okular Linux, Windows, Mac OS X, * BSD və s. digər bir çox platformada işləyir.

L'Okular és un visor universal de documents desenvolupat pel KDE. L'Okular funciona en múltiples plataformes, incloent-hi però sense limitar-se a Linux, Windows, Mac OS X, *BSD, etc.

-

Okular és un visor universal de documents desenvolupat per KDE. Okular funciona en múltiples plataformes, incloent-hi però sense limitar-se a Linux, Windows, Mac OS X, *BSD, etc.

+

Okular és un visor universal de documents desenvolupat per KDE. Okular funciona en múltiples plataformes, incloent-hi pero sense llimitar-se a Linux, Windows, Mac OS X, *BSD, etc.

Okular ist ein universeller Dokumentenbetrachter, der von KDE entwickelt wird. Okular ist auf verschiedenen Plattformen verfügbar, darunter auch Linux, Windows, Mac OS X, *BSD usw.

Το 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.

From c823af787b2ed8df85e8ef0ddee3877966d29b9f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 31 May 2022 03:16:29 +0000 Subject: [PATCH 2/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/chm/libokularGenerator_chmlib.json | 2 +- generators/comicbook/libokularGenerator_comicbook.json | 2 +- generators/dvi/libokularGenerator_dvi.json | 2 +- generators/fictionbook/libokularGenerator_fb.json | 2 +- generators/plucker/libokularGenerator_plucker.json | 2 +- generators/poppler/libokularGenerator_poppler.json | 2 +- generators/spectre/libokularGenerator_ghostview.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index 5c22cba88..c0053c269 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -136,7 +136,7 @@ "Description": "A Microsoft Windows help file renderer", "Description[ar]": "عارض مستندات مساعدة ويندوز", "Description[az]": "Microsoft Windows köməkçi fayl tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows", + "Description[ca@valencia]": "Un renderisador de fitxers d'ajuda de Microsoft Windows", "Description[ca]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows", "Description[cs]": "Nástroj pro zobrazování nápovědy Microsoft Windows", "Description[da]": "En gengiver til Microsoft Windows-hjælpfiler", diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 86c3d58d1..cc1ef203a 100644 --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -92,7 +92,7 @@ "Description": "A renderer for various comic book formats", "Description[ar]": "عارض العديد من تنسيقات كتب الهزل", "Description[az]": "Dəyişkən komiks formatları tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador per a diversos formats de ComicBook", + "Description[ca@valencia]": "Un renderisador per a diversos formats de ComicBook", "Description[ca]": "Un renderitzador per a diversos formats de ComicBook", "Description[cs]": "Vykreslovač různých formátů knih komiksů", "Description[da]": "En gengiver til diverse tegneserierformater", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index 8068bc824..e6cc62963 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -91,7 +91,7 @@ "Description": "A DVI file renderer", "Description[ar]": "عارض ملف DVI", "Description[az]": "DVİ faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador de fitxers DVI", + "Description[ca@valencia]": "Un renderisador de fitxers DVI", "Description[ca]": "Un renderitzador de fitxers DVI", "Description[cs]": "Vykreslovač DVI souborů", "Description[da]": "En gengiver til DVI-filer", diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json index aafb44411..36e81892a 100644 --- a/generators/fictionbook/libokularGenerator_fb.json +++ b/generators/fictionbook/libokularGenerator_fb.json @@ -92,7 +92,7 @@ "Description": "A renderer for FictionBook eBooks", "Description[ar]": "عارض الكتب الإلكترونية FictionBook", "Description[az]": "FictionBook eBooks üçün tərtibatçı", - "Description[ca@valencia]": "Un renderitzador per a llibres electrònics FictionBook", + "Description[ca@valencia]": "Un renderisador per a llibres electrònics FictionBook", "Description[ca]": "Un renderitzador per a llibres electrònics FictionBook", "Description[cs]": "Renderer elektronických knih Fiction Book", "Description[da]": "En gengiver til FictionBook-e-bøger", diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json index 9f734428c..a58353f32 100644 --- a/generators/plucker/libokularGenerator_plucker.json +++ b/generators/plucker/libokularGenerator_plucker.json @@ -92,7 +92,7 @@ "Description": "A renderer for Plucker eBooks", "Description[ar]": "عارض كتب الإلكترونية Plucker", "Description[az]": "Plucker eBooks üçün təsvirləmə", - "Description[ca@valencia]": "Un renderitzador per a llibres electrònics Plucker", + "Description[ca@valencia]": "Un renderisador per a llibres electrònics Plucker", "Description[ca]": "Un renderitzador per a llibres electrònics Plucker", "Description[cs]": "Renderer elektronických knih Plucker", "Description[da]": "En gengiver til Plucker-e-bøger", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 3975a2417..53ab0192a 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -92,7 +92,7 @@ "Description": "A PDF file renderer", "Description[ar]": "عارض ملفات بي دي اف", "Description[az]": "PDF faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador de fitxers PDF", + "Description[ca@valencia]": "Un renderisador de fitxers PDF", "Description[ca]": "Un renderitzador de fitxers PDF", "Description[cs]": "Vykreslovač PDF souborů", "Description[da]": "En gengiver til PDF-filer", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index b8faf7eab..8020e054d 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -92,7 +92,7 @@ "Description": "A PostScript file renderer based on the Spectre library", "Description[ar]": "عراض ملفات بوست سكربت بالإعماد على مكتبة Spectre", "Description[az]": "Spectre library'ə əsasında PostScript fayl tərtibatçısı", - "Description[ca@valencia]": "Un renderitzador de fitxers PostScript basat en la biblioteca Spectre", + "Description[ca@valencia]": "Un renderisador 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[da]": "En gengiver til PostScript-filer baseret på Spectre-biblioteket", From 4ba29a42b395d4a3cc28ce5ece884611b1b5080f Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 3 Jun 2022 22:42:47 +0200 Subject: [PATCH 3/8] GIT_SILENT Upgrade release service version to 22.04.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cb72d8a8..c73196948 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 "1") +set (RELEASE_SERVICE_VERSION_MICRO "2") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(okular VERSION ${RELEASE_SERVICE_VERSION}) From 6ad408cd66680d4ef6a6e2888dee4bc350d91d88 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Sat, 4 Jun 2022 10:27:58 +0200 Subject: [PATCH 4/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 bd8af75e3..ba75c62f4 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 147f61ab5..64af00ebc 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 2b0223f59..ce14d9c2b 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 7d5ed61a6..f7af3a17a 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 87a2e8764..009f6abfe 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 0fe07665c..4ebfde431 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 64061ceb4..e5788a823 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 b668f9f93..af64c956f 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 0f1264e19..0b242a48d 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 baaa9586d..44fe2eb06 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 114efb0ed..9971b8226 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 bf0de0e43..b2274d9a3 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 eec4ea1e9..a199b7e32 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 0a96ac28c..30bd14da6 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 06eac4ca5..ee53b4e14 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 7e47c74f9..760519ffc 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 665391a4c..a3c6fabf8 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 83ca51ffe..68ba0d1d7 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 4c576644830717668a38a6afa0dae689059966c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Jun 2022 02:58:00 +0000 Subject: [PATCH 5/8] GIT_SILENT made messages (after extraction) --- 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 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index af64c956f..5bbd76f94 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -8,7 +8,7 @@ الصور Şəkillər Imatges - Imatges + Imàgens Obrázky Bilder Εικόνες @@ -51,7 +51,7 @@ يضيف دعم لقراءة العديد من تنسيقات الصور Şəkil formatlarının oxunması dəstəyini əlavə edir Afegeix la implementació per a llegir molts formats d'imatge - Afig la implementació per a llegir molts formats d'imatge + Afig la implementació per a llegir molts formats d'image Přidává podporu pro čtení formátů obrázků Bietet Unterstützung zum Lesen von vielen Bildformaten Προσθέτει υποστήριξη για την ανάγνωση πολλών τύπων αποθήκευσης εικόνων diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index a3c6fabf8..3d80b744f 100644 --- a/mobile/app/org.kde.okular.kirigami.appdata.xml +++ b/mobile/app/org.kde.okular.kirigami.appdata.xml @@ -173,7 +173,7 @@
  • يدعم التنسيقات: PDF و PS و Tiff و CHM و DjVu و Images و DVI و XPS و Fiction Book و Comic Book و Plucker و EPub و Fax
  • Dəstəklənən formatlar: PDF, PS, Tiff, CHM, DjVu, şəkillər, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imatges, DVI, XPS, Fiction Book, llibres de còmic, Plucker, EPub, Fax
    • -
  • Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imatges, DVI, XPS, Fiction Book, llibres de còmic, Plucker, EPub, Fax
    • +
  • Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imàgens, DVI, XPS, Fiction Book, llibres de còmic, Plucker, EPub, Fax
  • Podporované formáty: PDF, PS, Tiff, CHM, DjVu, obrázky, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Υποστηριζόμενοι τύποι αποθήκευσης: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
    • diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 68ba0d1d7..8de590455 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -187,7 +187,7 @@
  • يدعم التنسيقات: PDF و PS و Tiff و CHM و DjVu و Images و DVI و XPS و Fiction Book و Comic Book و Plucker و EPub و Fax
  • Dəstəklənən formatlar: PDF, PS, Tiff, CHM, DjVu, şəkillər, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imatges, DVI, XPS, Fiction Book, llibres de còmic, Plucker, EPub, Fax
    • -
  • Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imatges, DVI, XPS, Fiction Book, llibres de còmic, Plucker, EPub, Fax
    • +
  • Formats acceptats: PDF, PS, Tiff, CHM, DjVu, imàgens, DVI, XPS, Fiction Book, llibres de còmic, Plucker, EPub, Fax
  • Podporované formáty: PDF, PS, Tiff, CHM, DjVu, obrázky, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Υποστηριζόμενοι τύποι αποθήκευσης: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
    • From 06612d93f0dc58acc0f49a42a7a0f9a2fc13e8ce Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Jun 2022 03:45:56 +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/chm/libokularGenerator_chmlib.json | 2 +- generators/dvi/libokularGenerator_dvi.json | 2 +- generators/kimgio/libokularGenerator_kimgio.json | 4 ++-- generators/poppler/libokularGenerator_poppler.json | 2 +- generators/spectre/libokularGenerator_ghostview.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/okularGenerator.desktop b/core/okularGenerator.desktop index c0dde331e..68f9201cc 100644 --- a/core/okularGenerator.desktop +++ b/core/okularGenerator.desktop @@ -7,7 +7,7 @@ Comment[az]=Okulyar üçün fayl formatı modulu Comment[bg]=Ядро на Okular за файлови формати Comment[bs]=Pozadina formata datoteke za Okular Comment[ca]=Dorsal del format de fitxer per a l'Okular -Comment[ca@valencia]=Dorsal del format de fitxer per a Okular +Comment[ca@valencia]=Dorsal del format de ficher per a Okular Comment[cs]=Podpůrná vrstva formátu souboru pro Okular Comment[da]=Filformatmotor til Okular Comment[de]=Dateiformat-Modul für Okular diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index c0053c269..b0efb65a1 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -136,7 +136,7 @@ "Description": "A Microsoft Windows help file renderer", "Description[ar]": "عارض مستندات مساعدة ويندوز", "Description[az]": "Microsoft Windows köməkçi fayl tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fitxers d'ajuda de Microsoft Windows", + "Description[ca@valencia]": "Un renderisador de fichers d'ajuda de Microsoft Windows", "Description[ca]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows", "Description[cs]": "Nástroj pro zobrazování nápovědy Microsoft Windows", "Description[da]": "En gengiver til Microsoft Windows-hjælpfiler", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index e6cc62963..83676580b 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -91,7 +91,7 @@ "Description": "A DVI file renderer", "Description[ar]": "عارض ملف DVI", "Description[az]": "DVİ faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fitxers DVI", + "Description[ca@valencia]": "Un renderisador de fichers DVI", "Description[ca]": "Un renderitzador de fitxers DVI", "Description[cs]": "Vykreslovač DVI souborů", "Description[da]": "En gengiver til DVI-filer", diff --git a/generators/kimgio/libokularGenerator_kimgio.json b/generators/kimgio/libokularGenerator_kimgio.json index 14db97091..c961b03ba 100644 --- a/generators/kimgio/libokularGenerator_kimgio.json +++ b/generators/kimgio/libokularGenerator_kimgio.json @@ -182,7 +182,7 @@ "Description": "A simple image backend", "Description[ar]": "خلفية صور بسيطة", "Description[az]": "Sadə şəkil modulu", - "Description[ca@valencia]": "Un dorsal d'imatges senzill", + "Description[ca@valencia]": "Un dorsal d'imàgens senzill", "Description[ca]": "Un dorsal d'imatges senzill", "Description[cs]": "Jednoduchá podpůrná vrstva obrázků", "Description[da]": "En simpel billed-backend", @@ -254,7 +254,7 @@ "Name": "Image Backend", "Name[ar]": "خلفية الصور", "Name[az]": "Image Backend", - "Name[ca@valencia]": "Dorsal d'imatges", + "Name[ca@valencia]": "Dorsal d'imàgens", "Name[ca]": "Dorsal d'imatges", "Name[cs]": "Podpůrná vrstva obrázků", "Name[da]": "Billed-backend", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 53ab0192a..69d107218 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -92,7 +92,7 @@ "Description": "A PDF file renderer", "Description[ar]": "عارض ملفات بي دي اف", "Description[az]": "PDF faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fitxers PDF", + "Description[ca@valencia]": "Un renderisador de fichers PDF", "Description[ca]": "Un renderitzador de fitxers PDF", "Description[cs]": "Vykreslovač PDF souborů", "Description[da]": "En gengiver til PDF-filer", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index 8020e054d..f5f28bcd3 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -92,7 +92,7 @@ "Description": "A PostScript file renderer based on the Spectre library", "Description[ar]": "عراض ملفات بوست سكربت بالإعماد على مكتبة Spectre", "Description[az]": "Spectre library'ə əsasında PostScript fayl tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fitxers PostScript basat en la biblioteca Spectre", + "Description[ca@valencia]": "Un renderisador de fichers 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[da]": "En gengiver til PostScript-filer baseret på Spectre-biblioteket", From b910edafb66753945344a7b32e1f927a529d7231 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Jun 2022 03:27:27 +0000 Subject: [PATCH 7/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/chm/libokularGenerator_chmlib.json | 2 +- generators/dvi/libokularGenerator_dvi.json | 2 +- generators/poppler/libokularGenerator_poppler.json | 2 +- generators/spectre/libokularGenerator_ghostview.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/okularGenerator.desktop b/core/okularGenerator.desktop index 68f9201cc..c0dde331e 100644 --- a/core/okularGenerator.desktop +++ b/core/okularGenerator.desktop @@ -7,7 +7,7 @@ Comment[az]=Okulyar üçün fayl formatı modulu Comment[bg]=Ядро на Okular за файлови формати Comment[bs]=Pozadina formata datoteke za Okular Comment[ca]=Dorsal del format de fitxer per a l'Okular -Comment[ca@valencia]=Dorsal del format de ficher per a Okular +Comment[ca@valencia]=Dorsal del format de fitxer per a Okular Comment[cs]=Podpůrná vrstva formátu souboru pro Okular Comment[da]=Filformatmotor til Okular Comment[de]=Dateiformat-Modul für Okular diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index b0efb65a1..c0053c269 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -136,7 +136,7 @@ "Description": "A Microsoft Windows help file renderer", "Description[ar]": "عارض مستندات مساعدة ويندوز", "Description[az]": "Microsoft Windows köməkçi fayl tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fichers d'ajuda de Microsoft Windows", + "Description[ca@valencia]": "Un renderisador de fitxers d'ajuda de Microsoft Windows", "Description[ca]": "Un renderitzador de fitxers d'ajuda de Microsoft Windows", "Description[cs]": "Nástroj pro zobrazování nápovědy Microsoft Windows", "Description[da]": "En gengiver til Microsoft Windows-hjælpfiler", diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index 83676580b..e6cc62963 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -91,7 +91,7 @@ "Description": "A DVI file renderer", "Description[ar]": "عارض ملف DVI", "Description[az]": "DVİ faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fichers DVI", + "Description[ca@valencia]": "Un renderisador de fitxers DVI", "Description[ca]": "Un renderitzador de fitxers DVI", "Description[cs]": "Vykreslovač DVI souborů", "Description[da]": "En gengiver til DVI-filer", diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 69d107218..53ab0192a 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -92,7 +92,7 @@ "Description": "A PDF file renderer", "Description[ar]": "عارض ملفات بي دي اف", "Description[az]": "PDF faylı tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fichers PDF", + "Description[ca@valencia]": "Un renderisador de fitxers PDF", "Description[ca]": "Un renderitzador de fitxers PDF", "Description[cs]": "Vykreslovač PDF souborů", "Description[da]": "En gengiver til PDF-filer", diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index f5f28bcd3..8020e054d 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -92,7 +92,7 @@ "Description": "A PostScript file renderer based on the Spectre library", "Description[ar]": "عراض ملفات بوست سكربت بالإعماد على مكتبة Spectre", "Description[az]": "Spectre library'ə əsasında PostScript fayl tərtibatçısı", - "Description[ca@valencia]": "Un renderisador de fichers PostScript basat en la biblioteca Spectre", + "Description[ca@valencia]": "Un renderisador 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[da]": "En gengiver til PostScript-filer baseret på Spectre-biblioteket", From 1e6ee25f0bf1a541f9eb3fd525efc4614a9e0d13 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 9 Jun 2022 00:52:17 +0200 Subject: [PATCH 8/8] Allow word-wrapping for the "Welcome to Okular" message --- shell/welcomescreen.ui | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/shell/welcomescreen.ui b/shell/welcomescreen.ui index 2af3cfadc..197323d75 100644 --- a/shell/welcomescreen.ui +++ b/shell/welcomescreen.ui @@ -139,12 +139,6 @@ SPDX-License-Identifier: GPL-2.0-or-later - - - 0 - 0 - - 0 @@ -164,6 +158,9 @@ SPDX-License-Identifier: GPL-2.0-or-later Qt::AlignCenter + + true + 0