Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1524712 into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

[lok-qml] Fixed warning about document not loaded. Now it properly informs that the document may be protected by a password.

[lok-qml] Fixed warning about document not loaded. Now it properly informs that the document may be protected by a password.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:242
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/55/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/278/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/55/rebuild

review: Approve (continuous-integration)

[Roman Shchekin (mrqtros)]

review: Approve

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-12-12 10:06:55 +0000
+++ po/com.ubuntu.docviewer.pot	2015-12-26 18:34:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-12 13:04+0300\n"
+"POT-Creation-Date: 2015-12-26 19:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -173,11 +173,11 @@
 msgid "Share"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:24
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:75
 msgid "No document found"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:25
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:84
 msgid ""
 "Connect your device to any computer and simply drag files to the Documents "
 "folder or insert removable media with documents."
@@ -211,7 +211,7 @@
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPage.qml:23
-#: /home/qtros/dev/ubuntu-docviewer-app-uitk-13-ethalone-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr ""
 
@@ -373,7 +373,7 @@
 #: ../src/app/qml/loView/LOViewPage.qml:134
 msgid ""
 "Document not loaded.\n"
-"The requested document may be corrupt."
+"The requested document may be corrupt or protected by a password."
 msgstr ""
 
 #. TRANSLATORS: 'LibreOfficeKit' is the name of the library used by
@@ -435,10 +435,10 @@
 msgid "copy %1"
 msgstr ""
 
-#: /home/qtros/dev/ubuntu-docviewer-app-uitk-13-ethalone-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
-#: /home/qtros/dev/ubuntu-docviewer-app-uitk-13-ethalone-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /tmp/ubuntu-docviewer-app-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'src/app/qml/loView/LOViewPage.qml'
--- src/app/qml/loView/LOViewPage.qml	2015-11-30 12:25:13 +0000
+++ src/app/qml/loView/LOViewPage.qml	2015-12-26 18:34:30 +0000
@@ -131,7 +131,7 @@
                             errorString = i18n.tr("Error while loading LibreOffice.")
                             break;
                         case LibreOffice.Error.DocumentNotLoaded:
-                            errorString = i18n.tr("Document not loaded.\nThe requested document may be corrupt.")
+                            errorString = i18n.tr("Document not loaded.\nThe requested document may be corrupt or protected by a password.")
                             break;
                         }