Ubuntu Shorts App

Merge lp:~qqworini/ubuntu-rssreader-app/new-icon into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. new-icon
  2. Merge into trunk
Proposed by Joey Chan
Status: Merged
Approved by: Roman Shchekin
Approved revision: 388
Merged at revision: 388
Proposed branch: lp:~qqworini/ubuntu-rssreader-app/new-icon
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 268 lines (+60/-69)
1 file modified
po/com.ubuntu.shorts.pot (+60/-69)
To merge this branch: bzr merge lp:~qqworini/ubuntu-rssreader-app/new-icon
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Roman Shchekin Pending
Review via email: mp+260149@code.launchpad.net

This proposal supersedes a proposal from 2015-05-26.

Commit message

update to new icon

Description of the change

update to new icon

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:388
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/338/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2799
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2799/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/66
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-ci/63

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/338/rebuild

review: Approve (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-autolanding/196/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2804
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-autolanding/48
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-autolanding/18

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:388
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~qqworini/ubuntu-rssreader-app/new-icon/+merge/260086/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/339/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2812
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2812/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-ci/64

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/339/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote : Posted in a previous version of this proposal

Specify commit message, please)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:388
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/340/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2814
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-ci/65

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/340/rebuild

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

Good idea came to me late - change icon for reboot only, so users will understand that app is new...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/com.ubuntu.shorts.pot'
--- po/com.ubuntu.shorts.pot 2014-12-28 14:51:47 +0000
+++ po/com.ubuntu.shorts.pot 2015-05-26 13:09:25 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-12-26 17:02+0100\n"11"POT-Creation-Date: 2015-05-22 10:47+0800\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,55 +18,51 @@
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../ArticleViewItem.qml:12021#: ../ArticleViewItem.qml:121
22msgid "Select article"22msgid "Select article"
23msgstr ""23msgstr ""
2424
25#: ../ReadingOptions.qml:4425#: ../ArticleViewPage.qml:42
26msgid "Save"
27msgstr ""
28
29#: ../ArticleViewPage.qml:42 ../feeds/SwipeDelete.qml:57
30#: ../feeds/SwipeDelete.qml:76
31msgid "Remove"
32msgstr ""
33
34#: ../ArticleViewPage.qml:58
35msgid "Options"
36msgstr ""
37
38#: ../ArticleViewPage.qml:66
39msgid "Open site"
40msgstr ""
41
42#: ../BaseTab.qml:152
43msgid "There are no articles to show"
44msgstr ""
45
46#: ../ReadingOptions.qml:42
26msgid "Dark"47msgid "Dark"
27msgstr ""48msgstr ""
2849
29#: ../ReadingOptions.qml:5450#: ../ReadingOptions.qml:52
30msgid "Light"51msgid "Light"
31msgstr ""52msgstr ""
3253
54#: ../ReadingOptions.qml:109
55msgid "Small"
56msgstr ""
57
33#: ../ReadingOptions.qml:11158#: ../ReadingOptions.qml:111
34msgid "Small"
35msgstr ""
36
37#: ../ReadingOptions.qml:113
38msgid "Mid"59msgid "Mid"
39msgstr ""60msgstr ""
4061
41#: ../ReadingOptions.qml:11462#: ../ReadingOptions.qml:112
42msgid "Large"63msgid "Large"
43msgstr ""64msgstr ""
4465
45#: ../RssFeedPage.qml:48
46msgid "Options"
47msgstr ""
48
49#: ../RssFeedPage.qml:56
50msgid "Save"
51msgstr ""
52
53#: ../RssFeedPage.qml:56 ../feeds/SwipeDelete.qml:57
54#: ../feeds/SwipeDelete.qml:76
55msgid "Remove"
56msgstr ""
57
58#: ../RssFeedPage.qml:72
59msgid "Open site"
60msgstr ""
61
62#: ../SavedTab.qml:190
63msgid "You have no saved articles"
64msgstr ""
65
66#: ../ShortsTab.qml:184 ../TopicTab.qml:136
67msgid "There are no articles to show"
68msgstr ""
69
70#. TRANSLATORS: this is a time formatting string,66#. TRANSLATORS: this is a time formatting string,
71#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions67#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
72#: ../dateutils.js:3968#: ../dateutils.js:39
@@ -115,7 +111,7 @@
115msgstr[0] ""111msgstr[0] ""
116msgstr[1] ""112msgstr[1] ""
117113
118#: ../feeds/AppendFeedPage.qml:30 ../shorts-app.qml:249 ../shorts-app.qml:441114#: ../feeds/AppendFeedPage.qml:30 ../shorts-app.qml:238 ../shorts-app.qml:398
119msgid "Add feeds"115msgid "Add feeds"
120msgstr ""116msgstr ""
121117
@@ -123,33 +119,32 @@
123msgid "Failed to perform a feed search by keyword"119msgid "Failed to perform a feed search by keyword"
124msgstr ""120msgstr ""
125121
126#: ../feeds/AppendFeedPage.qml:69 ../feeds/AppendFeedPage.qml:96122#: ../feeds/AppendFeedPage.qml:69 ../feeds/AppendFeedPage.qml:100
127msgid "Search failed"123msgid "Search failed"
128msgstr ""124msgstr ""
129125
130#: ../feeds/AppendFeedPage.qml:95126#: ../feeds/AppendFeedPage.qml:99
131msgid "Failed to perform a feed search by URL"127msgid "Failed to perform a feed search by URL"
132msgstr ""128msgstr ""
133129
134#: ../feeds/AppendFeedPage.qml:132130#: ../feeds/AppendFeedPage.qml:136
135msgid "Type a keyword or URL"131msgid "Type a keyword or URL"
136msgstr ""132msgstr ""
137133
138#: ../feeds/AppendFeedPage.qml:184134#: ../feeds/AppendFeedPage.qml:188
139msgid "Search results"135msgid "Search results"
140msgstr ""136msgstr ""
141137
142#: ../feeds/AppendFeedPage.qml:242 ../feeds/CreateTopicPage.qml:38138#: ../feeds/AppendFeedPage.qml:246 ../feeds/CreateTopicPage.qml:38
143#: ../feeds/EditFeed.qml:24 ../feeds/TopicManagement.qml:64139#: ../feeds/TopicManagement.qml:64 ../shorts-app.qml:477
144#: ../shorts-app.qml:500
145msgid "Cancel"140msgid "Cancel"
146msgstr ""141msgstr ""
147142
148#: ../feeds/AppendFeedPage.qml:275143#: ../feeds/AppendFeedPage.qml:279
149msgid "Next"144msgid "Next"
150msgstr ""145msgstr ""
151146
152#: ../feeds/AppendFeedPage.qml:304 ../feeds/CreateTopicPage.qml:183147#: ../feeds/AppendFeedPage.qml:308 ../feeds/CreateTopicPage.qml:183
153msgid "No feeds"148msgid "No feeds"
154msgstr ""149msgstr ""
155150
@@ -194,31 +189,27 @@
194msgid "Select feeds (optional)"189msgid "Select feeds (optional)"
195msgstr ""190msgstr ""
196191
197#: ../feeds/EditFeed.qml:12192#: ../feeds/EditFeedPage.qml:12
198msgid "Edit Feed"193msgid "Edit Feed"
199msgstr ""194msgstr ""
200195
201#: ../feeds/EditFeed.qml:36196#: ../feeds/EditFeedPage.qml:20
202msgid "Delete"
203msgstr ""
204
205#: ../feeds/EditFeed.qml:53
206msgid "Done"197msgid "Done"
207msgstr ""198msgstr ""
208199
209#: ../feeds/EditFeed.qml:131200#: ../feeds/EditFeedPage.qml:93
210msgid "Title: "201msgid "Title: "
211msgstr ""202msgstr ""
212203
213#: ../feeds/EditFeed.qml:154204#: ../feeds/EditFeedPage.qml:116
214msgid "URL: "205msgid "URL: "
215msgstr ""206msgstr ""
216207
217#: ../feeds/EditFeed.qml:172208#: ../feeds/EditFeedPage.qml:134
218msgid "Topic: "209msgid "Topic: "
219msgstr ""210msgstr ""
220211
221#: ../feeds/TopicManagement.qml:13 ../shorts-app.qml:263212#: ../feeds/TopicManagement.qml:13 ../shorts-app.qml:252
222msgid "Edit topics"213msgid "Edit topics"
223msgstr ""214msgstr ""
224215
@@ -230,63 +221,63 @@
230msgid "Add Feed"221msgid "Add Feed"
231msgstr ""222msgstr ""
232223
233#: ../shorts-app.qml:198224#: ../shorts-app.qml:205
234msgid "Refresh"225msgid "Refresh"
235msgstr ""226msgstr ""
236227
237#: ../shorts-app.qml:210228#: ../shorts-app.qml:212
238msgid "Grid View"229msgid "Grid View"
239msgstr ""230msgstr ""
240231
241#: ../shorts-app.qml:210232#: ../shorts-app.qml:212
242msgid "List view"233msgid "List view"
243msgstr ""234msgstr ""
244235
245#: ../shorts-app.qml:368236#: ../shorts-app.qml:329
246msgid "Saved"237msgid "Saved"
247msgstr ""238msgstr ""
248239
249#: ../shorts-app.qml:376 com.ubuntu.shorts_shorts.desktop.in.in.h:1240#: ../shorts-app.qml:337 com.ubuntu.shorts_shorts.desktop.in.in.h:1
250msgid "Shorts"241msgid "Shorts"
251msgstr ""242msgstr ""
252243
253#: ../shorts-app.qml:492244#: ../shorts-app.qml:469
254msgid "Checking for new articles"245msgid "Checking for new articles"
255msgstr ""246msgstr ""
256247
257#: ../shorts-app.qml:516248#: ../shorts-app.qml:493
258msgid "Perhaps some of the channels have not been updated."249msgid "Perhaps some of the channels have not been updated."
259msgstr ""250msgstr ""
260251
261#: ../shorts-app.qml:517252#: ../shorts-app.qml:494
262msgid "Errors occurred during the update"253msgid "Errors occurred during the update"
263msgstr ""254msgstr ""
264255
265#: ../shorts-app.qml:535256#: ../shorts-app.qml:512
266msgid "+ Add feeds"257msgid "+ Add feeds"
267msgstr ""258msgstr ""
268259
269#: ../shorts-app.qml:555260#: ../shorts-app.qml:532
270msgid "Add online accounts"261msgid "Add online accounts"
271msgstr ""262msgstr ""
272263
273#: ../shorts-app.qml:558264#: ../shorts-app.qml:535
274msgid "Online accounts are not available for now"265msgid "Online accounts are not available for now"
275msgstr ""266msgstr ""
276267
277#: ../shorts-app.qml:559 ../shorts-app.qml:568268#: ../shorts-app.qml:536 ../shorts-app.qml:545
278msgid "We are sorry"269msgid "We are sorry"
279msgstr ""270msgstr ""
280271
281#: ../shorts-app.qml:564272#: ../shorts-app.qml:541
282msgid "Import subscriptions"273msgid "Import subscriptions"
283msgstr ""274msgstr ""
284275
285#: ../shorts-app.qml:567276#: ../shorts-app.qml:544
286msgid "Importing subscriptions is not available for now"277msgid "Importing subscriptions is not available for now"
287msgstr ""278msgstr ""
288279
289#: ../shorts-app.qml:582280#: ../shorts-app.qml:559
290msgid "Ok"281msgid "Ok"
291msgstr ""282msgstr ""
292283
293284
=== modified file 'rssreader-app@30.png' (properties changed: -x to +x)
294Binary files rssreader-app@30.png 2014-02-18 21:22:34 +0000 and rssreader-app@30.png 2015-05-26 13:09:25 +0000 differ285Binary files rssreader-app@30.png 2014-02-18 21:22:34 +0000 and rssreader-app@30.png 2015-05-26 13:09:25 +0000 differ

Subscribers

People subscribed via source and target branches