Merge lp:~vthompson/music-app/add-translator-notes into lp:music-app/remix

[Victor Thompson]

* Add notes to translators concerning string lengths.

* Add notes to translators concerning string lengths.

[lp:~vthompson/music-app/add-translator-notes]

817. By Victor Thompson on 2015-01-28

remove newline

818. By Victor Thompson on 2015-01-28

remove newline

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

PASSED: Continuous integration, rev:818
http://91.189.93.70:8080/job/music-app-ci/1265/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/844
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/117

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1265/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

[David Planella (dpm)]

Looks good to me too, good work, translators will be happy :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2015-01-26 03:20:37 +0000
+++ MusicNowPlaying.qml	2015-01-28 02:32:37 +0000
@@ -32,10 +32,14 @@
     id: nowPlaying
     flickable: isListView ? queueListLoader.item : null  // Ensures that the header is shown in fullview
     objectName: "nowPlayingPage"
-    title: isListView ? i18n.tr("Queue") : i18n.tr("Now playing")
+    title: isListView ? queueTitle : nowPlayingTitle
     visible: false
 
     property bool isListView: false
+    // TRANSLATORS: this appears in the header with limited space (around 20 characters)
+    property string nowPlayingTitle: i18n.tr("Now playing") 
+    // TRANSLATORS: this appears in the header with limited space (around 20 characters)
+    property string queueTitle: i18n.tr("Queue") 
 
     onIsListViewChanged: {
         if (isListView) {  // When changing to the queue positionAt the currentIndex
@@ -87,6 +91,7 @@
                 Action {
                     enabled: trackQueue.model.count > 0
                     iconName: "add-to-playlist"
+                    // TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
                     text: i18n.tr("Add to playlist")
                     onTriggered: {
                         var items = []
@@ -107,6 +112,7 @@
                     enabled: trackQueue.model.count > 0
                     iconName: "delete"
                     objectName: "clearQueue"
+                    // TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
                     text: i18n.tr("Clear queue")
                     onTriggered: {
                         pageStack.pop()
 
=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2015-01-25 16:44:49 +0000
+++ MusicaddtoPlaylist.qml	2015-01-28 02:32:37 +0000
@@ -39,6 +39,7 @@
 MusicPage {
     id: addToPlaylistPage
     objectName: "addToPlaylistPage"
+    // TRANSLATORS: this appears in the header with limited space (around 20 characters)
     title: i18n.tr("Select playlist")
     searchable: true
     searchResultsCount: addToPlaylistModelFilter.count
 
=== modified file 'common/AlbumsPage.qml'
--- common/AlbumsPage.qml	2015-01-17 12:44:57 +0000
+++ common/AlbumsPage.qml	2015-01-28 02:32:37 +0000
@@ -60,6 +60,7 @@
                             centerIn: parent
                         }
                         color: "white"
+                        // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Shuffle")
                     }
                     onClicked: shuffleModel(songArtistModel)
@@ -74,6 +75,7 @@
                             centerIn: parent
                         }
                         color: "white"
+                        // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Queue all")
                     }
                     onClicked: addQueueFromModel(songArtistModel)
@@ -82,6 +84,7 @@
                     id: playRow
                     color: UbuntuColors.green
                     height: units.gu(4)
+                    // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                     text: i18n.tr("Play all")
                     width: units.gu(15)
                     onClicked: trackClicked(songArtistModel, 0, true)
 
=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2015-01-26 03:20:37 +0000
+++ common/SongsPage.qml	2015-01-28 02:32:37 +0000
@@ -308,6 +308,7 @@
                             centerIn: parent
                         }
                         color: "white"
+                        // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Shuffle")
                     }
                     onClicked: {
@@ -334,6 +335,7 @@
                             centerIn: parent
                         }
                         color: "white"
+                        // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Queue all")
                     }
                     onClicked: addQueueFromModel(albumtrackslist.model)
@@ -342,6 +344,7 @@
                     id: playRow
                     color: UbuntuColors.green
                     height: units.gu(4)
+                    // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                     text: i18n.tr("Play all")
                     width: units.gu(15)
                     onClicked: {
 
=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2015-01-21 01:16:38 +0000
+++ po/com.ubuntu.music.pot	2015-01-28 02:32:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-21 01:16+0000\n"
+"POT-Creation-Date: 2015-01-27 20:23-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -22,18 +22,18 @@
 msgid "Albums"
 msgstr ""
 
-#: ../MusicAlbums.qml:69 ../MusicStart.qml:78 ../common/AlbumsPage.qml:148
-#: ../common/AlbumsPage.qml:162 ../common/SongsPage.qml:373
+#: ../MusicAlbums.qml:69 ../MusicStart.qml:78 ../common/AlbumsPage.qml:152
+#: ../common/AlbumsPage.qml:166 ../common/SongsPage.qml:380
 msgid "Unknown Album"
 msgstr ""
 
 #: ../MusicAlbums.qml:70 ../MusicArtists.qml:77 ../MusicStart.qml:79
-#: ../common/AlbumsPage.qml:104 ../common/AlbumsPage.qml:161
-#: ../common/SongsPage.qml:394
+#: ../common/AlbumsPage.qml:108 ../common/AlbumsPage.qml:165
+#: ../common/SongsPage.qml:401
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../MusicAlbums.qml:81 ../MusicStart.qml:95 ../common/AlbumsPage.qml:160
+#: ../MusicAlbums.qml:81 ../MusicStart.qml:95 ../common/AlbumsPage.qml:164
 msgid "Album"
 msgstr ""
 
@@ -49,56 +49,60 @@
 msgid "Genres"
 msgstr ""
 
-#: ../MusicGenres.qml:108 ../MusicGenres.qml:110 ../common/SongsPage.qml:312
-#: ../common/SongsPage.qml:346 ../common/SongsPage.qml:360
-#: ../common/SongsPage.qml:396 ../common/SongsPage.qml:415
-#: ../common/SongsPage.qml:447
+#: ../MusicGenres.qml:108 ../MusicGenres.qml:110 ../common/SongsPage.qml:317
+#: ../common/SongsPage.qml:353 ../common/SongsPage.qml:367
+#: ../common/SongsPage.qml:403 ../common/SongsPage.qml:422
+#: ../common/SongsPage.qml:454
 msgid "Genre"
 msgstr ""
 
-#: ../MusicNowPlaying.qml:35 ../music-app.qml:668 ../music-app.qml:700
-#: ../music-app.qml:1059 ../music-app.qml:1262 ../music-app.qml:1274
-#: ../music-app.qml:1302
+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
+#: ../MusicNowPlaying.qml:40 ../music-app.qml:672 ../music-app.qml:1050
+#: ../music-app.qml:1253 ../music-app.qml:1294
+msgid "Now playing"
+msgstr ""
+
+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
+#: ../MusicNowPlaying.qml:42 ../music-app.qml:672 ../music-app.qml:704
+#: ../music-app.qml:1051 ../music-app.qml:1254 ../music-app.qml:1266
+#: ../music-app.qml:1294
 msgid "Queue"
 msgstr ""
 
-#: ../MusicNowPlaying.qml:35 ../music-app.qml:668 ../music-app.qml:1058
-#: ../music-app.qml:1261 ../music-app.qml:1302
-msgid "Now playing"
-msgstr ""
-
-#: ../MusicNowPlaying.qml:90 ../MusicNowPlaying.qml:150 ../MusicTracks.qml:74
+#. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
+#: ../MusicNowPlaying.qml:96 ../MusicNowPlaying.qml:157 ../MusicTracks.qml:74
 #: ../common/ListItemActions/AddToPlaylist.qml:26 ../common/SongsPage.qml:169
 msgid "Add to playlist"
 msgstr ""
 
-#: ../MusicNowPlaying.qml:110
+#. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
+#: ../MusicNowPlaying.qml:117
 msgid "Clear queue"
 msgstr ""
 
-#: ../MusicNowPlaying.qml:128 ../MusicTracks.qml:51
+#: ../MusicNowPlaying.qml:135 ../MusicTracks.qml:51
 #: ../common/SongsPage.qml:147
 msgid "Cancel selection"
 msgstr ""
 
-#: ../MusicNowPlaying.qml:137 ../MusicTracks.qml:62
+#: ../MusicNowPlaying.qml:144 ../MusicTracks.qml:62
 #: ../common/SongsPage.qml:157
 msgid "Select All"
 msgstr ""
 
-#: ../MusicNowPlaying.qml:173 ../common/SongsPage.qml:204
+#: ../MusicNowPlaying.qml:180 ../common/SongsPage.qml:208
 msgid "Delete"
 msgstr ""
 
 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
 #. Remember to keep the translation short to fit the screen width
-#: ../MusicPlaylists.qml:35 ../MusicaddtoPlaylist.qml:115
+#: ../MusicPlaylists.qml:35 ../MusicaddtoPlaylist.qml:112
 #: ../common/SongsPage.qml:85
 msgid "Playlists"
 msgstr ""
 
-#: ../MusicPlaylists.qml:97 ../MusicaddtoPlaylist.qml:105
-#: ../common/SongsPage.qml:416 ../common/SongsPage.qml:417
+#: ../MusicPlaylists.qml:97 ../MusicaddtoPlaylist.qml:106
+#: ../common/SongsPage.qml:423 ../common/SongsPage.qml:424
 #, qt-format
 msgid "%1 song"
 msgid_plural "%1 songs"
@@ -107,14 +111,14 @@
 
 #: ../MusicPlaylists.qml:110 ../MusicPlaylists.qml:111 ../MusicStart.qml:79
 #: ../MusicStart.qml:95 ../common/SongsPage.qml:64 ../common/SongsPage.qml:105
-#: ../common/SongsPage.qml:205 ../common/SongsPage.qml:314
-#: ../common/SongsPage.qml:348 ../common/SongsPage.qml:359
-#: ../common/SongsPage.qml:395 ../common/SongsPage.qml:431
-#: ../common/SongsPage.qml:434 ../common/SongsPage.qml:449
+#: ../common/SongsPage.qml:209 ../common/SongsPage.qml:319
+#: ../common/SongsPage.qml:355 ../common/SongsPage.qml:366
+#: ../common/SongsPage.qml:402 ../common/SongsPage.qml:438
+#: ../common/SongsPage.qml:441 ../common/SongsPage.qml:456
 msgid "Playlist"
 msgstr ""
 
-#: ../MusicStart.qml:34 ../MusicaddtoPlaylist.qml:123
+#: ../MusicStart.qml:34 ../MusicaddtoPlaylist.qml:120
 #: ../common/SongsPage.qml:95
 msgid "Recent"
 msgstr ""
@@ -131,23 +135,27 @@
 msgid "Add to queue"
 msgstr ""
 
-#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1414
+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
+#: ../MusicaddtoPlaylist.qml:43 ../music-app.qml:1406
 msgid "Select playlist"
 msgstr ""
 
-#: ../common/AlbumsPage.qml:63 ../common/SongsPage.qml:307
+#. TRANSLATORS: this appears in a button with limited space (around 14 characters)
+#: ../common/AlbumsPage.qml:65 ../common/SongsPage.qml:312
 msgid "Shuffle"
 msgstr ""
 
-#: ../common/AlbumsPage.qml:77 ../common/SongsPage.qml:333
+#. TRANSLATORS: this appears in a button with limited space (around 14 characters)
+#: ../common/AlbumsPage.qml:80 ../common/SongsPage.qml:339
 msgid "Queue all"
 msgstr ""
 
-#: ../common/AlbumsPage.qml:85 ../common/SongsPage.qml:341
+#. TRANSLATORS: this appears in a button with limited space (around 14 characters)
+#: ../common/AlbumsPage.qml:89 ../common/SongsPage.qml:348
 msgid "Play all"
 msgstr ""
 
-#: ../common/AlbumsPage.qml:123
+#: ../common/AlbumsPage.qml:127
 #, qt-format
 msgid "%1 album"
 msgid_plural "%1 albums"
@@ -158,7 +166,7 @@
 msgid "Add to Queue"
 msgstr ""
 
-#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:586
+#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:593
 msgid "Remove"
 msgstr ""
 
@@ -175,73 +183,73 @@
 msgstr ""
 
 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
-#: ../common/SongsPage.qml:521
+#: ../common/SongsPage.qml:528
 msgid "Rename playlist"
 msgstr ""
 
-#: ../common/SongsPage.qml:528 ../music-app.qml:1012
+#: ../common/SongsPage.qml:535 ../music-app.qml:1004
 msgid "Enter playlist name"
 msgstr ""
 
-#: ../common/SongsPage.qml:537
+#: ../common/SongsPage.qml:544
 msgid "Change"
 msgstr ""
 
-#: ../common/SongsPage.qml:558 ../music-app.qml:1038
+#: ../common/SongsPage.qml:565 ../music-app.qml:1030
 msgid "Playlist already exists"
 msgstr ""
 
-#: ../common/SongsPage.qml:562 ../music-app.qml:1043
+#: ../common/SongsPage.qml:569 ../music-app.qml:1035
 msgid "Please type in a name."
 msgstr ""
 
-#: ../common/SongsPage.qml:567 ../common/SongsPage.qml:605
-#: ../music-app.qml:485 ../music-app.qml:1049
+#: ../common/SongsPage.qml:574 ../common/SongsPage.qml:612
+#: ../music-app.qml:488 ../music-app.qml:1041
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
-#: ../common/SongsPage.qml:580
+#: ../common/SongsPage.qml:587
 msgid "Permanently delete playlist?"
 msgstr ""
 
-#: ../common/SongsPage.qml:581
+#: ../common/SongsPage.qml:588
 msgid "This cannot be undone"
 msgstr ""
 
-#: ../common/Walkthrough/Slide1.qml:56
+#: ../common/Walkthrough/Slide1.qml:57
 msgid "Welcome to Music"
 msgstr ""
 
-#: ../common/Walkthrough/Slide1.qml:68
+#: ../common/Walkthrough/Slide1.qml:70
 msgid ""
 "Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how "
 "to get started or press skip to start listening now."
 msgstr ""
 
-#: ../common/Walkthrough/Slide2.qml:51
+#: ../common/Walkthrough/Slide2.qml:52
 msgid "Import your music"
 msgstr ""
 
-#: ../common/Walkthrough/Slide2.qml:62 ../music-app.qml:1399
+#: ../common/Walkthrough/Slide2.qml:64 ../music-app.qml:1391
 msgid ""
 "Connect your device to any computer and simply drag files to the Music "
 "folder or insert removable media with music."
 msgstr ""
 
-#: ../common/Walkthrough/Slide3.qml:51
+#: ../common/Walkthrough/Slide3.qml:52
 msgid "Download new music"
 msgstr ""
 
-#: ../common/Walkthrough/Slide3.qml:62
+#: ../common/Walkthrough/Slide3.qml:64
 msgid "Directly import music bought while browsing online."
 msgstr ""
 
-#: ../common/Walkthrough/Slide3.qml:76
+#: ../common/Walkthrough/Slide3.qml:78
 msgid "Start"
 msgstr ""
 
-#: ../common/Walkthrough/Walkthrough.qml:82
+#: ../common/Walkthrough/Walkthrough.qml:85
 msgid "Skip"
 msgstr ""
 
@@ -294,71 +302,71 @@
 msgstr ""
 
 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
-#: ../music-app.qml:328
+#: ../music-app.qml:331
 msgid "Filepath must start with"
 msgstr ""
 
 #. TRANSLATORS: This string represents that a blank filepath destination has been used
-#: ../music-app.qml:354
+#: ../music-app.qml:357
 msgid "Filepath must be a file"
 msgstr ""
 
 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
-#: ../music-app.qml:360
+#: ../music-app.qml:363
 msgid "Failed to move file"
 msgstr ""
 
-#: ../music-app.qml:439
+#: ../music-app.qml:442
 msgid "Waiting for file(s)..."
 msgstr ""
 
-#: ../music-app.qml:458
+#: ../music-app.qml:461
 msgid "OK"
 msgstr ""
 
-#: ../music-app.qml:471
+#: ../music-app.qml:474
 msgid "Imported file not found"
 msgstr ""
 
-#: ../music-app.qml:475
+#: ../music-app.qml:478
 msgid "Wait"
 msgstr ""
 
 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
-#: ../music-app.qml:496
+#: ../music-app.qml:499
 msgid "songs played today"
 msgstr ""
 
-#: ../music-app.qml:497
+#: ../music-app.qml:500
 msgid "No songs played today"
 msgstr ""
 
-#: ../music-app.qml:590 ../music-app.qml:1298
+#: ../music-app.qml:593 ../music-app.qml:1290
 #: com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
 
-#: ../music-app.qml:609
+#: ../music-app.qml:612
 msgid "Debug: "
 msgstr ""
 
-#: ../music-app.qml:1008
+#: ../music-app.qml:1000
 msgid "New playlist"
 msgstr ""
 
-#: ../music-app.qml:1022
+#: ../music-app.qml:1014
 msgid "Create"
 msgstr ""
 
-#: ../music-app.qml:1388
+#: ../music-app.qml:1380
 msgid "No music found"
 msgstr ""
 
-#: ../music-app.qml:1427
+#: ../music-app.qml:1419
 msgid "No playlists found"
 msgstr ""
 
-#: ../music-app.qml:1438
+#: ../music-app.qml:1430
 #, qt-format
 msgid ""
 "Get more out of Music by tapping the %1 icon to start making playlists for "