From 16b05006eb3730ecdb362445b037185b3a2088da Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Mar 2022 02:51:38 +0000 Subject: [PATCH 1/3] GIT_SILENT made messages (after extraction) --- mobile/app/org.kde.okular.kirigami.appdata.xml | 3 ++- shell/org.kde.okular.appdata.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml index b6cd8ae15..e46d22945 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.

-

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 pel KDE. Okular funciona en múltiples plataformes, incloent-hi però sense limitar-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.

@@ -193,6 +193,7 @@
  • Formatos Suportados: PDF, PS, Tiff, CHM, DjVu, Imagens, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Suporte aos formatos: PDF, PS, TIFF, CHM, DjVu, imagens, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Formate susținute: PDF, PS, Tiff, CHM, DjVu, imagini, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
    • +
  • Podporované formáty: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Podprti formati: PDF, PS, Tiff, CHM, DjVu, slike, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Format som stöds: PDF, PS, Tiff, CHM, DjVu, bilder, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • ஆதரிக்கப்படும் கோப்பு வகைகள்: PDF, PS, Tiff, CHM, DjVu, படங்கள், DVI, XPS, Fiction Book, வரைகதை புத்தகம், Plucker, EPub, Fax
    • diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 3accd505e..3a8a314cc 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.

    -

    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 pel KDE. Okular funciona en múltiples plataformes, incloent-hi però sense limitar-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.

    @@ -207,6 +207,7 @@
  • Formatos Suportados: PDF, PS, Tiff, CHM, DjVu, Imagens, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Suporte aos formatos: PDF, PS, TIFF, CHM, DjVu, imagens, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Formate susținute: PDF, PS, Tiff, CHM, DjVu, imagini, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
    • +
  • Podporované formáty: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Podprte vrste: PDF, PS, Tiff, CHM, DjVu, slike, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Format som stöds: PDF, PS, Tiff, CHM, DjVu, bilder, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax
  • ஆதரிக்கப்படும் கோப்பு வகைகள்: PDF, PS, Tiff, CHM, DjVu, படங்கள், DVI, XPS, Fiction Book, வரைகதை புத்தகம், Plucker, EPub, Fax
    • From 46ddb1abe7f00a05c666c453c2d5f304489d502d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Mar 2022 03:41:52 +0000 Subject: [PATCH 2/3] 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/okularGenerator.desktop b/core/okularGenerator.desktop index df979963d..f0db46ec0 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 l'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 From adc01be2639706c9425766f49093282ea8c9eb84 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 29 Mar 2022 13:28:56 +0200 Subject: [PATCH 3/3] Don't create a KIconLoader instance Just to load an icon, we can use `QIcon::fromTheme` for that. --- shell/welcomescreen.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/shell/welcomescreen.cpp b/shell/welcomescreen.cpp index f0863d516..62faac1fc 100644 --- a/shell/welcomescreen.cpp +++ b/shell/welcomescreen.cpp @@ -117,9 +117,7 @@ WelcomeScreen::WelcomeScreen(QWidget *parent) setupUi(this); - KIconLoader loader; - - appIcon->setPixmap(loader.loadIcon(QStringLiteral("okular"), KIconLoader::Group::Desktop, KIconLoader::SizeEnormous)); + appIcon->setPixmap(QIcon::fromTheme(QStringLiteral("okular")).pixmap(KIconLoader::SizeEnormous)); connect(openButton, &QPushButton::clicked, this, &WelcomeScreen::openClicked); connect(closeButton, &QPushButton::clicked, this, &WelcomeScreen::closeClicked);