Merge lp:~fboucault/ciborium/page_title_matching_app_name into lp:ciborium

[Florian Boucault]

Make main page title match app name. Refreshed translations catalog.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/ciborium-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ciborium-ci/42/rebuild

review: Approve (continuous-integration)

Unmerged revisions

149. By Florian Boucault on 2016-01-16

Make main page title match app name. Refreshed translations catalog.

=== modified file 'po/ciborium.pot'
--- po/ciborium.pot	2015-03-24 19:11:34 +0000
+++ po/ciborium.pot	2016-01-16 21:11:28 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the ciborium package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ciborium\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-24 16:11-0300\n"
+"POT-Creation-Date: 2016-01-16 22:09+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"
@@ -76,30 +76,21 @@
 msgid "Only %d%% is available on the external storage device"
 msgstr ""
 
-#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:12
-msgid "Unmounting"
-msgstr ""
-
+#: share/ciborium/qml/main.qml:34 share/applications/ciborium.desktop.tr.h:1
+msgid "External Drives"
+msgstr ""
+
+#: share/ciborium/qml/components/FormatConfirmation.qml:11
+msgid "Formatting"
+msgstr ""
+
+#: share/ciborium/qml/components/FormatConfirmation.qml:22
 #: share/ciborium/qml/components/SafeRemovalConfirmation.qml:17
-#: share/ciborium/qml/components/FormatConfirmation.qml:22
 msgid "Ok"
 msgstr ""
 
-#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:30
-#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:46
-msgid "You can now safely remove the device"
-msgstr ""
-
-#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:38
-msgid "Unmount Error"
-msgstr ""
-
-#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:39
-msgid "The device could not be unmounted because is busy"
-msgstr ""
-
-#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:45
-msgid "Safe to remove"
+#: share/ciborium/qml/components/FormatConfirmation.qml:31
+msgid "There was an error when formatting the device"
 msgstr ""
 
 #: share/ciborium/qml/components/DriveDelegate.qml:45
@@ -111,27 +102,6 @@
 msgid "Safely Remove"
 msgstr ""
 
-#: share/ciborium/qml/components/FormatConfirmation.qml:11
-msgid "Formatting"
-msgstr ""
-
-#: share/ciborium/qml/components/FormatConfirmation.qml:31
-msgid "There was an error when formatting the device"
-msgstr ""
-
-#: share/ciborium/qml/components/FormatDialog.qml:12
-msgid "This action will wipe the content from the device"
-msgstr ""
-
-#: share/ciborium/qml/components/FormatDialog.qml:15
-#: share/ciborium/qml/components/SafeRemoval.qml:17
-msgid "Cancel"
-msgstr ""
-
-#: share/ciborium/qml/components/FormatDialog.qml:19
-msgid "Continue with format"
-msgstr ""
-
 #: share/ciborium/qml/components/SafeRemoval.qml:13
 msgid "Confirm remove"
 msgstr ""
@@ -140,14 +110,40 @@
 msgid "Files on the device can't be accessed after removing"
 msgstr ""
 
+#: share/ciborium/qml/components/SafeRemoval.qml:17
+#: share/ciborium/qml/components/FormatDialog.qml:15
+msgid "Cancel"
+msgstr ""
+
 #: share/ciborium/qml/components/SafeRemoval.qml:22
 msgid "Continue"
 msgstr ""
 
-#: share/ciborium/qml/main.qml:34
-msgid "SD Card Management"
-msgstr ""
-
-#: share/applications/ciborium.desktop.tr.h:1
-msgid "External Drives"
+#: share/ciborium/qml/components/FormatDialog.qml:12
+msgid "This action will wipe the content from the device"
+msgstr ""
+
+#: share/ciborium/qml/components/FormatDialog.qml:19
+msgid "Continue with format"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:12
+msgid "Unmounting"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:30
+#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:46
+msgid "You can now safely remove the device"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:38
+msgid "Unmount Error"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:39
+msgid "The device could not be unmounted because is busy"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemovalConfirmation.qml:45
+msgid "Safe to remove"
 msgstr ""
 
=== modified file 'share/ciborium/qml/main.qml'
--- share/ciborium/qml/main.qml	2015-03-13 17:58:27 +0000
+++ share/ciborium/qml/main.qml	2016-01-16 21:11:28 +0000
@@ -31,7 +31,7 @@
         
         Page{
             id: mainPage
-            title: i18n.tr("SD Card Management")
+            title: i18n.tr("External Drives")
             Component.onCompleted: driveCtrl.watch()
 
 	    Component {