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: Superseded
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 Needs Fixing
Roman Shchekin Approve
Review via email: mp+259881@code.launchpad.net

This proposal has been superseded by 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 :

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) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.shorts.pot'
2--- po/com.ubuntu.shorts.pot 2014-12-28 14:51:47 +0000
3+++ po/com.ubuntu.shorts.pot 2015-05-22 02:51:29 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: \n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-12-26 17:02+0100\n"
9+"POT-Creation-Date: 2015-05-22 10:47+0800\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -18,55 +18,51 @@
14 "Content-Transfer-Encoding: 8bit\n"
15 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
16
17-#: ../ArticleViewItem.qml:120
18+#: ../ArticleViewItem.qml:121
19 msgid "Select article"
20 msgstr ""
21
22-#: ../ReadingOptions.qml:44
23+#: ../ArticleViewPage.qml:42
24+msgid "Save"
25+msgstr ""
26+
27+#: ../ArticleViewPage.qml:42 ../feeds/SwipeDelete.qml:57
28+#: ../feeds/SwipeDelete.qml:76
29+msgid "Remove"
30+msgstr ""
31+
32+#: ../ArticleViewPage.qml:58
33+msgid "Options"
34+msgstr ""
35+
36+#: ../ArticleViewPage.qml:66
37+msgid "Open site"
38+msgstr ""
39+
40+#: ../BaseTab.qml:152
41+msgid "There are no articles to show"
42+msgstr ""
43+
44+#: ../ReadingOptions.qml:42
45 msgid "Dark"
46 msgstr ""
47
48-#: ../ReadingOptions.qml:54
49+#: ../ReadingOptions.qml:52
50 msgid "Light"
51 msgstr ""
52
53+#: ../ReadingOptions.qml:109
54+msgid "Small"
55+msgstr ""
56+
57 #: ../ReadingOptions.qml:111
58-msgid "Small"
59-msgstr ""
60-
61-#: ../ReadingOptions.qml:113
62 msgid "Mid"
63 msgstr ""
64
65-#: ../ReadingOptions.qml:114
66+#: ../ReadingOptions.qml:112
67 msgid "Large"
68 msgstr ""
69
70-#: ../RssFeedPage.qml:48
71-msgid "Options"
72-msgstr ""
73-
74-#: ../RssFeedPage.qml:56
75-msgid "Save"
76-msgstr ""
77-
78-#: ../RssFeedPage.qml:56 ../feeds/SwipeDelete.qml:57
79-#: ../feeds/SwipeDelete.qml:76
80-msgid "Remove"
81-msgstr ""
82-
83-#: ../RssFeedPage.qml:72
84-msgid "Open site"
85-msgstr ""
86-
87-#: ../SavedTab.qml:190
88-msgid "You have no saved articles"
89-msgstr ""
90-
91-#: ../ShortsTab.qml:184 ../TopicTab.qml:136
92-msgid "There are no articles to show"
93-msgstr ""
94-
95 #. TRANSLATORS: this is a time formatting string,
96 #. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
97 #: ../dateutils.js:39
98@@ -115,7 +111,7 @@
99 msgstr[0] ""
100 msgstr[1] ""
101
102-#: ../feeds/AppendFeedPage.qml:30 ../shorts-app.qml:249 ../shorts-app.qml:441
103+#: ../feeds/AppendFeedPage.qml:30 ../shorts-app.qml:238 ../shorts-app.qml:398
104 msgid "Add feeds"
105 msgstr ""
106
107@@ -123,33 +119,32 @@
108 msgid "Failed to perform a feed search by keyword"
109 msgstr ""
110
111-#: ../feeds/AppendFeedPage.qml:69 ../feeds/AppendFeedPage.qml:96
112+#: ../feeds/AppendFeedPage.qml:69 ../feeds/AppendFeedPage.qml:100
113 msgid "Search failed"
114 msgstr ""
115
116-#: ../feeds/AppendFeedPage.qml:95
117+#: ../feeds/AppendFeedPage.qml:99
118 msgid "Failed to perform a feed search by URL"
119 msgstr ""
120
121-#: ../feeds/AppendFeedPage.qml:132
122+#: ../feeds/AppendFeedPage.qml:136
123 msgid "Type a keyword or URL"
124 msgstr ""
125
126-#: ../feeds/AppendFeedPage.qml:184
127+#: ../feeds/AppendFeedPage.qml:188
128 msgid "Search results"
129 msgstr ""
130
131-#: ../feeds/AppendFeedPage.qml:242 ../feeds/CreateTopicPage.qml:38
132-#: ../feeds/EditFeed.qml:24 ../feeds/TopicManagement.qml:64
133-#: ../shorts-app.qml:500
134+#: ../feeds/AppendFeedPage.qml:246 ../feeds/CreateTopicPage.qml:38
135+#: ../feeds/TopicManagement.qml:64 ../shorts-app.qml:477
136 msgid "Cancel"
137 msgstr ""
138
139-#: ../feeds/AppendFeedPage.qml:275
140+#: ../feeds/AppendFeedPage.qml:279
141 msgid "Next"
142 msgstr ""
143
144-#: ../feeds/AppendFeedPage.qml:304 ../feeds/CreateTopicPage.qml:183
145+#: ../feeds/AppendFeedPage.qml:308 ../feeds/CreateTopicPage.qml:183
146 msgid "No feeds"
147 msgstr ""
148
149@@ -194,31 +189,27 @@
150 msgid "Select feeds (optional)"
151 msgstr ""
152
153-#: ../feeds/EditFeed.qml:12
154+#: ../feeds/EditFeedPage.qml:12
155 msgid "Edit Feed"
156 msgstr ""
157
158-#: ../feeds/EditFeed.qml:36
159-msgid "Delete"
160-msgstr ""
161-
162-#: ../feeds/EditFeed.qml:53
163+#: ../feeds/EditFeedPage.qml:20
164 msgid "Done"
165 msgstr ""
166
167-#: ../feeds/EditFeed.qml:131
168+#: ../feeds/EditFeedPage.qml:93
169 msgid "Title: "
170 msgstr ""
171
172-#: ../feeds/EditFeed.qml:154
173+#: ../feeds/EditFeedPage.qml:116
174 msgid "URL: "
175 msgstr ""
176
177-#: ../feeds/EditFeed.qml:172
178+#: ../feeds/EditFeedPage.qml:134
179 msgid "Topic: "
180 msgstr ""
181
182-#: ../feeds/TopicManagement.qml:13 ../shorts-app.qml:263
183+#: ../feeds/TopicManagement.qml:13 ../shorts-app.qml:252
184 msgid "Edit topics"
185 msgstr ""
186
187@@ -230,63 +221,63 @@
188 msgid "Add Feed"
189 msgstr ""
190
191-#: ../shorts-app.qml:198
192+#: ../shorts-app.qml:205
193 msgid "Refresh"
194 msgstr ""
195
196-#: ../shorts-app.qml:210
197+#: ../shorts-app.qml:212
198 msgid "Grid View"
199 msgstr ""
200
201-#: ../shorts-app.qml:210
202+#: ../shorts-app.qml:212
203 msgid "List view"
204 msgstr ""
205
206-#: ../shorts-app.qml:368
207+#: ../shorts-app.qml:329
208 msgid "Saved"
209 msgstr ""
210
211-#: ../shorts-app.qml:376 com.ubuntu.shorts_shorts.desktop.in.in.h:1
212+#: ../shorts-app.qml:337 com.ubuntu.shorts_shorts.desktop.in.in.h:1
213 msgid "Shorts"
214 msgstr ""
215
216-#: ../shorts-app.qml:492
217+#: ../shorts-app.qml:469
218 msgid "Checking for new articles"
219 msgstr ""
220
221-#: ../shorts-app.qml:516
222+#: ../shorts-app.qml:493
223 msgid "Perhaps some of the channels have not been updated."
224 msgstr ""
225
226-#: ../shorts-app.qml:517
227+#: ../shorts-app.qml:494
228 msgid "Errors occurred during the update"
229 msgstr ""
230
231-#: ../shorts-app.qml:535
232+#: ../shorts-app.qml:512
233 msgid "+ Add feeds"
234 msgstr ""
235
236-#: ../shorts-app.qml:555
237+#: ../shorts-app.qml:532
238 msgid "Add online accounts"
239 msgstr ""
240
241-#: ../shorts-app.qml:558
242+#: ../shorts-app.qml:535
243 msgid "Online accounts are not available for now"
244 msgstr ""
245
246-#: ../shorts-app.qml:559 ../shorts-app.qml:568
247+#: ../shorts-app.qml:536 ../shorts-app.qml:545
248 msgid "We are sorry"
249 msgstr ""
250
251-#: ../shorts-app.qml:564
252+#: ../shorts-app.qml:541
253 msgid "Import subscriptions"
254 msgstr ""
255
256-#: ../shorts-app.qml:567
257+#: ../shorts-app.qml:544
258 msgid "Importing subscriptions is not available for now"
259 msgstr ""
260
261-#: ../shorts-app.qml:582
262+#: ../shorts-app.qml:559
263 msgid "Ok"
264 msgstr ""
265
266
267=== modified file 'rssreader-app@30.png' (properties changed: -x to +x)
268Binary files rssreader-app@30.png 2014-02-18 21:22:34 +0000 and rssreader-app@30.png 2015-05-22 02:51:29 +0000 differ

Subscribers

People subscribed via source and target branches