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

[Stefano Verzegnassi]

* Backported fix for stage mode being forced on Nexus 10
* Fixed wrong string shown in the splash screen

* Backported fix for stage mode being forced on Nexus 10
* Fixed wrong string shown in the splash screen

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-side-stage]

223. By Stefano Verzegnassi on 2015-12-02

Err... it's Wednesday

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

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

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

review: Approve (continuous-integration)

[Stefano Verzegnassi (verzegnassi-stefano)]

Same fix provided in the revision 182 of lp:~ubuntu-docviewer-dev/ubuntu-docviewer-app/trunk
Top approving...

http://bazaar.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/trunk/revision/182

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

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

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

review: Approve (continuous-integration)

=== modified file 'data/com.ubuntu.docviewer.desktop.in.in'
--- data/com.ubuntu.docviewer.desktop.in.in	2015-10-21 13:16:12 +0000
+++ data/com.ubuntu.docviewer.desktop.in.in	2015-12-02 15:14:43 +0000
@@ -8,6 +8,5 @@
 _Keywords=documents;viewer;pdf;reader;
 MimeType=text/plain;application/pdf
 X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
 X-Ubuntu-Splash-Show-Header=true
-_X-Ubuntu-Splash-Title=Document Viewer
+_X-Ubuntu-Splash-Title=Documents

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-02 14:46:37 +0000
+++ debian/changelog	2015-12-02 15:14:43 +0000
@@ -14,8 +14,9 @@
   * Switched to QML Ubuntu.ContentHub APIs (LP: #1469422)
   * Switched to QML Ubuntu.Components.Arguments APIs
   * Changed header behaviour in the PDF viewer (LP: #1453403)
+  * Fix for stage mode being forced on Nexus 10 (LP: #1479483)
 
- -- Stefano Verzegnassi <[e-mail]>  Sat, 28 Nov 2015 13:30:55 +0100
+ -- Stefano Verzegnassi <[e-mail]>  Wed, 02 Dec 2015 16:08:55 +0100
 
 ubuntu-docviewer-app (0.3.181) vivid; urgency=medium
 

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-11-30 23:31:16 +0000
+++ po/com.ubuntu.docviewer.pot	2015-12-02 15:14:43 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-01 00:30+0100\n"
+"POT-Creation-Date: 2015-12-02 16:11+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"
@@ -211,6 +211,7 @@
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPage.qml:23
+#: /tmp/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr ""