Ubuntu Shorts App

Merge lp:~qqworini/ubuntu-rssreader-app/translation-words-update into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. translation-words-update
  2. Merge into trunk
Proposed by Joey Chan
Status: Merged
Approved by: David Planella
Approved revision: 113
Merged at revision: 112
Proposed branch: lp:~qqworini/ubuntu-rssreader-app/translation-words-update
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 365 lines (+78/-143)
1 file modified
po/rssreader-app.pot (+78/-143)
To merge this branch: bzr merge lp:~qqworini/ubuntu-rssreader-app/translation-words-update
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Review via email: mp+190854@code.launchpad.net

Commit message

words for translation updated

Description of the change

words for translation updated

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

FAILED: Continuous integration, rev:113
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/103/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/970
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/103

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

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks for updating the translation template!

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 'po/rssreader-app.pot'
2--- po/rssreader-app.pot 2013-09-26 07:13:38 +0000
3+++ po/rssreader-app.pot 2013-10-14 04:15:35 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: rssreader-app\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2013-09-26 09:12+0200\n"
9+"POT-Creation-Date: 2013-10-14 11:57+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,73 +18,102 @@
14 "Content-Transfer-Encoding: 8bit\n"
15 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
16
17-#: ../RssFeedPage.qml:50
18+#: ../RssFeedPage.qml:61
19+msgid "Options"
20+msgstr ""
21+
22+#: ../RssFeedPage.qml:72
23 msgid "Save"
24 msgstr ""
25
26-#: ../RssFeedPage.qml:50
27-msgid "Unsave"
28+#: ../RssFeedPage.qml:72 ../feeds/SwipeDelete.qml:57
29+#: ../feeds/SwipeDelete.qml:76
30+msgid "Remove"
31 msgstr ""
32
33-#: ../RssFeedPage.qml:73 ../listview/FeedListPage.qml:170
34+#: ../RssFeedPage.qml:96
35 msgid "Open site"
36 msgstr ""
37
38-#: ../rssreader-app.qml:115
39+#: ../RssFeedPage.qml:204
40+msgid "Small"
41+msgstr ""
42+
43+#: ../RssFeedPage.qml:206
44+msgid "Mid"
45+msgstr ""
46+
47+#: ../RssFeedPage.qml:207
48+msgid "Large"
49+msgstr ""
50+
51+#: ../RssFeedPage.qml:363
52+msgid "Show media"
53+msgstr ""
54+
55+#: ../SavedTab.qml:181
56+msgid "You have no saved articles"
57+msgstr ""
58+
59+#: ../ShortsTab.qml:164 ../TopicTab.qml:117
60+msgid "There are no articles to show"
61+msgstr ""
62+
63+#: ../rssreader-app.qml:130
64 msgid "Refresh"
65 msgstr ""
66
67-#: ../rssreader-app.qml:129
68+#: ../rssreader-app.qml:144
69 msgid "Grid View"
70 msgstr ""
71
72-#: ../rssreader-app.qml:129
73+#: ../rssreader-app.qml:144
74 msgid "List view"
75 msgstr ""
76
77-#: ../rssreader-app.qml:142
78+#: ../rssreader-app.qml:158
79 msgid "Add reads"
80 msgstr ""
81
82-#: ../rssreader-app.qml:153
83+#: ../rssreader-app.qml:169 ../feeds/TopicManagement.qml:13
84 msgid "Edit topics"
85 msgstr ""
86
87-#: ../rssreader-app.qml:185 ../.build/rssreader-app.desktop.js:1
88+#: ../rssreader-app.qml:234
89+msgid "Saved"
90+msgstr ""
91+
92+#: ../rssreader-app.qml:242 ../.build/rssreader-app.desktop.js:1
93 msgid "Shorts"
94 msgstr ""
95
96-#: ../rssreader-app.qml:210
97-msgid "Saved"
98-msgstr ""
99-
100-#: ../rssreader-app.qml:244 ../feeds/AppendFeedPage.qml:14
101-#: ../feeds/ManageFeedsPage.qml:335
102+#: ../rssreader-app.qml:297 ../feeds/AppendFeedPage.qml:14
103 msgid "Add feeds"
104 msgstr ""
105
106-#: ../rssreader-app.qml:301
107+#: ../rssreader-app.qml:344
108 msgid "Checking for new articles"
109 msgstr ""
110
111-#: ../rssreader-app.qml:308 ../feeds/AppendFeedPage.qml:32
112-#: ../feeds/CreateTopicPage.qml:29 ../feeds/TopicManagement.qml:66
113+#: ../rssreader-app.qml:352 ../feeds/AppendFeedPage.qml:37
114+#: ../feeds/CreateTopicPage.qml:31 ../feeds/EditFeed.qml:24
115+#: ../feeds/TopicManagement.qml:77
116 msgid "Cancel"
117 msgstr ""
118
119-#: ../rssreader-app.qml:338
120+#: ../rssreader-app.qml:382
121 msgid "+ Add feeds"
122 msgstr ""
123
124-#: ../rssreader-app.qml:357
125+#: ../rssreader-app.qml:401
126 msgid "Add online accounts"
127 msgstr ""
128
129-#: ../rssreader-app.qml:364
130+#: ../rssreader-app.qml:408
131 msgid "Import subscriptions"
132 msgstr ""
133
134-#: ../rssreader-app.qml:380
135+#: ../rssreader-app.qml:424
136 msgid "Ok"
137 msgstr ""
138
139@@ -136,31 +165,31 @@
140 msgstr[0] ""
141 msgstr[1] ""
142
143-#: ../feeds/AppendFeedPage.qml:58
144+#: ../feeds/AppendFeedPage.qml:63
145 msgid "Next"
146 msgstr ""
147
148-#: ../feeds/AppendFeedPage.qml:109
149+#: ../feeds/AppendFeedPage.qml:115
150 msgid "Failed to perform a feed search by keyword"
151 msgstr ""
152
153-#: ../feeds/AppendFeedPage.qml:110 ../feeds/AppendFeedPage.qml:137
154+#: ../feeds/AppendFeedPage.qml:116 ../feeds/AppendFeedPage.qml:143
155 msgid "Search failed"
156 msgstr ""
157
158-#: ../feeds/AppendFeedPage.qml:136
159+#: ../feeds/AppendFeedPage.qml:142
160 msgid "Failed to perform a feed search by URL"
161 msgstr ""
162
163-#: ../feeds/AppendFeedPage.qml:173
164+#: ../feeds/AppendFeedPage.qml:179
165 msgid "Type a keyword or URL"
166 msgstr ""
167
168-#: ../feeds/AppendFeedPage.qml:200
169+#: ../feeds/AppendFeedPage.qml:231
170 msgid "Search results"
171 msgstr ""
172
173-#: ../feeds/AppendFeedPage.qml:242 ../feeds/CreateTopicPage.qml:157
174+#: ../feeds/AppendFeedPage.qml:273 ../feeds/CreateTopicPage.qml:165
175 msgid "No feeds"
176 msgstr ""
177
178@@ -168,28 +197,28 @@
179 msgid "Choose topic"
180 msgstr ""
181
182-#: ../feeds/ChooseTopicPage.qml:29
183+#: ../feeds/ChooseTopicPage.qml:34
184 msgid "Previous"
185 msgstr ""
186
187-#: ../feeds/ChooseTopicPage.qml:96
188+#: ../feeds/ChooseTopicPage.qml:104
189 msgid "Add your new feeds to a topic"
190 msgstr ""
191
192-#: ../feeds/ChooseTopicPage.qml:107
193+#: ../feeds/ChooseTopicPage.qml:115
194 msgid " + New topic"
195 msgstr ""
196
197-#: ../feeds/ChooseTopicPage.qml:123 ../feeds/CreateTopicPage.qml:60
198+#: ../feeds/ChooseTopicPage.qml:144 ../feeds/CreateTopicPage.qml:62
199 msgid "A topic with this name already exists"
200 msgstr ""
201
202-#: ../feeds/ChooseTopicPage.qml:124 ../feeds/ChooseTopicPage.qml:137
203-#: ../feeds/CreateTopicPage.qml:61
204+#: ../feeds/ChooseTopicPage.qml:145 ../feeds/ChooseTopicPage.qml:158
205+#: ../feeds/CreateTopicPage.qml:63
206 msgid "Warning"
207 msgstr ""
208
209-#: ../feeds/ChooseTopicPage.qml:136
210+#: ../feeds/ChooseTopicPage.qml:157
211 msgid "Topic name can't contain only whitespaces"
212 msgstr ""
213
214@@ -197,15 +226,15 @@
215 msgid "Create new topic"
216 msgstr ""
217
218-#: ../feeds/CreateTopicPage.qml:43
219+#: ../feeds/CreateTopicPage.qml:45 ../feeds/TopicManagement.qml:152
220 msgid "Add topic"
221 msgstr ""
222
223-#: ../feeds/CreateTopicPage.qml:108
224+#: ../feeds/CreateTopicPage.qml:111
225 msgid "Type topic name"
226 msgstr ""
227
228-#: ../feeds/CreateTopicPage.qml:120
229+#: ../feeds/CreateTopicPage.qml:128
230 msgid "Select feeds (optional)"
231 msgstr ""
232
233@@ -213,124 +242,30 @@
234 msgid "Edit Feed"
235 msgstr ""
236
237-#: ../feeds/EditFeed.qml:31
238+#: ../feeds/EditFeed.qml:36
239 msgid "Delete"
240 msgstr ""
241
242-#: ../feeds/EditFeed.qml:46
243-msgid "Apply"
244+#: ../feeds/EditFeed.qml:53
245+msgid "Done"
246 msgstr ""
247
248-#: ../feeds/EditFeed.qml:120
249+#: ../feeds/EditFeed.qml:130
250 msgid "Title: "
251 msgstr ""
252
253-#: ../feeds/EditFeed.qml:141
254+#: ../feeds/EditFeed.qml:153
255 msgid "URL: "
256 msgstr ""
257
258-#: ../feeds/EditFeed.qml:156
259+#: ../feeds/EditFeed.qml:171
260 msgid "Topic: "
261 msgstr ""
262
263-#: ../feeds/ManageFeedsPage.qml:13
264-msgid "Feeds"
265-msgstr ""
266-
267-#: ../feeds/ManageFeedsPage.qml:62 ../feeds/ManageFeedsPage.qml:172
268-#: ../listview/FeedListPage.qml:49
269-msgid "No topic"
270-msgstr ""
271-
272-#: ../feeds/ManageFeedsPage.qml:103 ../feeds/ManageTopicsPage.qml:12
273-msgid "Topics"
274-msgstr ""
275-
276-#: ../feeds/ManageFeedsPage.qml:132
277-msgid "Move to..."
278-msgstr ""
279-
280-#: ../feeds/ManageFeedsPage.qml:146
281-msgid "Deselect"
282-msgstr ""
283-
284-#: ../feeds/ManageFeedsPage.qml:242
285-msgid "Append feed"
286-msgstr ""
287-
288-#: ../feeds/ManageFeedsPage.qml:296
289-msgid "Use toolbar to append feeds"
290-msgstr ""
291-
292-#: ../feeds/ManageFeedsPage.qml:335
293-msgid "Edit feed"
294-msgstr ""
295-
296-#: ../feeds/ManageFeedsPage.qml:347
297-msgid "Type a new name here..."
298-msgstr ""
299-
300-#: ../feeds/ManageFeedsPage.qml:347
301-msgid "Type a URL here..."
302-msgstr ""
303-
304-#: ../feeds/ManageFeedsPage.qml:360
305-msgid "Show in inbox"
306-msgstr ""
307-
308-#: ../feeds/ManageFeedsPage.qml:389 ../feeds/ManageTopicsPage.qml:114
309-#: ../listview/FeedListPage.qml:155
310-msgid "Edit"
311-msgstr ""
312-
313-#: ../feeds/ManageFeedsPage.qml:404 ../listview/FeedListPage.qml:179
314-msgid "Remove"
315-msgstr ""
316-
317-#: ../feeds/ManageTopicsPage.qml:122
318-msgid "Delete with feeds"
319-msgstr ""
320-
321-#: ../feeds/ManageTopicsPage.qml:139
322-msgid "Use toolbar to append topics"
323-msgstr ""
324-
325-#: ../feeds/TopicManagement.qml:13
326-msgid "Management"
327-msgstr ""
328-
329-#: ../feeds/TopicManagement.qml:48
330+#: ../feeds/TopicManagement.qml:56
331 msgid "Add Feed"
332 msgstr ""
333
334-#: ../feeds/TopicManagement.qml:79
335+#: ../feeds/TopicManagement.qml:90
336 msgid "Confirm"
337 msgstr ""
338-
339-#: ../feeds/TopicManagement.qml:112
340-msgid "Add a Topic"
341-msgstr ""
342-
343-#: ../listview/ArticleListPage.qml:93
344-msgid "There are no articles in the selected feed"
345-msgstr ""
346-
347-#: ../listview/FeedListPage.qml:73
348-msgid "All articles"
349-msgstr ""
350-
351-#: ../listview/FeedListPage.qml:74
352-msgid "View news from all channels"
353-msgstr ""
354-
355-#: ../listview/FeedListPage.qml:140
356-msgid "Update"
357-msgstr ""
358-
359-#: ../listview/FeedListPage.qml:205
360-msgid "There are no RSS feeds to show"
361-msgstr ""
362-
363-#: ../listview/ListModePage.qml:220
364-msgid "There are no articles to show"
365-msgstr ""

Subscribers

People subscribed via source and target branches