Ubuntu Shorts App

Merge lp:~christriant/ubuntu-rssreader-app/fixed- into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. fixed-
  2. Merge into trunk
Proposed by Chris Triantafillis
Status: Merged
Approved by: David Planella
Approved revision: 44
Merged at revision: 45
Proposed branch: lp:~christriant/ubuntu-rssreader-app/fixed-
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
ubuntu-rssreader-app.qml (+1/-1)
To merge this branch: bzr merge lp:~christriant/ubuntu-rssreader-app/fixed-
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Review via email: mp+181548@code.launchpad.net

Commit message

Fixed bug #1214951 Toolbar item to switch back to grid view should say 'Grid view' instead of 'Shorts'

Description of the change

Fixed bug #1214951

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-rssreader-app.qml'
2--- ubuntu-rssreader-app.qml 2013-08-19 19:38:53 +0000
3+++ ubuntu-rssreader-app.qml 2013-08-22 12:49:52 +0000
4@@ -117,7 +117,7 @@
5 action: Action {
6 id: changeModeAction
7
8- text: pageStack.isListView ? i18n.tr("Shorts") : i18n.tr("List view")
9+ text: pageStack.isListView ? i18n.tr("Grid View") : i18n.tr("List view")
10 iconSource: pageStack.isListView ? Qt.resolvedUrl("./icons_tmp/view-fullscreen.svg") : Qt.resolvedUrl("./icons_tmp/view-fullscreen.svg")
11 onTriggered: {
12 pageStack.isListView = !pageStack.isListView

Subscribers

People subscribed via source and target branches