Merge lp:~nik90/podbird/11-enable-rotation into lp:podbird

[Nekhelesh Ramananthan]

This MP fixes the pages that break in landscape mode which are,
- Settings pages like about, credits, auto-download and auto-delete by using a flickable to allow scrolling of data.
- Now Playing Page by using a new layout for landscape layout

As such we can now enable automaticOrientation :-) which we will need to enable anyway for video podcasts at some point.

Warning: All apps on devel-proposed crash when accessing the tab-menu in landscape mode. This has been reported upstream in https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1448017. The crash is not due to this MP's code.

[lp:~nik90/podbird/11-enable-rotation]

78. By Nekhelesh Ramananthan on 2015-04-24

Disable automatic orientation during welcome wizard since the slides are not landscape friendly

79. By Nekhelesh Ramananthan on 2015-04-24

Simplified now playing landscape implementation

80. By Nekhelesh Ramananthan on 2015-04-28

merged prerequisite lp:~nik90/podbird/10-organize-project-structure

81. By Nekhelesh Ramananthan on 2015-04-28

Made credits page easier to maintain and also tweaked header style to match rest of app

82. By Nekhelesh Ramananthan on 2015-04-28

Revert the tweaked header style in the credits page

83. By Nekhelesh Ramananthan on 2015-06-10

merged lp:podbird

84. By Nekhelesh Ramananthan on 2015-06-13

Disabled automaticOrientation and added fix me note

[Nekhelesh Ramananthan (nik90)]

As per our conversation on irc, I have disabled automaticOrientation until the above mentioned upstream bug is fixed.

[lp:~nik90/podbird/11-enable-rotation]

85. By Nekhelesh Ramananthan on 2015-06-13

Disabled the automatic orientation change done by welcome wizard as well

[Michael Sheldon (michael-sheldon)]

Looks good, tested with shell rotation and it works nicely. I made one small tweak to the NowPlaying layout as the scrubber overlapped the artist name when the title wraps onto a second line.

review: Approve

[Michael Sheldon (michael-sheldon)]

We will need to make the wizard landscape friendly before OTA-5 though (as the shell rotation will mean orientation changes will be enabled through-out the app)

=== modified file 'app/components/BlurredBackground.qml'
--- app/components/BlurredBackground.qml	2015-04-20 20:52:20 +0000
+++ app/components/BlurredBackground.qml	2015-06-13 16:50:32 +0000
@@ -35,10 +35,9 @@
         anchors.verticalCenter: parent.verticalCenter
         asynchronous: true
         fillMode: Image.PreserveAspectCrop
-        height: parent.height
+        anchors.fill: parent
         source: art // this has to be fixed for the default cover art to work - cant find in this dir
         visible: false
-        width: Math.max(parent.height, parent.width)
     }
 
     // the blur

=== modified file 'app/components/Walkthrough.qml'
--- app/components/Walkthrough.qml	2015-04-20 20:52:20 +0000
+++ app/components/Walkthrough.qml	2015-06-13 16:50:32 +0000
@@ -44,6 +44,10 @@
     // Property to signal walkthrough completion
     signal finished
 
+    // Disable automatic orientation during welcome wizard since it is not landscape friendly yet.
+    // Component.onCompleted: podbird.automaticOrientation = false
+    // Component.onDestruction: podbird.automaticOrientation = true
+
     // ListView to show the slides
     ListView {
         id: listView

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2015-04-28 12:09:05 +0000
+++ app/podbird.qml	2015-06-13 16:50:32 +0000
@@ -37,6 +37,13 @@
     useDeprecatedToolbar: false
     anchorToKeyboard: true
 
+    /*
+     FIXME: Opening tabs in landscape mode causes apps to crash in the current vivid images.
+     As such this is disabled until upstream bug https://pad.lv/1448017 is fixed and released
+     to the production phones.
+    */
+    automaticOrientation: false
+
     width: units.gu(50)
     height: units.gu(75)
 

=== modified file 'app/settings/About.qml'
--- app/settings/About.qml	2015-04-23 23:45:18 +0000
+++ app/settings/About.qml	2015-06-13 16:50:32 +0000
@@ -24,65 +24,74 @@
 
     title: i18n.tr("About")
 
-    Column {
-        spacing: units.gu(3)
+    Flickable {
+        id: flickable
+
         anchors.fill: parent
-        anchors.topMargin: units.gu(5)
-        anchors.bottomMargin: units.gu(10)
-
-        Image {
-            height: width
-            width: Math.min(parent.width/2, parent.height/2)
-            source: "../graphics/podbird.png"
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        Column {
-            width: parent.width
-            Label {
-                width: parent.width
-                fontSize: "x-large"
-                font.weight: Font.DemiBold
-                horizontalAlignment: Text.AlignHCenter
-                text: "Podbird"
-            }
-            Label {
-                width: parent.width
-                horizontalAlignment: Text.AlignHCenter
-                // TRANSLATORS: Podbird version number e.g Version 0.6
-                text: i18n.tr("Version %1").arg("0.6")
-            }
-        }
-
-        Column {
+        contentHeight: dataColumn.height + units.gu(10) + dataColumn.anchors.topMargin
+
+        Column {
+            id: dataColumn
+
+            spacing: units.gu(3)
             anchors {
-                left: parent.left
-                right: parent.right
-                margins: units.gu(2)
-            }
+                top: parent.top; left: parent.left; right: parent.right; topMargin: units.gu(5)
+            }
+
+            Image {
+                height: width
+                width: Math.min(parent.width/2, parent.height/2)
+                source: "../graphics/podbird.png"
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            Column {
+                width: parent.width
+                Label {
+                    width: parent.width
+                    fontSize: "x-large"
+                    font.weight: Font.DemiBold
+                    horizontalAlignment: Text.AlignHCenter
+                    text: "Podbird"
+                }
+                Label {
+                    width: parent.width
+                    horizontalAlignment: Text.AlignHCenter
+                    // TRANSLATORS: Podbird version number e.g Version 0.6
+                    text: i18n.tr("Version %1").arg("0.6")
+                }
+            }
+
+            Column {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                }
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    text: "(C) 2015 Podbird Team"
+                }
+                Label {
+                    fontSize: "small"
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    text: i18n.tr("Released under the terms of the GNU GPL v3")
+                }
+            }
+
             Label {
                 width: parent.width
                 wrapMode: Text.WordWrap
-                horizontalAlignment: Text.AlignHCenter
-                text: "(C) 2015 Podbird Team"
-            }
-            Label {
                 fontSize: "small"
-                width: parent.width
-                wrapMode: Text.WordWrap
                 horizontalAlignment: Text.AlignHCenter
-                text: i18n.tr("Released under the terms of the GNU GPL v3")
+                linkColor: podbird.appTheme.linkText
+                text: i18n.tr("Source code available on %1").arg("<a href=\"https://launchpad.net/podbird\">launchpad.net</a>")
+                onLinkActivated: Qt.openUrlExternally(link)
             }
         }
-
-        Label {
-            width: parent.width
-            wrapMode: Text.WordWrap
-            fontSize: "small"
-            horizontalAlignment: Text.AlignHCenter
-            linkColor: podbird.appTheme.linkText
-            text: i18n.tr("Source code available on %1").arg("<a href=\"https://launchpad.net/podbird\">launchpad.net</a>")
-            onLinkActivated: Qt.openUrlExternally(link)
-        }
     }
 }

=== modified file 'app/settings/CleanSetting.qml'
--- app/settings/CleanSetting.qml	2015-03-31 08:35:54 +0000
+++ app/settings/CleanSetting.qml	2015-06-13 16:50:32 +0000
@@ -45,6 +45,13 @@
         model: cleanupModel
         anchors.fill: parent
 
+        // Required to accomodate the now playing bar being shown in landscape mode which
+        // can hide a setting if not for this footer.
+        footer: Item {
+            width: parent.width
+            height: units.gu(8)
+        }
+
         delegate: ListItem.Standard {
             text: model.name
             onClicked: {

=== modified file 'app/settings/Credits.qml'
--- app/settings/Credits.qml	2015-04-23 23:45:18 +0000
+++ app/settings/Credits.qml	2015-06-13 16:50:32 +0000
@@ -25,41 +25,40 @@
 
     title: i18n.tr("Credits")
 
-    Column {
-        anchors.topMargin: units.gu(1)
+    ListModel {
+        id: creditsModel
+        Component.onCompleted: initialize()
+        function initialize() {
+            // TRANSLATORS: The first argument is the name of creator of Podbird (Michael Sheldon)
+            creditsModel.append({ name: i18n.tr("%1 (Creator)").arg("Michael Sheldon"), title: i18n.tr("Developers") })
+            creditsModel.append({ name: "Nekhelesh Ramananthan", title: i18n.tr("Developers") })
+            creditsModel.append({ name: "Kevin Feyder", title: i18n.tr("Designer") })
+            creditsModel.append({ name: "Ubuntu Translators Community", title: i18n.tr("Translators") })
+        }
+    }
+
+    UbuntuListView {
+        id: credits
+
+        model: creditsModel
         anchors.fill: parent
 
-        ListItem.Header {
-            text: i18n.tr("Developers")
-        }
-
-        ListItem.Standard {
-            showDivider: false
-            // TRANSLATORS: The first argument is the name of creator of Podbird (Michael Sheldon)
-            text: i18n.tr("%1 (Creator)").arg("Michael Sheldon")
-        }
-
-        ListItem.Standard {
-            showDivider: false
-            text: "Nekhelesh Ramananthan"
-        }
-
-        ListItem.Header {
-            text: i18n.tr("Designer")
-        }
-
-        ListItem.Standard {
-            showDivider: false
-            text: "Kevin Feyder"
-        }
-
-        ListItem.Header {
-            text: i18n.tr("Translators")
-        }
-
-        ListItem.Standard {
-            showDivider: false
-            text: "Ubuntu Translators Team"
+        section.property: "title"
+        section.labelPositioning: ViewSection.InlineLabels
+        section.delegate: ListItem.Header {
+            text: section
+        }
+
+        // Required to accomodate the now playing bar being shown in landscape mode which
+        // can hide a setting if not for this footer.
+        footer: Item {
+            width: parent.width
+            height: units.gu(8)
+        }
+
+        delegate: ListItem.Standard {
+            text: model.name
+            showDivider: false
         }
     }
 }

=== modified file 'app/settings/DownloadSetting.qml'
--- app/settings/DownloadSetting.qml	2015-03-30 20:51:35 +0000
+++ app/settings/DownloadSetting.qml	2015-06-13 16:50:32 +0000
@@ -44,6 +44,13 @@
         model: episodeDownloadNumber
         anchors.fill: parent
 
+        // Required to accomodate the now playing bar being shown in landscape mode which
+        // can hide a setting if not for this footer.
+        footer: Item {
+            width: parent.width
+            height: units.gu(8)
+        }
+
         delegate: ListItem.Standard {
             text: model.name
             onClicked: {

=== modified file 'app/settings/ThemeSetting.qml'
--- app/settings/ThemeSetting.qml	2015-04-23 23:45:18 +0000
+++ app/settings/ThemeSetting.qml	2015-06-13 16:50:32 +0000
@@ -43,6 +43,13 @@
         model: themeModel
         anchors.fill: parent
 
+        // Required to accomodate the now playing bar being shown in landscape mode which
+        // can hide a setting if not for this footer.
+        footer: Item {
+            width: parent.width
+            height: units.gu(8)
+        }
+
         delegate: ListItem.Standard {
             text: model.name
             onClicked: {

=== modified file 'app/ui/NowPlayingPage.qml'
--- app/ui/NowPlayingPage.qml	2015-04-23 23:45:18 +0000
+++ app/ui/NowPlayingPage.qml	2015-06-13 16:50:32 +0000
@@ -29,6 +29,40 @@
     title: i18n.tr("Now Playing")
 
     property bool isNowPlayingPage: true
+    property bool isLandscapeMode: width > height
+
+    // Landscape rule
+    states: [
+        State {
+            name: "landscape"
+            when: isLandscapeMode
+
+            PropertyChanges {
+                target: blurredBackground
+                width: parent.width/2.2
+                height: parent.height
+            }
+
+            AnchorChanges {
+                target: blurredBackground
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    right: undefined
+                }
+            }
+
+            AnchorChanges {
+                target: dataContainer
+                anchors {
+                    top: parent.top
+                    left: blurredBackground.right
+                    right: parent.right
+                    bottom: parent.bottom
+                }
+            }
+        }
+    ]
 
     BlurredBackground {
         id: blurredBackground
@@ -50,171 +84,183 @@
         }
     }
 
-    Label {
-        id: title
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: blurredBackground.bottom
-        anchors.margins: units.gu(2)
-        text: currentName
-        elide: Text.ElideRight
-        fontSize: "large"
-        maximumLineCount: 2
-        wrapMode: Text.WordWrap
-        color: podbird.appTheme.baseText
-    }
-
-    Label {
-        id: artist
-        anchors.left: title.left
-        anchors.right: title.right
-        anchors.top: title.bottom
-        anchors.topMargin: units.gu(1)
-        text: currentArtist
-        elide: Text.ElideRight
-        fontSize: "small"
-        color: podbird.appTheme.baseSubText
-    }
-
-    Slider {
-        id: scrubber
+    Item {
+        id: dataContainer
 
         anchors {
+            top: blurredBackground.bottom
             left: parent.left
             right: parent.right
+            bottom: parent.bottom
             margins: units.gu(2)
-            bottom: controls.top
-            bottomMargin: units.gu(2)
-        }
-
-        live: true
-        minimumValue: 0
-        maximumValue: player.duration
-        value: player.position
-        height: units.gu(2)
-
-        onValueChanged: {
-            if (pressed) {
-                player.seek(value);
-            }
-        }
-
-        function formatValue(v) { return Podcasts.formatTime(v/1000); }
-    }
-
-    Connections {
-        target: player
-        onPositionChanged: scrubber.value = player.position
-    }
-
-    Label {
-        id: startTime
-        fontSize: "small"
-        anchors.left: scrubber.left
-        anchors.top: scrubber.bottom
-        color: podbird.appTheme.baseText
-        text: Podcasts.formatTime(player.position / 1000)
-    }
-
-    Label {
-        id: endTime
-        fontSize: "small"
-        anchors.right: scrubber.right
-        anchors.top: scrubber.bottom
-        color: podbird.appTheme.baseText
-        text: Podcasts.formatTime(player.duration / 1000)
-    }
-
-    Row {
-        id: controls
-        anchors.bottom: parent.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        spacing: units.gu(2)
-
-        AbstractButton {
-            id: skipBackwardButton
-            width: units.gu(6)
-            height: width
-            anchors.verticalCenter: parent.verticalCenter
-            opacity: player.position === 0 ? 0.4 : 1.0
-            onClicked: {
-                if (player.position > 0) {
-                    player.seek(player.position - 15 * 1000);
-                }
-            }
-
-            Row {
-                spacing: units.gu(1)
-                anchors.centerIn: parent
-
-                Label {
-                    // TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward.
-                    // xgettext: no-c-format
-                    text: i18n.tr("-%1s").arg("15")
-                    fontSize: "xx-small"
-                    color: podbird.appTheme.baseText
-                    anchors.verticalCenter: skipBackwardIcon.verticalCenter
-                }
-
-                Icon {
-                    id: skipBackwardIcon
-                    width: units.gu(3)
-                    height: width
-                    name: "media-seek-backward"
-                    color: podbird.appTheme.baseIcon
-                }
-            }
-        }
-
-        AbstractButton {
-            id: playButton
-            width: units.gu(10)
-            height: width
-            opacity: playButton.pressed ? 0.4 : 1.0
-            onClicked: player.playbackState === MediaPlayer.PlayingState ? player.pause() : player.play()
-
-            Icon {
-                id: playIcon
-                width: units.gu(6)
-                height: width
-                anchors.centerIn: parent
-                color: podbird.appTheme.baseIcon
-                name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
-                                                                        : "media-playback-start"
-            }
-        }
-
-        AbstractButton {
-            id: skipForwardButton
-            width: units.gu(6)
-            height: width
-            anchors.verticalCenter: parent.verticalCenter
-            opacity: player.position === 0 ? 0.4 : 1.0
-            onClicked: {
-                if (player.position > 0) {
-                    player.seek(player.position + 15 * 1000);
-                }
-            }
-
-            Row {
-                spacing: units.gu(1)
-                anchors.centerIn: parent
-
-                Icon {
-                    id: skipForwardIcon
-                    width: units.gu(3)
-                    height: width
-                    name: "media-seek-forward"
-                    color: podbird.appTheme.baseIcon
-                }
-
-                Label {
-                    // TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward.
-                    // xgettext: no-c-format
-                    text: i18n.tr("+%1s").arg("15")
-                    fontSize: "xx-small"
-                    color: podbird.appTheme.baseText
-                    anchors.verticalCenter: skipForwardIcon.verticalCenter
+            bottomMargin: isLandscapeMode ? units.gu(4) : units.gu(2)
+        }
+
+        Label {
+            id: title
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: parent.top
+            text: currentName
+            elide: Text.ElideRight
+            fontSize: "large"
+            maximumLineCount: 2
+            wrapMode: Text.WordWrap
+            color: podbird.appTheme.baseText
+        }
+
+        Label {
+            id: artist
+            anchors.left: title.left
+            anchors.right: title.right
+            anchors.top: title.bottom
+            anchors.topMargin: units.gu(1)
+            text: currentArtist
+            elide: Text.ElideRight
+            fontSize: "small"
+            color: podbird.appTheme.baseSubText
+        }
+
+        Slider {
+            id: scrubber
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: controls.top
+                bottomMargin: isLandscapeMode ? units.gu(4) : units.gu(2)
+            }
+
+            live: true
+            minimumValue: 0
+            maximumValue: player.duration
+            value: player.position
+            height: units.gu(2)
+
+            onValueChanged: {
+                if (pressed) {
+                    player.seek(value);
+                }
+            }
+
+            function formatValue(v) { return Podcasts.formatTime(v/1000); }
+        }
+
+        Connections {
+            target: player
+            onPositionChanged: scrubber.value = player.position
+        }
+
+        Label {
+            id: startTime
+            fontSize: "small"
+            anchors.left: scrubber.left
+            anchors.top: scrubber.bottom
+            color: podbird.appTheme.baseText
+            text: Podcasts.formatTime(player.position / 1000)
+        }
+
+        Label {
+            id: endTime
+            fontSize: "small"
+            anchors.right: scrubber.right
+            anchors.top: scrubber.bottom
+            color: podbird.appTheme.baseText
+            text: Podcasts.formatTime(player.duration / 1000)
+        }
+
+        Row {
+            id: controls
+
+            anchors.bottom: parent.bottom
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: units.gu(2)
+
+            AbstractButton {
+                id: skipBackwardButton
+                width: units.gu(6)
+                height: width
+                anchors.verticalCenter: parent.verticalCenter
+                opacity: player.position === 0 ? 0.4 : 1.0
+                onClicked: {
+                    if (player.position > 0) {
+                        player.seek(player.position - 15 * 1000);
+                    }
+                }
+
+                Row {
+                    spacing: units.gu(1)
+                    anchors.centerIn: parent
+
+                    Label {
+                        // TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward.
+                        // xgettext: no-c-format
+                        text: i18n.tr("-%1s").arg("15")
+                        fontSize: "xx-small"
+                        color: podbird.appTheme.baseText
+                        anchors.verticalCenter: skipBackwardIcon.verticalCenter
+                    }
+
+                    Icon {
+                        id: skipBackwardIcon
+                        width: units.gu(3)
+                        height: width
+                        name: "media-seek-backward"
+                        color: podbird.appTheme.baseIcon
+                    }
+                }
+            }
+
+            AbstractButton {
+                id: playButton
+                width: units.gu(10)
+                height: width
+                opacity: playButton.pressed ? 0.4 : 1.0
+                onClicked: player.playbackState === MediaPlayer.PlayingState ? player.pause() : player.play()
+
+                Icon {
+                    id: playIcon
+                    width: units.gu(6)
+                    height: width
+                    anchors.centerIn: parent
+                    color: podbird.appTheme.baseIcon
+                    name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause"
+                                                                            : "media-playback-start"
+                }
+            }
+
+            AbstractButton {
+                id: skipForwardButton
+                width: units.gu(6)
+                height: width
+                anchors.verticalCenter: parent.verticalCenter
+                opacity: player.position === 0 ? 0.4 : 1.0
+                onClicked: {
+                    if (player.position > 0) {
+                        player.seek(player.position + 15 * 1000);
+                    }
+                }
+
+                Row {
+                    spacing: units.gu(1)
+                    anchors.centerIn: parent
+
+                    Icon {
+                        id: skipForwardIcon
+                        width: units.gu(3)
+                        height: width
+                        name: "media-seek-forward"
+                        color: podbird.appTheme.baseIcon
+                    }
+
+                    Label {
+                        // TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward.
+                        // xgettext: no-c-format
+                        text: i18n.tr("+%1s").arg("15")
+                        fontSize: "xx-small"
+                        color: podbird.appTheme.baseText
+                        anchors.verticalCenter: skipForwardIcon.verticalCenter
+                    }
                 }
             }
         }

=== modified file 'po/com.mikeasoft.podbird.pot'
--- po/com.mikeasoft.podbird.pot	2015-04-28 12:09:05 +0000
+++ po/com.mikeasoft.podbird.pot	2015-06-13 16:50:32 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-28 12:08+0000\n"
+"POT-Creation-Date: 2015-04-28 14:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,25 +18,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/components/Walkthrough.qml:87
+#: ../app/components/Walkthrough.qml:91
 msgid "Skip"
 msgstr ""
 
 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
-#: ../app/podbird.qml:165
+#: ../app/podbird.qml:166
 #, qt-format
 msgid "Podcasts listened to today: <b>%1</b>"
 msgstr ""
 
-#: ../app/podbird.qml:166
+#: ../app/podbird.qml:167
 msgid "No podcasts listened to today"
 msgstr ""
 
-#: ../app/podbird.qml:228
+#: ../app/podbird.qml:229
 msgid "Add New Podcasts"
 msgstr ""
 
-#: ../app/podbird.qml:242
+#: ../app/podbird.qml:243
 msgid "Settings"
 msgstr ""
 
@@ -61,16 +61,16 @@
 msgstr ""
 
 #. TRANSLATORS: Podbird version number e.g Version 0.6
-#: ../app/settings/About.qml:53
+#: ../app/settings/About.qml:61
 #, qt-format
 msgid "Version %1"
 msgstr ""
 
-#: ../app/settings/About.qml:74
+#: ../app/settings/About.qml:82
 msgid "Released under the terms of the GNU GPL v3"
 msgstr ""
 
-#: ../app/settings/About.qml:84
+#: ../app/settings/About.qml:92
 #, qt-format
 msgid "Source code available on %1"
 msgstr ""
@@ -109,21 +109,21 @@
 msgid "Credits"
 msgstr ""
 
+#. TRANSLATORS: The first argument is the name of creator of Podbird (Michael Sheldon)
 #: ../app/settings/Credits.qml:33
+#, qt-format
+msgid "%1 (Creator)"
+msgstr ""
+
+#: ../app/settings/Credits.qml:33 ../app/settings/Credits.qml:34
 msgid "Developers"
 msgstr ""
 
-#. TRANSLATORS: The first argument is the name of creator of Podbird (Michael Sheldon)
-#: ../app/settings/Credits.qml:39
-#, qt-format
-msgid "%1 (Creator)"
-msgstr ""
-
-#: ../app/settings/Credits.qml:48
+#: ../app/settings/Credits.qml:35
 msgid "Designer"
 msgstr ""
 
-#: ../app/settings/Credits.qml:57
+#: ../app/settings/Credits.qml:36
 msgid "Translators"
 msgstr ""
 
@@ -244,13 +244,13 @@
 msgstr ""
 
 #. TRANSLATORS: The string shown in the UI is -15s to denote the number of seconds that the podcast playback will skip backward.
-#: ../app/ui/NowPlayingPage.qml:153
+#: ../app/ui/NowPlayingPage.qml:198
 #, no-c-format, qt-format
 msgid "-%1s"
 msgstr ""
 
 #. TRANSLATORS: The string shown in the UI is +15s to denote the number of seconds that the podcast playback will skip forward.
-#: ../app/ui/NowPlayingPage.qml:214
+#: ../app/ui/NowPlayingPage.qml:259
 #, no-c-format, qt-format
 msgid "+%1s"
 msgstr ""
@@ -512,6 +512,6 @@
 msgid "Finish"
 msgstr ""
 
-#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-10-rearrange-project-structure-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
+#: /home/krnekhelesh/Documents/Ubuntu-Projects/MP-Reviews/builddir/build-11-enable-rotation-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/Podbird.desktop.in.h:1
 msgid "The chirpiest podcast manager for Ubuntu"
 msgstr ""