Merge lp:~dpm/ubuntu-rssreader-app/enable-translations into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[David Planella]

Enable the translations infrastructure: expose translations in Launchpad and build/ship them in the Debian package.

NOTE: if you do a review, feel free to approve/disapprove in the comments, but do not top-approve yet, as this needs to be coordinated with the package name change in the seeds.

Enable the translations infrastructure: expose translations in Launchpad and build/ship them in the Debian package.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Joey Chan (qqworini)]

Oh no... Roman, didn't u read the "Description of the Change" ? David said "do not top-approve" because of some reasons

[David Planella (dpm)]

Yes, please read the comments on the next occasion.

We'll sort it out, it's all good, but we need to do some extra coordination to get this landed, as it changes the package name.

=== modified file '.bzrignore'
--- .bzrignore	2013-08-20 15:17:56 +0000
+++ .bzrignore	2013-09-26 09:05:34 +0000
@@ -5,4 +5,5 @@
 debian/*.debhelper.log
 debian/*.substvars
 RE:\.?[^.]+
-./ubuntu-rssreader-app.qmlproject
+.build
+po/Makefile
 
=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2013-09-26 09:05:34 +0000
@@ -0,0 +1,36 @@
+# Updating translations
+
+Translations for the Shorts app happen in [Launchpad Translations][] and
+are automatically committed daily on the trunk branch in the po/ folder.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+translatable messages to translators. So whenever you add new translatable
+messages in the code, make sure to follow these steps:
+
+ 1. Change directory to the po/ folder: `cd po`
+ 2. Update the translations template: `qmake && make pot`
+ 3. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
+ 4. Push the branch and send a merge proposal as usual
+
+And that's it, once the branch lands Launchpad should take care of all the rest!
+
+# Behind the scenes
+
+Behind the scenes, whenever the po/*.pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual po/*.po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations for core apps follow the standard [gettext format].
+
+ [Launchpad Translations]: https://translations.launchpad.net/ubuntu-rssreader-app
+ [gettext format]: https://www.gnu.org/software/gettext/
 
=== modified file 'dateutils.js'
--- dateutils.js	2013-09-04 15:34:28 +0000
+++ dateutils.js	2013-09-26 09:05:34 +0000
@@ -34,6 +34,8 @@
 function formatRelativeTime(i18n, date) {
     // fallback if none of the other formatters matched
     function defaultFallbackFormat(then) {
+        // 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
         return Qt.formatDateTime(then, i18n.tr("MMMM d"))
     }
 
@@ -50,6 +52,8 @@
         }
         this.format = function (now, then, diff) {
             return i18n.tr("Yesterday at %1").arg(
+                        /* 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 */
                         Qt.formatDateTime(then, i18n.tr("h:mm AP")))
         }
     }
@@ -60,6 +64,8 @@
             return diff < 7 * DAY_LIMIT
         }
         this.format = function (now, then, diff) {
+            // 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
             return Qt.formatDateTime(then, i18n.tr("ddd, h:mm AP"));
         }
     }
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-02-12 16:27:23 +0000
+++ debian/changelog	2013-09-26 09:05:34 +0000
@@ -1,3 +1,10 @@
+ubuntu-rssreader-app (0.2) saucy; urgency=low
+
+  * Added translations support, dropped ubuntu- prefix from desktop file 
+    and installation path
+
+ -- David Planella <[e-mail]>  Thu, 26 Sep 2013 09:29:27 +0200
+
 ubuntu-rssreader-app (0.1) raring; urgency=low
 
   * Initial release
 
=== modified file 'debian/control'
--- debian/control	2013-08-15 15:54:31 +0000
+++ debian/control	2013-09-26 09:05:34 +0000
@@ -1,30 +1,30 @@
 Source: ubuntu-rssreader-app
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-rssreader-app
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-rssreader-dev/ubuntu-rssreader-app/trunk
 
-Package: ubuntu-rssreader-app
-Section: misc
+Package: rssreader-app
 Architecture: all
-Depends: ${misc:Depends},
+Depends: libqt5webkit5-qmlwebkitplugin,
          qmlscene,
+         qtdeclarative5-localstorage-plugin,
+         qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-         qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-xmllistmodel-plugin,
-         libqt5webkit5-qmlwebkitplugin,
-         qtdeclarative5-localstorage-plugin,
+         ${misc:Depends}
 Description: RSS Reader application
  Core RSS Reader application
 
-Package: ubuntu-rssreader-app-autopilot
+Package: rssreader-app-autopilot
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
+         rssreader-app (= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
-         ubuntu-rssreader-app (= ${source:Version})
+         ${misc:Depends}
 Description: Autopilot tests for RSS reader Application
  This package contains the autopilot tests for the RSS reader
 
=== renamed file 'debian/ubuntu-rssreader-app-autopilot.install' => 'debian/rssreader-app-autopilot.install'
=== renamed file 'debian/ubuntu-rssreader-app.install' => 'debian/rssreader-app.install'
--- debian/ubuntu-rssreader-app.install	2013-08-10 09:29:03 +0000
+++ debian/rssreader-app.install	2013-09-26 09:05:34 +0000
@@ -1,9 +1,9 @@
-ubuntu-rssreader-app usr/bin/
-ubuntu-rssreader-app.desktop usr/share/applications/
-*.qml usr/share/ubuntu-rssreader-app/
-*.png usr/share/ubuntu-rssreader-app/
-*.js usr/share/ubuntu-rssreader-app/
-feeds usr/share/ubuntu-rssreader-app/
-listview usr/share/ubuntu-rssreader-app/
-article_items usr/share/ubuntu-rssreader-app/
-icons_tmp usr/share/ubuntu-rssreader-app/
 \ No newline at end of file
+*.js usr/share/rssreader-app/
+*.png usr/share/rssreader-app/
+*.qml usr/share/rssreader-app/
+article_items usr/share/rssreader-app/
+feeds usr/share/rssreader-app/
+icons_tmp usr/share/rssreader-app/
+listview usr/share/rssreader-app/
+rssreader-app usr/bin/
+rssreader-app.desktop usr/share/applications/
 
=== modified file 'debian/rules'
--- debian/rules	2013-04-11 21:21:44 +0000
+++ debian/rules	2013-09-26 09:05:34 +0000
@@ -9,3 +9,12 @@
 
 override_dh_install:
 	dh_install --fail-missing
+	appname=rssreader-app; \
+	for pofile in $(shell find ./po -name "*.po"); do \
+		pofilename="$${pofile##*/}"; \
+		langcode="$${pofilename%.*}"; \
+		localedir="debian/$$appname/usr/share/locale/$$langcode/LC_MESSAGES"; \
+		mkdir -p $$localedir; \
+		mofile="$$localedir/$$appname.mo"; \
+		msgfmt -o $$mofile $$pofile; \
+	done
 
=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2013-09-21 09:27:59 +0000
+++ feeds/AppendFeedPage.qml	2013-09-26 09:05:34 +0000
@@ -106,7 +106,7 @@
                 // No need to show dialog in case of abort.
                 if (result.responseStatus !== 0) {
                     PopupUtils.open(errorDialogComponent, appendFeedPage,
-                                    {"text" : i18n.tr("Failed to perform search feeds by keywords"),
+                                    {"text" : i18n.tr("Failed to perform a feed search by keyword"),
                                         "title" : i18n.tr("Search failed")})
                     console.log(JSON.stringify(result))
                 }
@@ -133,7 +133,7 @@
                 // No need to show dialog in case of abort.
                 if (result.responseStatus !== 0) {
                     PopupUtils.open(errorDialogComponent, appendFeedPage,
-                                    {"text" : i18n.tr("Failed to perform search feed by url"),
+                                    {"text" : i18n.tr("Failed to perform a feed search by URL"),
                                         "title" : i18n.tr("Search failed")})
                     console.log(JSON.stringify(result))
                 }
 
=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2013-09-11 15:18:51 +0000
+++ feeds/ChooseTopicPage.qml	2013-09-26 09:05:34 +0000
@@ -120,7 +120,7 @@
 
                         if (dbResult.error) {
                             PopupUtils.open(errorDialogComponent, chooseTopicPage,
-                                            {"text" : i18n.tr("Topic with such name already exists"),
+                                            {"text" : i18n.tr("A topic with this name already exists"),
                                                 "title" : i18n.tr("Warning")})
                             return
                         }
 
=== modified file 'feeds/CreateTopicPage.qml'
--- feeds/CreateTopicPage.qml	2013-08-19 19:38:53 +0000
+++ feeds/CreateTopicPage.qml	2013-09-26 09:05:34 +0000
@@ -57,7 +57,7 @@
                     var dbResult = DB.addTag(topicName)
                     if (dbResult.error) {
                         PopupUtils.open(errorDialogComponent, createTopicPage,
-                                        {"text" : i18n.tr("Topic with such name already exists"),
+                                        {"text" : i18n.tr("A topic with this name already exists"),
                                             "title" : i18n.tr("Warning")})
                         return
                     } else {
 
=== modified file 'feeds/ManageFeedsPage.qml'
--- feeds/ManageFeedsPage.qml	2013-08-29 12:04:41 +0000
+++ feeds/ManageFeedsPage.qml	2013-09-26 09:05:34 +0000
@@ -344,7 +344,7 @@
                     id: tfFeedUrl
                     anchors.horizontalCenter: parent.horizontalCenter
                     width: parent.width
-                    placeholderText: isForEdit? i18n.tr("Enter new name here...") : i18n.tr("Enter url here...")
+                    placeholderText: isForEdit? i18n.tr("Type a new name here...") : i18n.tr("Type a URL here...")
                 }
 
                 Item {
 
=== modified file 'listview/ArticleListPage.qml'
--- listview/ArticleListPage.qml	2013-08-06 20:45:50 +0000
+++ listview/ArticleListPage.qml	2013-09-26 09:05:34 +0000
@@ -90,7 +90,7 @@
     Label {
         id: lblEmptyBase
 
-        text: i18n.tr("There are no articles in selected feed")
+        text: i18n.tr("There are no articles in the selected feed")
         anchors.centerIn: parent
         visible: articleListModel.count == 0
         fontSize: "large"
 
=== modified file 'po/po.pro'
--- po/po.pro	2013-02-12 16:18:48 +0000
+++ po/po.pro	2013-09-26 09:05:34 +0000
@@ -1,48 +1,59 @@
+## This .pro file is used to create a Makefile with the necessary rules
+## to create an initial translations template and to update it whenever
+## there are new translatable strings in the project that are ready to be
+## exposed to translators
+##
+## See the ../README.translations file for more information
+
 TEMPLATE = subdirs
 
 PROJECTNAME = $$system(basename ../*.qmlproject)
 PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
 
-SOURCECODE = ../*.qml
+DESKTOPFILE = ../$${PROJECTNAME}.desktop
+
+SOURCECODE = ../*.qml \
+             ../*.js \
+             ../article_items/*.qml \
+             ../feeds/*.qml \
+             ../listview/*.qml
+
+BUILDDIR = ../.build
+DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
 
 message("")
 message(" Project Name: $$PROJECTNAME ")
 message(" Source Code: $$SOURCECODE ")
 message("")
-message(" run 'make pot' to generate the pot file from source code. ")
-message(" run 'make translate' to create a new translation (po) based on pot. ")
-message(" run 'make mo' to generate the mo files from po files. ")
-message(" run 'qmake; make install' to install the mo files. ")
+message(" Run 'make pot' to generate the pot file from source code. ")
 message("")
 
-## generate pot file 'make pot'
+## Generate pot file 'make pot'
 potfile.target = pot
-potfile.commands = xgettext -o $${PROJECTNAME}.pot --package-name $${PROJECTNAME} --qt --c++ --add-comments=TRANSLATORS --keyword=tr $${SOURCECODE}
+potfile.commands = xgettext \
+                   -o $${PROJECTNAME}.pot \
+                   --copyright=\"Canonical Ltd. \" \
+                   --package-name $${PROJECTNAME} \
+                   --qt --c++ --add-comments=TRANSLATORS \
+                   --keyword=tr --keyword=tr:1,2 \
+                   $${SOURCECODE} $${DESKTOPFILETEMP}
+potfile.depends = desktopfile
 QMAKE_EXTRA_TARGETS += potfile
 
-## poedit target for new translations 'make translate'
-poedit.target = translate
-poedit.commands = cp messages.pot new_language.po; poedit new_language.po
-QMAKE_EXTRA_TARGETS += poedit
-
-## generate mo files 'make mo'
-mofiles.target = mo
-mofiles.commands = msgfmt *.po
-QMAKE_EXTRA_TARGETS += mofiles
-
-## Installation steps for mo files. 'make install'
-MO_FILES = $$system(ls *.mo)
-
-install_mo_commands =
-for(mo_file, MO_FILES) {
-  mo_name = $$replace(mo_file,.mo,)
-  mo_targetpath = $(INSTALL_ROOT)/usr/share/locale/$${mo_name}/LC_MESSAGES
-  mo_target = $${mo_targetpath}/$${PROJECTNAME}.mo
-  !isEmpty(install_mo_commands): install_mo_commands += &&
-  install_mo_commands += test -d $$mo_targetpath || mkdir -p $$mo_targetpath
-  install_mo_commands += && cp $$mo_file $$mo_target
-}
-
-install.commands = $$install_mo_commands
-QMAKE_EXTRA_TARGETS += install
-
+## Do not use this rule directly. It's a dependency rule to
+## generate an intermediate .js file to extract translatable
+## strings from the .desktop file
+desktopfile.target = desktopfile
+desktopfile.commands = awk \'BEGIN { FS=\"=\" }; /Name/ {print \"var s = i18n.tr(\42\" \$$2 \"\42);\"}\' $${DESKTOPFILE} > $${DESKTOPFILETEMP}
+desktopfile.depends = makebuilddir
+QMAKE_EXTRA_TARGETS += desktopfile
+
+## Dependency rule to create the temporary build dir
+makebuilddir.target = makebuilddir
+makebuilddir.commands = mkdir -p $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += makebuilddir
+
+## Rule to clean the products of the build
+clean.target = clean
+clean.commands = rm -Rf $${BUILDDIR}
+QMAKE_EXTRA_TARGETS += clean
 
=== added file 'po/rssreader-app.pot'
--- po/rssreader-app.pot	1970-01-01 00:00:00 +0000
+++ po/rssreader-app.pot	2013-09-26 09:05:34 +0000
@@ -0,0 +1,336 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd. 
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: rssreader-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-26 09:12+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../RssFeedPage.qml:50
+msgid "Save"
+msgstr ""
+
+#: ../RssFeedPage.qml:50
+msgid "Unsave"
+msgstr ""
+
+#: ../RssFeedPage.qml:73 ../listview/FeedListPage.qml:170
+msgid "Open site"
+msgstr ""
+
+#: ../rssreader-app.qml:115
+msgid "Refresh"
+msgstr ""
+
+#: ../rssreader-app.qml:129
+msgid "Grid View"
+msgstr ""
+
+#: ../rssreader-app.qml:129
+msgid "List view"
+msgstr ""
+
+#: ../rssreader-app.qml:142
+msgid "Add reads"
+msgstr ""
+
+#: ../rssreader-app.qml:153
+msgid "Edit topics"
+msgstr ""
+
+#: ../rssreader-app.qml:185 ../.build/rssreader-app.desktop.js:1
+msgid "Shorts"
+msgstr ""
+
+#: ../rssreader-app.qml:210
+msgid "Saved"
+msgstr ""
+
+#: ../rssreader-app.qml:244 ../feeds/AppendFeedPage.qml:14
+#: ../feeds/ManageFeedsPage.qml:335
+msgid "Add feeds"
+msgstr ""
+
+#: ../rssreader-app.qml:301
+msgid "Checking for new articles"
+msgstr ""
+
+#: ../rssreader-app.qml:308 ../feeds/AppendFeedPage.qml:32
+#: ../feeds/CreateTopicPage.qml:29 ../feeds/TopicManagement.qml:66
+msgid "Cancel"
+msgstr ""
+
+#: ../rssreader-app.qml:338
+msgid "+ Add feeds"
+msgstr ""
+
+#: ../rssreader-app.qml:357
+msgid "Add online accounts"
+msgstr ""
+
+#: ../rssreader-app.qml:364
+msgid "Import subscriptions"
+msgstr ""
+
+#: ../rssreader-app.qml:380
+msgid "Ok"
+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
+msgid "MMMM d"
+msgstr ""
+
+#: ../dateutils.js:54
+#, qt-format
+msgid "Yesterday at %1"
+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:57
+msgid "h:mm AP"
+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:69
+msgid "ddd, h:mm AP"
+msgstr ""
+
+#: ../dateutils.js:76
+msgid "A few seconds ago..."
+msgstr ""
+
+#: ../dateutils.js:79
+#, qt-format
+msgid "%1 minute ago"
+msgid_plural "%1 minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../dateutils.js:83
+#, qt-format
+msgid "%1 hour ago"
+msgid_plural "%1 hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../dateutils.js:89
+#, qt-format
+msgid "%1 day ago"
+msgid_plural "%1 days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../feeds/AppendFeedPage.qml:58
+msgid "Next"
+msgstr ""
+
+#: ../feeds/AppendFeedPage.qml:109
+msgid "Failed to perform a feed search by keyword"
+msgstr ""
+
+#: ../feeds/AppendFeedPage.qml:110 ../feeds/AppendFeedPage.qml:137
+msgid "Search failed"
+msgstr ""
+
+#: ../feeds/AppendFeedPage.qml:136
+msgid "Failed to perform a feed search by URL"
+msgstr ""
+
+#: ../feeds/AppendFeedPage.qml:173
+msgid "Type a keyword or URL"
+msgstr ""
+
+#: ../feeds/AppendFeedPage.qml:200
+msgid "Search results"
+msgstr ""
+
+#: ../feeds/AppendFeedPage.qml:242 ../feeds/CreateTopicPage.qml:157
+msgid "No feeds"
+msgstr ""
+
+#: ../feeds/ChooseTopicPage.qml:13
+msgid "Choose topic"
+msgstr ""
+
+#: ../feeds/ChooseTopicPage.qml:29
+msgid "Previous"
+msgstr ""
+
+#: ../feeds/ChooseTopicPage.qml:96
+msgid "Add your new feeds to a topic"
+msgstr ""
+
+#: ../feeds/ChooseTopicPage.qml:107
+msgid " + New topic"
+msgstr ""
+
+#: ../feeds/ChooseTopicPage.qml:123 ../feeds/CreateTopicPage.qml:60
+msgid "A topic with this name already exists"
+msgstr ""
+
+#: ../feeds/ChooseTopicPage.qml:124 ../feeds/ChooseTopicPage.qml:137
+#: ../feeds/CreateTopicPage.qml:61
+msgid "Warning"
+msgstr ""
+
+#: ../feeds/ChooseTopicPage.qml:136
+msgid "Topic name can't contain only whitespaces"
+msgstr ""
+
+#: ../feeds/CreateTopicPage.qml:12
+msgid "Create new topic"
+msgstr ""
+
+#: ../feeds/CreateTopicPage.qml:43
+msgid "Add topic"
+msgstr ""
+
+#: ../feeds/CreateTopicPage.qml:108
+msgid "Type topic name"
+msgstr ""
+
+#: ../feeds/CreateTopicPage.qml:120
+msgid "Select feeds (optional)"
+msgstr ""
+
+#: ../feeds/EditFeed.qml:12
+msgid "Edit Feed"
+msgstr ""
+
+#: ../feeds/EditFeed.qml:31
+msgid "Delete"
+msgstr ""
+
+#: ../feeds/EditFeed.qml:46
+msgid "Apply"
+msgstr ""
+
+#: ../feeds/EditFeed.qml:120
+msgid "Title: "
+msgstr ""
+
+#: ../feeds/EditFeed.qml:141
+msgid "URL: "
+msgstr ""
+
+#: ../feeds/EditFeed.qml:156
+msgid "Topic: "
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:13
+msgid "Feeds"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:62 ../feeds/ManageFeedsPage.qml:172
+#: ../listview/FeedListPage.qml:49
+msgid "No topic"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:103 ../feeds/ManageTopicsPage.qml:12
+msgid "Topics"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:132
+msgid "Move to..."
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:146
+msgid "Deselect"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:242
+msgid "Append feed"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:296
+msgid "Use toolbar to append feeds"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:335
+msgid "Edit feed"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:347
+msgid "Type a new name here..."
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:347
+msgid "Type a URL here..."
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:360
+msgid "Show in inbox"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:389 ../feeds/ManageTopicsPage.qml:114
+#: ../listview/FeedListPage.qml:155
+msgid "Edit"
+msgstr ""
+
+#: ../feeds/ManageFeedsPage.qml:404 ../listview/FeedListPage.qml:179
+msgid "Remove"
+msgstr ""
+
+#: ../feeds/ManageTopicsPage.qml:122
+msgid "Delete with feeds"
+msgstr ""
+
+#: ../feeds/ManageTopicsPage.qml:139
+msgid "Use toolbar to append topics"
+msgstr ""
+
+#: ../feeds/TopicManagement.qml:13
+msgid "Management"
+msgstr ""
+
+#: ../feeds/TopicManagement.qml:48
+msgid "Add Feed"
+msgstr ""
+
+#: ../feeds/TopicManagement.qml:79
+msgid "Confirm"
+msgstr ""
+
+#: ../feeds/TopicManagement.qml:112
+msgid "Add a Topic"
+msgstr ""
+
+#: ../listview/ArticleListPage.qml:93
+msgid "There are no articles in the selected feed"
+msgstr ""
+
+#: ../listview/FeedListPage.qml:73
+msgid "All articles"
+msgstr ""
+
+#: ../listview/FeedListPage.qml:74
+msgid "View news from all channels"
+msgstr ""
+
+#: ../listview/FeedListPage.qml:140
+msgid "Update"
+msgstr ""
+
+#: ../listview/FeedListPage.qml:205
+msgid "There are no RSS feeds to show"
+msgstr ""
+
+#: ../listview/ListModePage.qml:220
+msgid "There are no articles to show"
+msgstr ""
 
=== renamed file 'ubuntu-rssreader-app' => 'rssreader-app'
--- ubuntu-rssreader-app	2013-04-11 21:21:44 +0000
+++ rssreader-app	2013-09-26 09:05:34 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-rssreader-app/ubuntu-rssreader-app.qml
+qmlscene /usr/share/rssreader-app/rssreader-app.qml
 
=== renamed file 'ubuntu-rssreader-app.desktop' => 'rssreader-app.desktop'
--- ubuntu-rssreader-app.desktop	2013-08-29 11:38:46 +0000
+++ rssreader-app.desktop	2013-09-26 09:05:34 +0000
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene /usr/share/ubuntu-rssreader-app/ubuntu-rssreader-app.qml
-Icon=/usr/share/ubuntu-rssreader-app/rssreader64.png
+Exec=qmlscene /usr/share/rssreader-app/rssreader-app.qml
+Icon=/usr/share/rssreader-app/rssreader64.png
 Name=Shorts
+Keywords=shorts;rss;reader
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
 
=== renamed file 'ubuntu-rssreader-app.qml' => 'rssreader-app.qml'
=== renamed file 'rssreader.qmlproject' => 'rssreader-app.qmlproject'
--- rssreader.qmlproject	2013-07-24 21:19:03 +0000
+++ rssreader-app.qmlproject	2013-09-26 09:05:34 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "ubuntu-rssreader-app.qml"
+    mainFile: "rssreader-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
@@ -15,6 +15,21 @@
     ImageFiles {
         directory: [".", "./icons_tmp"]
     }
+    /* Shows the desktop file in the project view */
+    Files {
+        filter: "*.desktop"
+    }
+    /* Shows the README files in the project view */
+    Files {
+        filter: "README*"
+    }
+    /* Shows the translation files and the .pro file used to generate the .pot template */
+    Files {
+        filter: "*.po*"
+    }
+    Files {
+        filter: "*.pro"
+    }
     /* List of plugin directories passed to QML runtime */
     importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml", "/usr/lib/i386-linux-gnu/qt5/qml/" ]
 }
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-09-06 01:46:41 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-09-26 09:05:34 +0000
@@ -43,7 +43,7 @@
     else:
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
-    local_location = "../../ubuntu-rssreader-app.qml"
+    local_location = "../../rssreader-app.qml"
     sqlite_dir = os.path.expanduser(
         "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
     backup_dir = sqlite_dir + ".backup"
@@ -75,9 +75,9 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/ubuntu-rssreader-app/ubuntu-rssreader-app.qml",
+            "/usr/share/rssreader-app/rssreader-app.qml",
             "--desktop_file_hint=/usr/share/applications/"
-            "ubuntu-rssreader-app.desktop",
+            "rssreader-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)