ubuntu-touch-coreapps-reviewers team mailing list archive

[Nicholas Skaggs <nskaggs@xxxxxxxxxx>]

Nicholas Skaggs has proposed merging lp:~nskaggs/music-app/add-jenkins-info into lp:music-app.

Commit message:
Add jenkins info to readme

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Music App Developers (music-app-dev)

For more details, see:
https://code.launchpad.net/~nskaggs/music-app/add-jenkins-info/+merge/288155

Add jenkins info to readme
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~nskaggs/music-app/add-jenkins-info into lp:music-app.

=== modified file 'README-Mergeproposal.md'
--- README-Mergeproposal.md	2015-12-17 20:43:26 +0000
+++ README-Mergeproposal.md	2016-03-04 19:59:35 +0000
@@ -26,3 +26,6 @@
 The above checklist is more of a guideline to help music app trunk stay buildable,
 stable and up to date.
 
+Jenkins
+=======
+In addition to manual reviews, merge proposals are subject to being run in jenkins to ensure the application builds and any unit tests are successful. For more information on jenkins and how it works, see the [Core Apps Jenkins Wiki](https://wiki.ubuntu.com/Touch/CoreApps/Jenkins)
\ No newline at end of file

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2016-02-28 01:18:29 +0000
+++ po/com.ubuntu.music.pot	2016-03-04 19:59:35 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-27 19:11-0600\n"
+"POT-Creation-Date: 2016-02-22 16:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -287,7 +287,7 @@
 #: ../app/ui/SongsView.qml:291 ../app/ui/SongsView.qml:292
 #, qt-format
 msgid "%1 track"
-msgid_plural "%1 tracks"
+msgid_plural "%1 track"
 msgstr[0] ""
 msgstr[1] ""