From 876bd02e8ae062157546f3256cfbc498ec44652c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 21 Dec 2018 07:16:55 +0100
Subject: [PATCH 1/2] GIT_SILENT made messages (after extraction)

---
 mobile/app/org.kde.okular.kirigami.appdata.xml | 1 +
 shell/org.kde.okular.appdata.xml               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mobile/app/org.kde.okular.kirigami.appdata.xml b/mobile/app/org.kde.okular.kirigami.appdata.xml
index 1e6065a2d..4e067e157 100644
--- a/mobile/app/org.kde.okular.kirigami.appdata.xml
+++ b/mobile/app/org.kde.okular.kirigami.appdata.xml
@@ -170,6 +170,7 @@
       <caption xml:lang="de">Lesen eines Handbuchs in Okular</caption>
       <caption xml:lang="en-GB">Reading manual in Okular</caption>
       <caption xml:lang="es">Lectura del manual en Okular</caption>
+      <caption xml:lang="fr">Lecture d'un manuel dans Okular</caption>
       <caption xml:lang="gl">Ler o manual en Okular</caption>
       <caption xml:lang="it">Consultazione di un manuale in Okular</caption>
       <caption xml:lang="nl">Handleiding wordt gelezen in Okular</caption>
diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml
index 8181f9233..4d5273b85 100644
--- a/shell/org.kde.okular.appdata.xml
+++ b/shell/org.kde.okular.appdata.xml
@@ -247,6 +247,7 @@
       <caption xml:lang="de">Lesen eines Handbuchs in Okular</caption>
       <caption xml:lang="en-GB">Reading manual in Okular</caption>
       <caption xml:lang="es">Lectura del manual en Okular</caption>
+      <caption xml:lang="fr">Lecture d'un manuel dans Okular</caption>
       <caption xml:lang="gl">Ler o manual en Okular</caption>
       <caption xml:lang="it">Consultazione di un manuale in Okular</caption>
       <caption xml:lang="nl">Handleiding wordt gelezen in Okular</caption>

From 58038fed18fa3e89b481bb3843f29f45fff4240a Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Wed, 26 Dec 2018 12:02:31 +0100
Subject: [PATCH 2/2] Do not crash in files without title-info

BUGS: 402558
---
 generators/fictionbook/converter.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generators/fictionbook/converter.cpp b/generators/fictionbook/converter.cpp
index 0cf2babcb..46217f82f 100644
--- a/generators/fictionbook/converter.cpp
+++ b/generators/fictionbook/converter.cpp
@@ -125,7 +125,7 @@ QTextDocument* Converter::convert( const QString &fileName )
                 return nullptr;
             }
         } else if ( element.tagName() == QLatin1String( "body" ) ) {
-            if ( !mTitleInfo->mCoverPage.isNull() ) {
+            if ( mTitleInfo && !mTitleInfo->mCoverPage.isNull() ) {
                 convertCover( mTitleInfo->mCoverPage );
                 mCursor->insertBlock();
             }
@@ -137,7 +137,7 @@ QTextDocument* Converter::convert( const QString &fileName )
             frameFormat.setPadding( 8 );
             frameFormat.setBackground( Qt::lightGray );
 
-            if ( !mTitleInfo->mTitle.isEmpty() ) {
+            if ( mTitleInfo && !mTitleInfo->mTitle.isEmpty() ) {
                 mCursor->insertFrame( frameFormat );
 
                 QTextCharFormat charFormat;
@@ -148,7 +148,7 @@ QTextDocument* Converter::convert( const QString &fileName )
                 mCursor->setPosition( topFrame->lastPosition() );
             }
 
-            if ( !mTitleInfo->mAuthor.isEmpty() ) {
+            if ( mTitleInfo && !mTitleInfo->mAuthor.isEmpty() ) {
                 frameFormat.setBorder( 1 );
                 mCursor->insertFrame( frameFormat );