ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

[Merge] lp:~qqworini/ubuntu-rssreader-app/new-icon into lp:ubuntu-rssreader-app

To: mp+260149@xxxxxxxxxxxxxxxxxx, Ubuntu Phone Apps Jenkins Bot <ubuntu.phone.apps.jenkins.bot@xxxxxxxxx>, Roman Shchekin <mrqtros@xxxxxxxxx>
From: Joey Chan <qqworini@xxxxxxxxx>
Date: Tue, 26 May 2015 13:10:38 -0000
In-reply-to: <20150526130932.1761.24217.launchpad@ackee.canonical.com>
Reply-to: mp+260149@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Joey Chan has proposed merging lp:~qqworini/ubuntu-rssreader-app/new-icon into lp:ubuntu-rssreader-app.

Commit message:
update to new icon

Requested reviews:
  Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot): continuous-integration
  Roman Shchekin (mrqtros)
Related bugs:
  Bug #1457424 in Ubuntu RSS Feed Reader App: "Please update icon (May 2015)"
  https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1457424

For more details, see:
https://code.launchpad.net/~qqworini/ubuntu-rssreader-app/new-icon/+merge/260149

update to new icon
-- 
Your team Ubuntu RSS Feed Reader Developers is subscribed to branch lp:ubuntu-rssreader-app.

=== 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 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-26 17:02+0100\n"
+"POT-Creation-Date: 2015-05-22 10:47+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -18,55 +18,51 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../ArticleViewItem.qml:120
+#: ../ArticleViewItem.qml:121
 msgid "Select article"
 msgstr ""
 
-#: ../ReadingOptions.qml:44
+#: ../ArticleViewPage.qml:42
+msgid "Save"
+msgstr ""
+
+#: ../ArticleViewPage.qml:42 ../feeds/SwipeDelete.qml:57
+#: ../feeds/SwipeDelete.qml:76
+msgid "Remove"
+msgstr ""
+
+#: ../ArticleViewPage.qml:58
+msgid "Options"
+msgstr ""
+
+#: ../ArticleViewPage.qml:66
+msgid "Open site"
+msgstr ""
+
+#: ../BaseTab.qml:152
+msgid "There are no articles to show"
+msgstr ""
+
+#: ../ReadingOptions.qml:42
 msgid "Dark"
 msgstr ""
 
-#: ../ReadingOptions.qml:54
+#: ../ReadingOptions.qml:52
 msgid "Light"
 msgstr ""
 
+#: ../ReadingOptions.qml:109
+msgid "Small"
+msgstr ""
+
 #: ../ReadingOptions.qml:111
-msgid "Small"
-msgstr ""
-
-#: ../ReadingOptions.qml:113
 msgid "Mid"
 msgstr ""
 
-#: ../ReadingOptions.qml:114
+#: ../ReadingOptions.qml:112
 msgid "Large"
 msgstr ""
 
-#: ../RssFeedPage.qml:48
-msgid "Options"
-msgstr ""
-
-#: ../RssFeedPage.qml:56
-msgid "Save"
-msgstr ""
-
-#: ../RssFeedPage.qml:56 ../feeds/SwipeDelete.qml:57
-#: ../feeds/SwipeDelete.qml:76
-msgid "Remove"
-msgstr ""
-
-#: ../RssFeedPage.qml:72
-msgid "Open site"
-msgstr ""
-
-#: ../SavedTab.qml:190
-msgid "You have no saved articles"
-msgstr ""
-
-#: ../ShortsTab.qml:184 ../TopicTab.qml:136
-msgid "There are no articles to show"
-msgstr ""
-
 #. TRANSLATORS: this is a time formatting string,
 #. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
 #: ../dateutils.js:39
@@ -115,7 +111,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../feeds/AppendFeedPage.qml:30 ../shorts-app.qml:249 ../shorts-app.qml:441
+#: ../feeds/AppendFeedPage.qml:30 ../shorts-app.qml:238 ../shorts-app.qml:398
 msgid "Add feeds"
 msgstr ""
 
@@ -123,33 +119,32 @@
 msgid "Failed to perform a feed search by keyword"
 msgstr ""
 
-#: ../feeds/AppendFeedPage.qml:69 ../feeds/AppendFeedPage.qml:96
+#: ../feeds/AppendFeedPage.qml:69 ../feeds/AppendFeedPage.qml:100
 msgid "Search failed"
 msgstr ""
 
-#: ../feeds/AppendFeedPage.qml:95
+#: ../feeds/AppendFeedPage.qml:99
 msgid "Failed to perform a feed search by URL"
 msgstr ""
 
-#: ../feeds/AppendFeedPage.qml:132
+#: ../feeds/AppendFeedPage.qml:136
 msgid "Type a keyword or URL"
 msgstr ""
 
-#: ../feeds/AppendFeedPage.qml:184
+#: ../feeds/AppendFeedPage.qml:188
 msgid "Search results"
 msgstr ""
 
-#: ../feeds/AppendFeedPage.qml:242 ../feeds/CreateTopicPage.qml:38
-#: ../feeds/EditFeed.qml:24 ../feeds/TopicManagement.qml:64
-#: ../shorts-app.qml:500
+#: ../feeds/AppendFeedPage.qml:246 ../feeds/CreateTopicPage.qml:38
+#: ../feeds/TopicManagement.qml:64 ../shorts-app.qml:477
 msgid "Cancel"
 msgstr ""
 
-#: ../feeds/AppendFeedPage.qml:275
+#: ../feeds/AppendFeedPage.qml:279
 msgid "Next"
 msgstr ""
 
-#: ../feeds/AppendFeedPage.qml:304 ../feeds/CreateTopicPage.qml:183
+#: ../feeds/AppendFeedPage.qml:308 ../feeds/CreateTopicPage.qml:183
 msgid "No feeds"
 msgstr ""
 
@@ -194,31 +189,27 @@
 msgid "Select feeds (optional)"
 msgstr ""
 
-#: ../feeds/EditFeed.qml:12
+#: ../feeds/EditFeedPage.qml:12
 msgid "Edit Feed"
 msgstr ""
 
-#: ../feeds/EditFeed.qml:36
-msgid "Delete"
-msgstr ""
-
-#: ../feeds/EditFeed.qml:53
+#: ../feeds/EditFeedPage.qml:20
 msgid "Done"
 msgstr ""
 
-#: ../feeds/EditFeed.qml:131
+#: ../feeds/EditFeedPage.qml:93
 msgid "Title: "
 msgstr ""
 
-#: ../feeds/EditFeed.qml:154
+#: ../feeds/EditFeedPage.qml:116
 msgid "URL: "
 msgstr ""
 
-#: ../feeds/EditFeed.qml:172
+#: ../feeds/EditFeedPage.qml:134
 msgid "Topic: "
 msgstr ""
 
-#: ../feeds/TopicManagement.qml:13 ../shorts-app.qml:263
+#: ../feeds/TopicManagement.qml:13 ../shorts-app.qml:252
 msgid "Edit topics"
 msgstr ""
 
@@ -230,63 +221,63 @@
 msgid "Add Feed"
 msgstr ""
 
-#: ../shorts-app.qml:198
+#: ../shorts-app.qml:205
 msgid "Refresh"
 msgstr ""
 
-#: ../shorts-app.qml:210
+#: ../shorts-app.qml:212
 msgid "Grid View"
 msgstr ""
 
-#: ../shorts-app.qml:210
+#: ../shorts-app.qml:212
 msgid "List view"
 msgstr ""
 
-#: ../shorts-app.qml:368
+#: ../shorts-app.qml:329
 msgid "Saved"
 msgstr ""
 
-#: ../shorts-app.qml:376 com.ubuntu.shorts_shorts.desktop.in.in.h:1
+#: ../shorts-app.qml:337 com.ubuntu.shorts_shorts.desktop.in.in.h:1
 msgid "Shorts"
 msgstr ""
 
-#: ../shorts-app.qml:492
+#: ../shorts-app.qml:469
 msgid "Checking for new articles"
 msgstr ""
 
-#: ../shorts-app.qml:516
+#: ../shorts-app.qml:493
 msgid "Perhaps some of the channels have not been updated."
 msgstr ""
 
-#: ../shorts-app.qml:517
+#: ../shorts-app.qml:494
 msgid "Errors occurred during the update"
 msgstr ""
 
-#: ../shorts-app.qml:535
+#: ../shorts-app.qml:512
 msgid "+ Add feeds"
 msgstr ""
 
-#: ../shorts-app.qml:555
+#: ../shorts-app.qml:532
 msgid "Add online accounts"
 msgstr ""
 
-#: ../shorts-app.qml:558
+#: ../shorts-app.qml:535
 msgid "Online accounts are not available for now"
 msgstr ""
 
-#: ../shorts-app.qml:559 ../shorts-app.qml:568
+#: ../shorts-app.qml:536 ../shorts-app.qml:545
 msgid "We are sorry"
 msgstr ""
 
-#: ../shorts-app.qml:564
+#: ../shorts-app.qml:541
 msgid "Import subscriptions"
 msgstr ""
 
-#: ../shorts-app.qml:567
+#: ../shorts-app.qml:544
 msgid "Importing subscriptions is not available for now"
 msgstr ""
 
-#: ../shorts-app.qml:582
+#: ../shorts-app.qml:559
 msgid "Ok"
 msgstr ""
 

=== modified file 'rssreader-app@xxxxxx' (properties changed: -x to +x)
Binary files rssreader-app@xxxxxx	2014-02-18 21:22:34 +0000 and rssreader-app@xxxxxx	2015-05-26 13:09:25 +0000 differ

References

[Merge] lp:~qqworini/ubuntu-rssreader-app/new-icon into lp:ubuntu-rssreader-app
From: Joey Chan, 2015-05-26