From 90c7d1c76924623bcb44559dc3f006c87897e958 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 8 May 2017 13:01:46 +0200 Subject: [PATCH 1/6] GIT_SILENT Upgrade KDE Applications version to 17.04.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34ea3729a..6cdb0c3f5 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 "04") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") include(ECMInstallIcons) From 2779bb6c0c94b0be76450477407dd120a35262d3 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Mon, 8 May 2017 15:17:48 +0200 Subject: [PATCH 2/6] Don't repeat work of KAboutData::setApplicationData(), set window icon --- shell/main.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/shell/main.cpp b/shell/main.cpp index cb240cc73..27a998ba3 100644 --- a/shell/main.cpp +++ b/shell/main.cpp @@ -34,14 +34,11 @@ int main(int argc, char** argv) KLocalizedString::setApplicationDomain("okular"); KAboutData aboutData = okularAboutData(); - - app.setApplicationName(aboutData.applicationData().componentName()); - app.setApplicationDisplayName(aboutData.applicationData().displayName()); - app.setApplicationVersion(aboutData.version()); - app.setOrganizationDomain(QStringLiteral("kde.org")); + KAboutData::setApplicationData(aboutData); + // set icon for shells which do not use desktop file metadata + QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular"))); QCommandLineParser parser; - KAboutData::setApplicationData(aboutData); // The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); parser.addVersionOption(); From 58d23a20ae9e43827896f201011b779515ddd394 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 12 May 2017 04:56:11 +0200 Subject: [PATCH 3/6] 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 ++ .../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 | 7 +++++++ 17 files changed, 39 insertions(+) diff --git a/generators/chm/org.kde.okular-chm.metainfo.xml b/generators/chm/org.kde.okular-chm.metainfo.xml index 89150f659..371e93880 100644 --- a/generators/chm/org.kde.okular-chm.metainfo.xml +++ b/generators/chm/org.kde.okular-chm.metainfo.xml @@ -15,6 +15,7 @@ Documentos CHM CHM-dokumendid CHM-tiedostot + Documents CHM Documenti CHM CHM 문서 CHM-documenten @@ -43,6 +44,7 @@ Permite la lectura de documentos CHM CHM-dokumentide lugemise toetus Lisää CHM-tiedostojen lukutuen + Permet la lecture des documents CHM Aggiunge il supporto per la lettura di documenti CHM CHM 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van CHM-documenten toe diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml index 969dc2b41..9ea3560ba 100644 --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -15,6 +15,7 @@ Libros de cómics Koomiksid Sarjakuvakirjat + Bandes dessinées Fumetti 만화책 Stripboeken @@ -43,6 +44,7 @@ Permite la lectura de libros de cómics Koomiksite lugemise toetus Lisää sarjakuvakirjojen lukutuen + Permet la lecture des bandes dessinées Aggiunge il supporto per la lettura di fumetti 만화책 읽기 지원 추가 Voegt ondersteuning voor lezen van stripboeken toe diff --git a/generators/djvu/org.kde.okular-djvu.metainfo.xml b/generators/djvu/org.kde.okular-djvu.metainfo.xml index 644901a20..13871edac 100644 --- a/generators/djvu/org.kde.okular-djvu.metainfo.xml +++ b/generators/djvu/org.kde.okular-djvu.metainfo.xml @@ -15,6 +15,7 @@ Documentos DjVu DjVu dokumendid DjVu-tiedostot + Documents DjVu Documenti DjVu DjVu 문서 DjVu-documenten @@ -43,6 +44,7 @@ Permite la lectura de documentos DjVu DjVu dokumentide lugemise toetus Lisää DjVu-tiedostojen lukutuen + Permet la lecture des documents DjVu Aggiunge il supporto per la lettura di documenti DjVu DjVu 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van DjVu-documenten toe diff --git a/generators/dvi/org.kde.okular-dvi.metainfo.xml b/generators/dvi/org.kde.okular-dvi.metainfo.xml index e8fde75d2..a72b9a0ac 100644 --- a/generators/dvi/org.kde.okular-dvi.metainfo.xml +++ b/generators/dvi/org.kde.okular-dvi.metainfo.xml @@ -15,6 +15,7 @@ Documentos DVI DVI dokumendid DVI-tiedostot + Documents DVI Documenti DVI DVI 문서 DVI-documenten @@ -43,6 +44,7 @@ Permite la lectura de documentos DVI DVI dokumentide lugemise toetus Lisää DVI-tiedostojen lukutuen + Permet la lecture des documents DVI Aggiunge il supporto per la lettura di documenti DVI DVI 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van DVI-documenten toe diff --git a/generators/epub/org.kde.okular-epub.metainfo.xml b/generators/epub/org.kde.okular-epub.metainfo.xml index 8f575885a..9f589361c 100644 --- a/generators/epub/org.kde.okular-epub.metainfo.xml +++ b/generators/epub/org.kde.okular-epub.metainfo.xml @@ -15,6 +15,7 @@ EPub EPub EPub + EPub EPub EPub EPub @@ -43,6 +44,7 @@ Permite la lectura de libros electrónicos E-raamatute lugemise toetus Lisää e-kirjojen lukutuen + Permet la lecture des E-Books Aggiunge il supporto per la lettura di libri digitali in formato EPub 전자책 읽기 지원 추가 Voegt ondersteuning voor lezen van e-boeken toe diff --git a/generators/fax/org.kde.okular-fax.metainfo.xml b/generators/fax/org.kde.okular-fax.metainfo.xml index 9b723fe69..9e87ed748 100644 --- a/generators/fax/org.kde.okular-fax.metainfo.xml +++ b/generators/fax/org.kde.okular-fax.metainfo.xml @@ -15,6 +15,7 @@ Fax Faks Faksi + Fax Fax 팩스 Fax @@ -43,6 +44,7 @@ Permite la lectura de documentos de fax Faksidokumentide lugemise toetus Lisää faksitiedostojen lukutuen + Permet la lecture des documents Fax Aggiunge il supporto per la lettura di documenti Fax 팩스 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van faxdocumenten toe diff --git a/generators/fictionbook/org.kde.okular-fb.metainfo.xml b/generators/fictionbook/org.kde.okular-fb.metainfo.xml index ebfbe8b33..cafca0fef 100644 --- a/generators/fictionbook/org.kde.okular-fb.metainfo.xml +++ b/generators/fictionbook/org.kde.okular-fb.metainfo.xml @@ -15,6 +15,7 @@ FictionBook FictionBook FictionBook + FictionBook FictionBook FictionBook Fictie boek @@ -43,6 +44,7 @@ Permite la lectura de libros en formato FictionBook FictionBooki lugemise toetus Lisää FictionBook-lukutuen + Permet la lecture des fichiers FictionBooks Aggiunge il supporto per la lettura di documenti in formato FictionBooks FictionBook 읽기 지원 추가 Voegt ondersteuning voor lezen van fictie boeken toe diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index bd4d2e929..d06cf3182 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -15,6 +15,7 @@ Imágenes Pildid Kuvat + Images Immagini 그림 Afbeeldingen @@ -43,6 +44,7 @@ Permite la lectura de diversos formatos de imagen Paljude pildivormingute lugemise toetus Lisää monien kuvatiedostomuotojen lukutuen + Permet la lecture de nombreux formats d'images Aggiunge il supporto per la lettura di vari formati di immagini 다양한 그림 형식 읽기 지원 추가 Ondersteuning toevoegen om vele afbeeldingsformaten te lezen diff --git a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml index c6b132207..f08cf7bf1 100644 --- a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml +++ b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml @@ -15,6 +15,7 @@ Mobipocket Mobipocket Mobipocket + Mobipocket Mobipocket Mobipocket Mobipocket @@ -43,6 +44,7 @@ Permite la lectura de libros electrónicos en formato Mobipocket Mobipocketi e-raamatute lugemise toetus Lisää MobiPocket-e-kirjojen lukutuen + Ajouter la gestion en lecture des livres électroniques Mobipocket Aggiunge il supporto per la lettura di libri digitali in formato Mobipocket Mobipocket 전자책 읽기 지원 추가 Voegt ondersteuning voor lezen van Mobipocket e-boeken toe diff --git a/generators/ooo/org.kde.okular-ooo.metainfo.xml b/generators/ooo/org.kde.okular-ooo.metainfo.xml index ff120901d..9e8d147fe 100644 --- a/generators/ooo/org.kde.okular-ooo.metainfo.xml +++ b/generators/ooo/org.kde.okular-ooo.metainfo.xml @@ -15,6 +15,7 @@ OpenDocument OpenDocument OpenDocument + OpenDocument OpenDocument OpenDocument OpenDocument @@ -43,6 +44,7 @@ Permite la lectura de archivos de texto en formato OpenDocument OpenDocument tekstifailide lugemise toetus Lisää OpenDocument-tekstitiedostojen lukutuen + Permet la lecture des fichiers texte OpenDocument Aggiunge il supporto per la lettura di documenti di testo OpenDocument OpenDocument 텍스트 파일 읽기 지원 추가 Voegt ondersteuning voor lezen van OpenDocument tekstbestanden toe diff --git a/generators/plucker/org.kde.okular-plucker.metainfo.xml b/generators/plucker/org.kde.okular-plucker.metainfo.xml index 5da5b832b..36b256897 100644 --- a/generators/plucker/org.kde.okular-plucker.metainfo.xml +++ b/generators/plucker/org.kde.okular-plucker.metainfo.xml @@ -15,6 +15,7 @@ Plucker Plucker Plucker + Plucker Plucker plucker Plucker @@ -43,6 +44,7 @@ Permite la lectura de documentos en formato Plucker Pluckeri dokumentide lugemise toetus Lisää Plucker-tiedostojen lukutuen + Permet la lecture des documents Plucker Aggiunge il supporto per la lettura di documenti Plucker Plucker 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van Plucker-documenten toe diff --git a/generators/poppler/org.kde.okular-poppler.metainfo.xml b/generators/poppler/org.kde.okular-poppler.metainfo.xml index 80a99fc61..72045ae7b 100644 --- a/generators/poppler/org.kde.okular-poppler.metainfo.xml +++ b/generators/poppler/org.kde.okular-poppler.metainfo.xml @@ -15,6 +15,7 @@ PDF PDF PDF + PDF PDF PDF PDF @@ -43,6 +44,7 @@ Permite la lectura de documentos PDF PDF-dokumentide lugemise toetus Lisää PDF-tiedostojen lukutuen + Permet la lecture des documents PDF Aggiunge il supporto per la lettura di documenti PDF PDF 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van PDF-documenten toe diff --git a/generators/spectre/org.kde.okular-spectre.metainfo.xml b/generators/spectre/org.kde.okular-spectre.metainfo.xml index 49c2af16b..ae12ced89 100644 --- a/generators/spectre/org.kde.okular-spectre.metainfo.xml +++ b/generators/spectre/org.kde.okular-spectre.metainfo.xml @@ -15,6 +15,7 @@ PostScript PostScript PostScript + PostScript PostScript 포스트스크립트 PostScript @@ -43,6 +44,7 @@ Permite la lectura de documentos PostScript PostScript-dokumentide lugemise toetus Lisää PostScript-tiedostojen lukutuen + Permet la lecture des documents PostScript Aggiunge il supporto per la lettura di documenti PostScript 포스트스크립트 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van PostScript-documenten toe diff --git a/generators/tiff/org.kde.okular-tiff.metainfo.xml b/generators/tiff/org.kde.okular-tiff.metainfo.xml index 21241c0d0..114bd6814 100644 --- a/generators/tiff/org.kde.okular-tiff.metainfo.xml +++ b/generators/tiff/org.kde.okular-tiff.metainfo.xml @@ -15,6 +15,7 @@ Tiff TIFF TIFF + Tiff Tiff TIFF Tiff @@ -43,6 +44,7 @@ Permite la lectura de documentos Tiff TIFF-dokumentide lugemise toetus Lisää TIFF-kuvatiedostojen lukutuen + Permet la lecture des documents Tiff Aggiunge il supporto per la lettura di documenti Tiff TIFF 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van Tiff-documenten toe diff --git a/generators/txt/org.kde.okular-txt.metainfo.xml b/generators/txt/org.kde.okular-txt.metainfo.xml index 534ae29c0..9077a221a 100644 --- a/generators/txt/org.kde.okular-txt.metainfo.xml +++ b/generators/txt/org.kde.okular-txt.metainfo.xml @@ -15,6 +15,7 @@ Texto Tekst Teksti + Text Testo 텍스트 Tekst @@ -43,6 +44,7 @@ Permite la lectura de documentos de texto sin formato Lihttekstidokumentide lugemise toetus Lisää paljaiden tekstitiedostojen lukutuen + Permet la lecture des fichiers texte Aggiunge il supporto per la lettura di documenti in testo semplice 일반 텍스트 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van gewone tekstdocumenten toe diff --git a/generators/xps/org.kde.okular-xps.metainfo.xml b/generators/xps/org.kde.okular-xps.metainfo.xml index 1e9a68046..9fee420dc 100644 --- a/generators/xps/org.kde.okular-xps.metainfo.xml +++ b/generators/xps/org.kde.okular-xps.metainfo.xml @@ -15,6 +15,7 @@ XPS XPS XPS + XPS XPS XPS XPS @@ -43,6 +44,7 @@ Permite la lectura de documentos XPS XPS-dokumentide lugemise toetus Lisää XPS-tiedostojen lukutuen + Permet la lecture des documents XPS Aggiunge il supporto per la lettura di documenti XPS XPS 문서 읽기 지원 추가 Voegt ondersteuning voor lezen van XPS-documenten toe diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index d11665666..dee46041d 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -14,6 +14,7 @@ Okular Okular Okular + Okular Okular Okular Okular @@ -42,6 +43,7 @@ Visor de documentos Dokumendinäitaja Asiakirjakatselin + Afficheur de documents Visore di documenti 문서 뷰어 Documentenviewer @@ -72,6 +74,7 @@

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 välja töötatud universaalne dokumentide näitaja. Okular võib töötada eri platvormidel, kaasa arvatud Linux, Windows, Mac OS X, *BSD jne.

Okular on KDE:n kehittämä yleiskäyttöinen asiakirjakatselin. Okular toimii useissa ympäristöissä kuten Linuxissa, Windowsissa, Mac OS X:ssä, *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.

Okular è un lettore universale di documenti sviluppato da KDE. Okular funziona su varie piattaforme, incluse (ma non solo) Linux, Windows, Mac OS X, *BSD, ecc.

Okular는 만능 문서 뷰어입니다. Okular는 리눅스, macOS, Windows, *BSD 등 여러 플랫폼에서 동작합니다.

Okular is een universele documentviewer ontwikkeld door KDE. Okular werkt op meerdere platforms, inclusief, maar niet beperkt tot Linux, Windows, Mac OS X, *BSD, etc.

@@ -99,6 +102,7 @@

Funciones:

Omadused:

Ominaisuuksia:

+

Fonctionnalités :

Funzionalità:

기능:

Kenmerken:

@@ -127,6 +131,7 @@
  • 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, faks
  • Tuetut tiedostomuodot: PDF, PS, TIFF, CHM, DjVu, kuvatiedostot, DVI, XPS, ODT, FictionBook, sarjakuvakirjat, Plucker, EPub, faksit
    • +
  • Formats de fichiers gérés : PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
  • Formati supportati: PDF, PS, Tiff, CHM, DjVu, immagini, DVI, XPS, ODT, Fiction Book, fumetti, Plucker, EPub, Fax
  • 지원하는 형식: PDF, PS, Tiff, CHM, DjVu, 사진, DVI, XPS, ODT, Fiction Book, 만화책, Plucker, EPub, 팩스
  • Ondersteunde formaten: PDF, PS, Tiff, CHM, DjVu, Afbeeldingen, DVI, XPS, ODT, Fictie boek, Stripboek, Plucker, EPub, Fax
    • @@ -153,6 +158,7 @@
  • Barra lateral con contenido, miniaturas, revisiones y marcadores
  • Külgriba sisukorra, pisipiltide, annotatsioonide ja järjehoidjatega
  • Sivupaneeli, jossa sisältö, pienoiskuvat, tarkastelut ja kirjanmerkit
    • +
  • Barre latérale montrant les contenus, miniatures, informations de relecture et signets
  • Barra laterale con contenuti, miniature, revisioni e segnalibri
  • 목차, 책갈피, 미리 보기, 주석이 있는 사이드바
  • Zijbalk met inhoud, miniaturen, reviews en bladwijzers
    • @@ -179,6 +185,7 @@
  • Permite el uso de notas
  • Annotatsioonide toetus
  • Merkintöjen tuki
    • +
  • Gestion des annotations
  • Supporto per le annotazioni
  • 주석 지원
  • Ondersteuning van annotaties
    • From 34edbb77112db548f0ed5c467b7a06e7c216dfc9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 May 2017 05:10:30 +0200 Subject: [PATCH 4/6] GIT_SILENT made messages (after extraction) --- shell/org.kde.okular.appdata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index dee46041d..752918ee8 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -90,6 +90,7 @@

    Okular är en universell dokumentvisare utvecklad av KDE. Okular fungerar på flera plattformar, inklusive men inte begränsat till Linux, Windows, Max OS X, *BSD, etc.

    Okular є універсальною програмою для перегляду документів, розробленою KDE. Okular може працювати на багатьох програмних платформах, зокрема Linux, Windows, Mac OS X, *BSD тощо.

    xxOkular 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.xx

    +

    Okular 是由 KDE 开发的通用文档查看器。Okular 可在多个平台上运行，包括但不是限于 Linux，Windows，Mac OS X，* BSD，等。

    Okular 是一個由 KDE 開發的通用文件檢視器。Okular 可以在多種平臺上運作，包含但不限於 Linux, Windows, Mac OS X, *BSD 等等。

    Features:

    Carauterístiques:

    @@ -118,6 +119,7 @@

    Funktioner:

    Можливості:

    xxFeatures:xx

    +

    功能：

    功能：

    • Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
      • @@ -147,6 +149,7 @@
    • Format som stöds: PDF, PS, Tiff, CHM, DjVu, bilder, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
    • Підтримувані формати: PDF, PS, Tiff, CHM, DjVu, зображення, DVI, XPS, ODT, Fiction Book, комікси, Plucker, EPub, факси.
    • xxSupported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Faxxx
      • +
    • 支持的格式︰ PDF，PS，Tiff，CHM，DjVu，图片，DVI，XPS，ODT，FictionBook，漫画书，Plucker，EPub，传真
    • 支援的檔案格式：PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax
    • Sidebar with contents, thumbnails, reviews and bookmarks
    • Barra llateral colos conteníos, miniatures, reseñes y marcadores
      • @@ -174,6 +177,7 @@
    • Sidorad med innehåll, miniatyrbilder, granskningar och bokmärken
    • Бічні панелі зі списками змісту, мініатюрами сторінок, можливість рецензування та додавання закладок.
    • xxSidebar with contents, thumbnails, reviews and bookmarksxx
      • +
    • 目录，缩略图，批注和书签侧边栏
    • 有內容、縮圖、回顧與書籤等選項的側邊欄
    • Annotations support
    • Sofitu d'anotaciones
      • @@ -201,6 +205,7 @@
    • Stöd för kommentarer
    • Підтримка анотування.
    • xxAnnotations supportxx
      • +
    • 支持批注
    • 支援註記
    From bb8c12d1eb77807d8d0a2be46071b025f80a7e1d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 May 2017 05:48:05 +0200 Subject: [PATCH 5/6] 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 | 1 + generators/chm/okularApplication_chm.desktop | 1 + generators/comicbook/libokularGenerator_comicbook.json | 1 + generators/comicbook/okularApplication_comicbook.desktop | 1 + generators/djvu/okularApplication_djvu.desktop | 1 + generators/dvi/libokularGenerator_dvi.json | 1 + generators/dvi/okularApplication_dvi.desktop | 1 + generators/epub/okularApplication_epub.desktop | 1 + generators/fax/okularApplication_fax.desktop | 1 + generators/fictionbook/libokularGenerator_fb.json | 1 + generators/fictionbook/okularApplication_fb.desktop | 1 + generators/kimgio/okularApplication_kimgio.desktop | 1 + generators/mobipocket/libokularGenerator_mobi.json | 1 + generators/mobipocket/okularApplication_mobi.desktop | 1 + generators/ooo/libokularGenerator_ooo.json | 1 + generators/ooo/okularApplication_ooo.desktop | 1 + generators/plucker/libokularGenerator_plucker.json | 1 + generators/plucker/okularApplication_plucker.desktop | 1 + generators/poppler/libokularGenerator_poppler.json | 1 + generators/poppler/okularApplication_pdf.desktop | 1 + generators/spectre/libokularGenerator_ghostview.json | 1 + generators/spectre/okularApplication_ghostview.desktop | 1 + generators/tiff/libokularGenerator_tiff.json | 1 + generators/tiff/okularApplication_tiff.desktop | 1 + generators/txt/libokularGenerator_txt.json | 1 + generators/txt/okularApplication_txt.desktop | 1 + generators/xps/okularApplication_xps.desktop | 1 + shell/org.kde.okular.desktop | 1 + 28 files changed, 28 insertions(+) diff --git a/generators/chm/libokularGenerator_chmlib.json b/generators/chm/libokularGenerator_chmlib.json index 663b2987b..2dbe6aa2d 100644 --- a/generators/chm/libokularGenerator_chmlib.json +++ b/generators/chm/libokularGenerator_chmlib.json @@ -57,6 +57,7 @@ "Description[sv]": "Ett återgivningsprogram av Microsoft Windows hjälpfiler", "Description[uk]": "Відображення файлів довідки Microsoft Windows", "Description[x-test]": "xxA Microsoft Windows help file rendererxx", + "Description[zh_CN]": "Microsoft Windows 帮助文件渲染器", "Description[zh_TW]": "Microsoft Windows 說明檔成像器", "Id": "okular_chm", "License": "GPL", diff --git a/generators/chm/okularApplication_chm.desktop b/generators/chm/okularApplication_chm.desktop index 03fb721db..bc4dfe015 100755 --- a/generators/chm/okularApplication_chm.desktop +++ b/generators/chm/okularApplication_chm.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/comicbook/libokularGenerator_comicbook.json b/generators/comicbook/libokularGenerator_comicbook.json index 4a3275811..123fc1345 100644 --- a/generators/comicbook/libokularGenerator_comicbook.json +++ b/generators/comicbook/libokularGenerator_comicbook.json @@ -50,6 +50,7 @@ "Description[sv]": "Ett återgivningsprogram för diverse format för serieböcker", "Description[uk]": "Програма для відображення коміксів у різних форматах", "Description[x-test]": "xxA renderer for various comic book formatsxx", + "Description[zh_CN]": "多种漫画书格式的渲染器", "Description[zh_TW]": "多種漫畫書的成像器", "Id": "okular_comicbook", "License": "GPL", diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 326c500a9..c89642fee 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/djvu/okularApplication_djvu.desktop b/generators/djvu/okularApplication_djvu.desktop index cfc1efc5a..17edf4777 100755 --- a/generators/djvu/okularApplication_djvu.desktop +++ b/generators/djvu/okularApplication_djvu.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/dvi/libokularGenerator_dvi.json b/generators/dvi/libokularGenerator_dvi.json index eb1919e45..868b7a0a9 100644 --- a/generators/dvi/libokularGenerator_dvi.json +++ b/generators/dvi/libokularGenerator_dvi.json @@ -46,6 +46,7 @@ "Description[sv]": "Ett återgivningsprogram för DVI-filer", "Description[uk]": "Інструмент для показу файлів DVI", "Description[x-test]": "xxA DVI file rendererxx", + "Description[zh_CN]": "DVI 文件渲染器", "Description[zh_TW]": "DVI 檔成像器", "Id": "okular_dvi", "License": "GPL", diff --git a/generators/dvi/okularApplication_dvi.desktop b/generators/dvi/okularApplication_dvi.desktop index 5ea1b7b5e..38043a170 100755 --- a/generators/dvi/okularApplication_dvi.desktop +++ b/generators/dvi/okularApplication_dvi.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/epub/okularApplication_epub.desktop b/generators/epub/okularApplication_epub.desktop index 939342387..df27ea062 100755 --- a/generators/epub/okularApplication_epub.desktop +++ b/generators/epub/okularApplication_epub.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/fax/okularApplication_fax.desktop b/generators/fax/okularApplication_fax.desktop index 7f121dcf0..ee1600892 100755 --- a/generators/fax/okularApplication_fax.desktop +++ b/generators/fax/okularApplication_fax.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json index 36f90be83..4b6a68018 100644 --- a/generators/fictionbook/libokularGenerator_fb.json +++ b/generators/fictionbook/libokularGenerator_fb.json @@ -50,6 +50,7 @@ "Description[sv]": "Ett återgivningsprogram för Fiction Book e-böcker", "Description[uk]": "Програма для відображення електронної белетристики", "Description[x-test]": "xxA renderer for FictionBook eBooksxx", + "Description[zh_CN]": "FictionBook 电子书渲染器", "Description[zh_TW]": "FictionBook 電子書成像器", "Id": "okular_fax", "License": "GPL", diff --git a/generators/fictionbook/okularApplication_fb.desktop b/generators/fictionbook/okularApplication_fb.desktop index 3b9dfcf9a..4ce63807b 100755 --- a/generators/fictionbook/okularApplication_fb.desktop +++ b/generators/fictionbook/okularApplication_fb.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/kimgio/okularApplication_kimgio.desktop b/generators/kimgio/okularApplication_kimgio.desktop index 1bf4a2932..226709fc0 100755 --- a/generators/kimgio/okularApplication_kimgio.desktop +++ b/generators/kimgio/okularApplication_kimgio.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/mobipocket/libokularGenerator_mobi.json b/generators/mobipocket/libokularGenerator_mobi.json index a7d01565c..4ee2bac7f 100644 --- a/generators/mobipocket/libokularGenerator_mobi.json +++ b/generators/mobipocket/libokularGenerator_mobi.json @@ -48,6 +48,7 @@ "Description[sv]": "Ett Mobipocket-gränssnitt", "Description[uk]": "Сервер mobipocket", "Description[x-test]": "xxA mobipocket backendxx", + "Description[zh_CN]": "Mobipocket 后端", "Description[zh_TW]": "Mobipocket 後端介面", "Id": "okular_mobi", "License": "GPL", diff --git a/generators/mobipocket/okularApplication_mobi.desktop b/generators/mobipocket/okularApplication_mobi.desktop index ec80eca79..ef400bc13 100755 --- a/generators/mobipocket/okularApplication_mobi.desktop +++ b/generators/mobipocket/okularApplication_mobi.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 TryExec=okular Exec=okular %U diff --git a/generators/ooo/libokularGenerator_ooo.json b/generators/ooo/libokularGenerator_ooo.json index 19715da70..438ce5478 100644 --- a/generators/ooo/libokularGenerator_ooo.json +++ b/generators/ooo/libokularGenerator_ooo.json @@ -50,6 +50,7 @@ "Description[sv]": "Ett återgivningsprogram för OpenDocument-textdokument", "Description[uk]": "Модуль для показу текстових документів OpenDocument", "Description[x-test]": "xxA renderer for OpenDocument Text documentsxx", + "Description[zh_CN]": "OpenDocument 文本文档渲染器", "Description[zh_TW]": "OpenDocument 文字檔成像器", "Id": "okular_ooo", "License": "GPL", diff --git a/generators/ooo/okularApplication_ooo.desktop b/generators/ooo/okularApplication_ooo.desktop index 86102265c..f21569c37 100755 --- a/generators/ooo/okularApplication_ooo.desktop +++ b/generators/ooo/okularApplication_ooo.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/plucker/libokularGenerator_plucker.json b/generators/plucker/libokularGenerator_plucker.json index 0fe9f9b68..6bcce48d7 100644 --- a/generators/plucker/libokularGenerator_plucker.json +++ b/generators/plucker/libokularGenerator_plucker.json @@ -50,6 +50,7 @@ "Description[sv]": "Ett återgivningsprogram för Plucker e-böcker", "Description[uk]": "Програма для відображення ел. книг Plucker", "Description[x-test]": "xxA renderer for Plucker eBooksxx", + "Description[zh_CN]": "Plucker 电子书渲染器", "Description[zh_TW]": "Plucker 電子書成像器", "Id": "okular_plucker", "License": "GPL", diff --git a/generators/plucker/okularApplication_plucker.desktop b/generators/plucker/okularApplication_plucker.desktop index f3497a4fb..7b34a26fd 100755 --- a/generators/plucker/okularApplication_plucker.desktop +++ b/generators/plucker/okularApplication_plucker.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/poppler/libokularGenerator_poppler.json b/generators/poppler/libokularGenerator_poppler.json index 7d1a97e5d..ffb3e06d3 100644 --- a/generators/poppler/libokularGenerator_poppler.json +++ b/generators/poppler/libokularGenerator_poppler.json @@ -48,6 +48,7 @@ "Description[sv]": "Ett återgivningsprogram för PDF-filer", "Description[uk]": "Програма для показу файлів PDF", "Description[x-test]": "xxA PDF file rendererxx", + "Description[zh_CN]": "PDF 文件渲染器", "Description[zh_TW]": "PDF 檔成像器", "Id": "okular_poppler", "License": "GPL", diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index d8c4496f4..e3e08ec65 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/spectre/libokularGenerator_ghostview.json b/generators/spectre/libokularGenerator_ghostview.json index 50eafef54..858f4c22d 100644 --- a/generators/spectre/libokularGenerator_ghostview.json +++ b/generators/spectre/libokularGenerator_ghostview.json @@ -48,6 +48,7 @@ "Description[sv]": "Ett återgivningsprogram för Postscript-filer baserat på Spectre-biblioteket", "Description[uk]": "Обробник файлів PostScript на основі бібліотеки Spectre", "Description[x-test]": "xxA PostScript file renderer based on the Spectre libraryxx", + "Description[zh_CN]": "基于 Spectre 库的 PostScript 文件渲染器", "Description[zh_TW]": "基於 Spectre 函式庫的 PostScript 檔成像器", "Id": "okular_ghostview", "License": "GPL", diff --git a/generators/spectre/okularApplication_ghostview.desktop b/generators/spectre/okularApplication_ghostview.desktop index 0557aef3a..0b3f8ac47 100755 --- a/generators/spectre/okularApplication_ghostview.desktop +++ b/generators/spectre/okularApplication_ghostview.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/tiff/libokularGenerator_tiff.json b/generators/tiff/libokularGenerator_tiff.json index 2befa9b31..3e09edebd 100644 --- a/generators/tiff/libokularGenerator_tiff.json +++ b/generators/tiff/libokularGenerator_tiff.json @@ -48,6 +48,7 @@ "Description[sv]": "Ett TIFF-gränssnitt", "Description[uk]": "Програма для TIFF", "Description[x-test]": "xxA TIFF backendxx", + "Description[zh_CN]": "TIFF 后端", "Description[zh_TW]": "TIFF 後端介面", "Id": "okular_tiff", "License": "GPL", diff --git a/generators/tiff/okularApplication_tiff.desktop b/generators/tiff/okularApplication_tiff.desktop index 1ccbfb7d3..7dacce87b 100755 --- a/generators/tiff/okularApplication_tiff.desktop +++ b/generators/tiff/okularApplication_tiff.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/txt/libokularGenerator_txt.json b/generators/txt/libokularGenerator_txt.json index 0a6383b4e..776f06f50 100644 --- a/generators/txt/libokularGenerator_txt.json +++ b/generators/txt/libokularGenerator_txt.json @@ -46,6 +46,7 @@ "Description[sv]": "Textgränssnitt", "Description[uk]": "Модуль тексту", "Description[x-test]": "xxTxt backendxx", + "Description[zh_CN]": "纯文本后端", "Description[zh_TW]": "Txt 後端介面", "Id": "okular_txt", "License": "GPL", diff --git a/generators/txt/okularApplication_txt.desktop b/generators/txt/okularApplication_txt.desktop index a944c8d98..8219cc32b 100644 --- a/generators/txt/okularApplication_txt.desktop +++ b/generators/txt/okularApplication_txt.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/generators/xps/okularApplication_xps.desktop b/generators/xps/okularApplication_xps.desktop index 5c4427b3d..eeaf7c65b 100755 --- a/generators/xps/okularApplication_xps.desktop +++ b/generators/xps/okularApplication_xps.desktop @@ -158,6 +158,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular diff --git a/shell/org.kde.okular.desktop b/shell/org.kde.okular.desktop index 7cf3033d0..1fda384d3 100755 --- a/shell/org.kde.okular.desktop +++ b/shell/org.kde.okular.desktop @@ -157,6 +157,7 @@ Comment[sv]=Generell dokumentvisare Comment[tr]=Evrensel belge görüntüleyici Comment[uk]=Універсальний переглядач документів Comment[x-test]=xxUniversal document viewerxx +Comment[zh_CN]=通用文档查看器 Comment[zh_TW]=通用文件檢視器 Exec=okular %U Icon=okular From 574fad92c8bed04e8b0c0fcbb84a9ecbd8cf685b Mon Sep 17 00:00:00 2001 From: Tobias Deiminger Date: Sun, 21 May 2017 23:36:20 +0200 Subject: [PATCH 6/6] Initialize cursor in PageView scrollbars with ArrowCursor BUG: 334798 REVIEW: 130131 --- ui/pageview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 28cf77df9..acacfb904 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -400,7 +400,9 @@ PageView::PageView( QWidget *parent, Okular::Document *document ) viewport()->setMouseTracking( true ); viewport()->setAutoFillBackground( false ); // the apparently "magic" value of 20 is the same used internally in QScrollArea + verticalScrollBar()->setCursor( Qt::ArrowCursor ); verticalScrollBar()->setSingleStep( 20 ); + horizontalScrollBar()->setCursor( Qt::ArrowCursor ); horizontalScrollBar()->setSingleStep( 20 ); // conntect the padding of the viewport to pixmaps requests