ubuntu-touch-coreapps-reviewers team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/help-app/grooveshark-remove into lp:help-app.

Commit message:
Remove traces of grooveshark.

Requested reviews:
  Ubuntu Help app developers (help-app-dev)

For more details, see:
https://code.launchpad.net/~dholbach/help-app/grooveshark-remove/+merge/259632

Remove traces of grooveshark.
-- 
Your team Ubuntu Help app developers is requested to review the proposed merge of lp:~dholbach/help-app/grooveshark-remove into lp:help-app.

=== modified file 'content/pages/apps.md'
--- content/pages/apps.md	2015-03-30 14:18:49 +0000
+++ content/pages/apps.md	2015-05-20 14:40:59 +0000
@@ -28,7 +28,7 @@
 ## Music
 
 ### How do I add music to my device? !!QA
-You can add music in multiple ways. If you have pre-existing music files, simply connect your phone to your pc via the usb cable. Next, copy the music you wish to listen to to the *Music* folder. Your music will appear in the music app. Alternatively, you can acquire music directly using the device via a scope, such as grooveshark or by downloading via the browser or another application.
+You can add music in multiple ways. If you have pre-existing music files, simply connect your phone to your pc via the usb cable. Next, copy the music you wish to listen to to the *Music* folder. Your music will appear in the music app. Alternatively, you can acquire music directly using the device via a scope, such as 7digital or by downloading via the browser or another application.
 
 ### What music formats are supported? !!QA
 The music app supports OGG, FLAG and MP3 formats.

=== modified file 'content/pages/basic.md'
--- content/pages/basic.md	2015-03-30 14:18:49 +0000
+++ content/pages/basic.md	2015-05-20 14:40:59 +0000
@@ -5,7 +5,7 @@
 [TOC]
 
 ### How do I play music? !!QA
-The music app let's you play music copied to the device. In addition, [scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play music.
+The music app let's you play music copied to the device. In addition, [scopes]({filename}scopes.md) such as 7digital can also play music.
 
 ### How do I play videos? !!QA
 The media player application will play videos copied to the device. You will also find applications like youtube that give you streaming options.

=== modified file 'po/de.po'
--- po/de.po	2015-04-30 05:34:15 +0000
+++ po/de.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -11,12 +11,12 @@
 "PO-Revision-Date: 2015-04-29 11:36+0000\n"
 "Last-Translator: Phillip Sz <Unknown>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17453)\n"
 "X-Launchpad-Export-Date: 2015-04-30 05:34+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
-"Language: \n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -30,9 +30,9 @@
 msgstr "*Fragst Du Dich, wie Du das Telefon sicherer machen kannst?*\n"
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr ""
 
@@ -50,9 +50,9 @@
 "find this setting under the *System Settings* application. Select *Security "
 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
 msgstr ""
-"Durch Drücken der Power-Taste sperren Sie das Telefon. Darüber hinaus können "
-"Sie festlegen, wie lange Ihr Telefon entsperrt bleibt, wenn es inaktiv ist. "
-"Sie können diese Einstellung unter der Anwendung  *Systemeinstellungen* "
+"Durch Drücken der Power-Taste sperren Sie das Telefon. Darüber hinaus können"
+" Sie festlegen, wie lange Ihr Telefon entsperrt bleibt, wenn es inaktiv ist."
+" Sie können diese Einstellung unter der Anwendung  *Systemeinstellungen* "
 "finden. Wählen Sie *Sicherheit & Datenschutz* dann *Telefon sperren* und "
 "dann die *Sperren, wenn inaktiv* Einstellung."
 
@@ -108,8 +108,8 @@
 #: content/pages/security.md:19
 #, no-wrap
 msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 "Warum muss ich meine PIN bei Nutzung der nicht standardmässigen Anwendungen "
 "Dateiverwaltung und des Befehlsfensters eingeben?"
@@ -129,8 +129,8 @@
 msgid ""
 "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
-"Wie kann ich es abstellen, dass die Benachrichtigungen im gesperrten Zustand "
-"genutzt werden können?"
+"Wie kann ich es abstellen, dass die Benachrichtigungen im gesperrten Zustand"
+" genutzt werden können?"
 
 #. type: Plain text
 #: content/pages/security.md:24
@@ -177,17 +177,6 @@
 msgid "How do I play music?"
 msgstr "Wie spiele ich Musik ab?"
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-"Die Musik-Anwendung lässt Sie Musik abspielen, die auf das Gerät kopiert "
-"wurde. Darüber hinaus können [scopes]({filename}scopes.md), wie 7digital und "
-"Grooveshark ebenso Musik abspielen."
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -197,8 +186,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 "Die Anwendung Media Player spielt Videos ab, die auf das Gerät kopiert "
 "wurden. Dort finden Sie auch Anwendungen wie YouTube, die Ihnen Streaming-"
@@ -216,8 +205,8 @@
 "The included camera application allows you to take photos. If your device "
 "has both a front and rear camera, you can toggle which camera to use."
 msgstr ""
-"Die mitgelieferte Kamera-Anwendung ermöglicht es Ihnen Fotos zu machen. Wenn "
-"Ihr Gerät sowohl über eine vordere und hintere Kamera verfügt, können Sie "
+"Die mitgelieferte Kamera-Anwendung ermöglicht es Ihnen Fotos zu machen. Wenn"
+" Ihr Gerät sowohl über eine vordere und hintere Kamera verfügt, können Sie "
 "festlegen, welche Kamera benutzt wird."
 
 #. !!QA
@@ -230,13 +219,13 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 "Drücken Sie die Lauter und Leiser-Tasten gleichzeitig, bis der Bildschirm "
 "blinkt. Der Screenshot wird alles was auf dem Bildschirm ist erfassen, und "
-"Sie können das resultierende Bild in der Galerie-App oder in dem Fotos Scope "
-"sehen."
+"Sie können das resultierende Bild in der Galerie-App oder in dem Fotos Scope"
+" sehen."
 
 #. !!QA
 #: content/pages/basic.md:19
@@ -247,8 +236,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 "Wenn Sie gerade ein Foto aufgenommen haben, können Sie es einfach durch "
@@ -267,8 +256,8 @@
 "The included camera application allows you to take videos. If your device "
 "has both a front and rear camera, you can toggle which camera to use."
 msgstr ""
-"Mit der mitgelieferte Kamera-Anwendung können Sie Videos aufnehmen. Wenn Ihr "
-"Gerät verfügt sowohl über eine vordere und hintere Kamera verfügt, können "
+"Mit der mitgelieferte Kamera-Anwendung können Sie Videos aufnehmen. Wenn Ihr"
+" Gerät verfügt sowohl über eine vordere und hintere Kamera verfügt, können "
 "Sie festlegen, welche Kamera benutzt wird."
 
 #. !!QA
@@ -474,8 +463,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -520,8 +509,8 @@
 #: content/pages/ui.md:4
 #, no-wrap
 msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -533,8 +522,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -564,7 +553,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -576,8 +566,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -606,10 +596,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -621,8 +611,8 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
@@ -708,15 +698,15 @@
 #: content/pages/ui.md:48
 #, no-wrap
 msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -750,8 +740,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -825,17 +815,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -875,11 +854,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -912,10 +891,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -946,8 +925,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -959,9 +938,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1084,8 +1063,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1118,3 +1097,39 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+#~ "Die Musik-Anwendung lässt Sie Musik abspielen, die auf das Gerät kopiert "
+#~ "wurde. Darüber hinaus können [scopes]({filename}scopes.md), wie 7digital und"
+#~ " Grooveshark ebenso Musik abspielen."
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""

=== modified file 'po/es.po'
--- po/es.po	2015-03-31 08:03:47 +0000
+++ po/es.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the ubuntu-devices-help package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-devices-help\n"
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17413)\n"
 "X-Launchpad-Export-Date: 2015-03-31 06:05+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -30,9 +30,9 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr "[TOC]"
 
@@ -93,20 +93,23 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
+msgid ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your pin/"
-"passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your "
+"pin/passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid "How can I stop someone using the indicators when the phone is unlocked?"
+msgid ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -146,17 +149,6 @@
 msgid "How do I play music?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.es.md) such as 7digital and Grooveshark can also "
-"play music."
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -166,8 +158,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 
 #. !!QA
@@ -193,8 +185,8 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 
 #. !!QA
@@ -206,8 +198,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 
@@ -324,8 +316,8 @@
 "The world-wide Ubuntu community wants to give you the best possible "
 "experience on your Ubuntu device. This is why we collected:"
 msgstr ""
-"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible "
-"en su dispositivo con Ubuntu. Por ello hemos recopilado:"
+"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible"
+" en su dispositivo con Ubuntu. Por ello hemos recopilado:"
 
 #. type: Bullet: '  * '
 #: content/pages/index.md:9
@@ -388,8 +380,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
-"images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -427,8 +419,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -472,7 +464,9 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
+msgid ""
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -484,8 +478,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -515,7 +509,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -527,8 +522,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -557,10 +552,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -572,14 +567,15 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid "What are the small characters on the keyboard and how can I select them?"
+msgid ""
+"What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -657,14 +653,16 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
+msgid ""
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -698,8 +696,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -712,8 +710,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained store](https://";
-"appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained "
+"store](https://appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -746,8 +744,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
-"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' "
+"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA
@@ -773,17 +771,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -823,11 +810,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -860,10 +847,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -894,8 +881,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -907,9 +894,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1026,8 +1013,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1060,3 +1047,39 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.es.md) such as 7digital and Grooveshark can also "
+#~ "play music."
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""

=== modified file 'po/fr.po'
--- po/fr.po	2015-03-31 08:03:47 +0000
+++ po/fr.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the ubuntu-devices-help package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-devices-help\n"
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17413)\n"
 "X-Launchpad-Export-Date: 2015-03-31 06:04+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -30,9 +30,9 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr "[TOC]"
 
@@ -93,20 +93,23 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
+msgid ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your pin/"
-"passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your "
+"pin/passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid "How can I stop someone using the indicators when the phone is unlocked?"
+msgid ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -146,17 +149,6 @@
 msgid "How do I play music?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.fr.md) such as 7digital and Grooveshark can also "
-"play music."
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -166,8 +158,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 
 #. !!QA
@@ -193,8 +185,8 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 
 #. !!QA
@@ -206,8 +198,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 
@@ -384,8 +376,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
-"images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -423,8 +415,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -468,7 +460,9 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
+msgid ""
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -480,8 +474,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -511,7 +505,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -523,8 +518,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -553,10 +548,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -568,14 +563,15 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid "What are the small characters on the keyboard and how can I select them?"
+msgid ""
+"What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -653,14 +649,16 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
+msgid ""
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -694,8 +692,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -708,8 +706,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained store](https://";
-"appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained "
+"store](https://appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -742,8 +740,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
-"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' "
+"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA
@@ -769,17 +767,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -819,11 +806,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -856,10 +843,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -890,8 +877,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -903,9 +890,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1022,8 +1009,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1056,3 +1043,39 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.fr.md) such as 7digital and Grooveshark can also "
+#~ "play music."
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""

=== modified file 'po/help.pot'
--- po/help.pot	2015-03-30 14:19:09 +0000
+++ po/help.pot	2015-05-20 14:40:59 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-30 16:18+0200\n"
+"POT-Creation-Date: 2015-05-20 16:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -17,6 +17,106 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
+#: content/pages/scopes.md:2
+msgid "Scopes"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/scopes.md:4
+#, no-wrap
+msgid "*Curious about scopes?*\n"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
+msgid "[TOC]"
+msgstr ""
+
+#. !!QA
+#: content/pages/scopes.md:7
+#, no-wrap
+msgid "How do favorites work?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/scopes.md:9
+msgid ""
+"Swipe up from the bottom edge of the dash to reveal a scopes manager. "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
+"your dash."
+msgstr ""
+
+#. !!QA
+#: content/pages/scopes.md:10
+#, no-wrap
+msgid "How do I add new scopes?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/scopes.md:12
+msgid ""
+"Swipe up from the bottom edge of the dash to reveal a scopes manager. You "
+"can add new scopes by selecting from the list of non-favorites below your "
+"currently favorited scopes. If a scope you'd like isn't listed, click the "
+"store button in the upper right to look for it in the ubuntu store."
+msgstr ""
+
+#. !!QA
+#: content/pages/scopes.md:13
+#, no-wrap
+msgid "How do I remove a scope?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/scopes.md:14
+msgid ""
+"Swipe up from the bottom edge of the dash to reveal a scopes manager. You "
+"can remove a scopes by selecting it from the list of your favorites. This "
+"will remove it from your dash. If you'd like to remove it completely, visit "
+"the scope page in the ubuntu store and select *Uninstall*."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:2
+msgid "Welcome"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:5
+msgid ""
+"The world-wide Ubuntu community wants to give you the best possible "
+"experience on your Ubuntu device. This is why we collected:"
+msgstr ""
+
+#. type: Bullet: '  * '
+#: content/pages/index.md:9
+msgid "Answers to frequently asked questions"
+msgstr ""
+
+#. type: Bullet: '  * '
+#: content/pages/index.md:9
+msgid "Tips and tricks to make you more productive"
+msgstr ""
+
+#. type: Bullet: '  * '
+#: content/pages/index.md:9
+msgid "Links to get in touch with experts and other community members"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:11
+msgid "[Take me to the FAQ!]({filename}faq.md)"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:12
+msgid "[Get in touch]({filename}get-in-touch.md)"
+msgstr ""
+
+#. type: Plain text
 #: content/pages/security.md:2
 msgid "Security"
 msgstr ""
@@ -27,13 +127,6 @@
 msgid "*Wondering how to make your phone more secure?*\n"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
-msgid "[TOC]"
-msgstr ""
-
 #. !!QA
 #: content/pages/security.md:7
 #, no-wrap
@@ -151,8 +244,7 @@
 #: content/pages/basic.md:9
 msgid ""
 "The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
-" music."
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
 msgstr ""
 
 #. !!QA
@@ -262,91 +354,6 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/faq.md:4
-msgid "Get your questions answered"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/faq.md:7
-msgid ""
-"We divided the questions up into categories, so you can spot yours more "
-"easily. Here we go:"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:8
-#, no-wrap
-msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:9
-#, no-wrap
-msgid "[User Interface]({filename}ui.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:10
-#, no-wrap
-msgid "[Settings]({filename}settings.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:11
-#, no-wrap
-msgid "[Apps]({filename}apps.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:12
-#, no-wrap
-msgid "[Scopes]({filename}scopes.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:13
-#, no-wrap
-msgid "[Security]({filename}security.md)"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:2
-msgid "Welcome"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:5
-msgid ""
-"The world-wide Ubuntu community wants to give you the best possible "
-"experience on your Ubuntu device. This is why we collected:"
-msgstr ""
-
-#. type: Bullet: '  * '
-#: content/pages/index.md:9
-msgid "Answers to frequently asked questions"
-msgstr ""
-
-#. type: Bullet: '  * '
-#: content/pages/index.md:9
-msgid "Tips and tricks to make you more productive"
-msgstr ""
-
-#. type: Bullet: '  * '
-#: content/pages/index.md:9
-msgid "Links to get in touch with experts and other community members"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:11
-msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:12
-msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
-
-#. type: Plain text
 #: content/pages/settings.md:2
 msgid "Settings"
 msgstr ""
@@ -670,6 +677,79 @@
 msgstr ""
 
 #. type: Plain text
+#: content/pages/get-in-touch.md:2
+msgid "Get in touch"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/get-in-touch.md:7
+#, no-wrap
+msgid ""
+"Ubuntu has a huge community. You can easily get in touch with experts and\n"
+"other enthusiasts. One good way to do so, particularly if you **have \n"
+"questions**, is [AskUbuntu](http://www.askubuntu.com). It's a \n"
+"collaboratively-edited question and answer site for Ubuntu users and \n"
+"developers. 100% free, no registration required.  \n"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/get-in-touch.md:12
+msgid ""
+"Another great place to **get involved** with Ubuntu is our very own [Ubuntu "
+"Community Website](http://community.ubuntu.com/). You can very easily find "
+"out about all the individual teams in Ubuntu, what they do, where they hang "
+"out and how to get involved."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/faq.md:4
+msgid "Get your questions answered"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/faq.md:7
+msgid ""
+"We divided the questions up into categories, so you can spot yours more "
+"easily. Here we go:"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:8
+#, no-wrap
+msgid "[First day tasks]({filename}basic.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:9
+#, no-wrap
+msgid "[User Interface]({filename}ui.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:10
+#, no-wrap
+msgid "[Settings]({filename}settings.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:11
+#, no-wrap
+msgid "[Apps]({filename}apps.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:12
+#, no-wrap
+msgid "[Scopes]({filename}scopes.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:13
+#, no-wrap
+msgid "[Security]({filename}security.md)"
+msgstr ""
+
+#. type: Plain text
 #: content/pages/apps.md:2
 msgid "Apps"
 msgstr ""
@@ -780,8 +860,8 @@
 "simply connect your phone to your pc via the usb cable. Next, copy the music"
 " you wish to listen to to the *Music* folder. Your music will appear in the "
 "music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
 msgstr ""
 
 #. !!QA
@@ -979,84 +1059,3 @@
 "Yes, although parts of the map may be missing and search is disabled while "
 "offline."
 msgstr ""
-
-#. type: Plain text
-#: content/pages/get-in-touch.md:2
-msgid "Get in touch"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/get-in-touch.md:7
-#, no-wrap
-msgid ""
-"Ubuntu has a huge community. You can easily get in touch with experts and\n"
-"other enthusiasts. One good way to do so, particularly if you **have \n"
-"questions**, is [AskUbuntu](http://www.askubuntu.com). It's a \n"
-"collaboratively-edited question and answer site for Ubuntu users and \n"
-"developers. 100% free, no registration required.  \n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/get-in-touch.md:12
-msgid ""
-"Another great place to **get involved** with Ubuntu is our very own [Ubuntu "
-"Community Website](http://community.ubuntu.com/). You can very easily find "
-"out about all the individual teams in Ubuntu, what they do, where they hang "
-"out and how to get involved."
-msgstr ""
-
-#. type: Plain text
-#: content/pages/scopes.md:2
-msgid "Scopes"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/scopes.md:4
-#, no-wrap
-msgid "*Curious about scopes?*\n"
-msgstr ""
-
-#. !!QA
-#: content/pages/scopes.md:7
-#, no-wrap
-msgid "How do favorites work?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/scopes.md:9
-msgid ""
-"Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
-" them again will remove the favorite. All favorited scopes will appear on "
-"your dash."
-msgstr ""
-
-#. !!QA
-#: content/pages/scopes.md:10
-#, no-wrap
-msgid "How do I add new scopes?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/scopes.md:12
-msgid ""
-"Swipe up from the bottom edge of the dash to reveal a scopes manager. You "
-"can add new scopes by selecting from the list of non-favorites below your "
-"currently favorited scopes. If a scope you'd like isn't listed, click the "
-"store button in the upper right to look for it in the ubuntu store."
-msgstr ""
-
-#. !!QA
-#: content/pages/scopes.md:13
-#, no-wrap
-msgid "How do I remove a scope?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/scopes.md:14
-msgid ""
-"Swipe up from the bottom edge of the dash to reveal a scopes manager. You "
-"can remove a scopes by selecting it from the list of your favorites. This "
-"will remove it from your dash. If you'd like to remove it completely, visit "
-"the scope page in the ubuntu store and select *Uninstall*."
-msgstr ""

=== modified file 'po/it.po'
--- po/it.po	2015-03-31 08:03:47 +0000
+++ po/it.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the ubuntu-devices-help package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-devices-help\n"
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17413)\n"
 "X-Launchpad-Export-Date: 2015-03-31 06:05+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -30,9 +30,9 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr "[TOC]"
 
@@ -93,20 +93,23 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
+msgid ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your pin/"
-"passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your "
+"pin/passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid "How can I stop someone using the indicators when the phone is unlocked?"
+msgid ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -146,17 +149,6 @@
 msgid "How do I play music?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.it.md) such as 7digital and Grooveshark can also "
-"play music."
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -166,8 +158,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 
 #. !!QA
@@ -193,8 +185,8 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 
 #. !!QA
@@ -206,8 +198,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 
@@ -388,8 +380,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
-"images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -427,8 +419,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -472,7 +464,9 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
+msgid ""
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -484,8 +478,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -515,7 +509,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -527,8 +522,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -557,10 +552,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -572,14 +567,15 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid "What are the small characters on the keyboard and how can I select them?"
+msgid ""
+"What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -657,14 +653,16 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
+msgid ""
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -698,8 +696,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -712,8 +710,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained store](https://";
-"appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained "
+"store](https://appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -746,8 +744,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
-"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' "
+"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA
@@ -773,17 +771,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -823,11 +810,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -860,10 +847,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -894,8 +881,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -907,9 +894,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1026,8 +1013,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1060,3 +1047,39 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.it.md) such as 7digital and Grooveshark can also "
+#~ "play music."
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""

=== modified file 'po/pl.po'
--- po/pl.po	2015-05-16 05:45:26 +0000
+++ po/pl.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the help-app package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: help-app\n"
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17493)\n"
 "X-Launchpad-Export-Date: 2015-05-16 05:45+0000\n"
-"X-Generator: Launchpad (build 17493)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -29,9 +29,9 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr ""
 
@@ -93,8 +93,8 @@
 #: content/pages/security.md:19
 #, no-wrap
 msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
@@ -148,14 +148,6 @@
 msgid "How do I play music?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -165,8 +157,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 
 #. !!QA
@@ -192,8 +184,8 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 
 #. !!QA
@@ -205,8 +197,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 
@@ -422,8 +414,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -468,8 +460,8 @@
 #: content/pages/ui.md:4
 #, no-wrap
 msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -481,8 +473,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -512,7 +504,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -524,8 +517,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -554,10 +547,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -569,8 +562,8 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
@@ -656,15 +649,15 @@
 #: content/pages/ui.md:48
 #, no-wrap
 msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -698,8 +691,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -773,17 +766,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -823,11 +805,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -860,10 +842,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -894,8 +876,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -907,9 +889,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1026,8 +1008,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1060,3 +1042,36 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""

=== modified file 'po/pt.po'
--- po/pt.po	2015-03-31 08:03:47 +0000
+++ po/pt.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the ubuntu-devices-help package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-devices-help\n"
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17413)\n"
 "X-Launchpad-Export-Date: 2015-03-31 06:05+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -30,9 +30,9 @@
 msgstr "*A pensar como tornar o seu telemóvel seguro?*\n"
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr "[TOC]"
 
@@ -93,20 +93,23 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
+msgid ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your pin/"
-"passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your "
+"pin/passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid "How can I stop someone using the indicators when the phone is unlocked?"
+msgid ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -146,17 +149,6 @@
 msgid "How do I play music?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.pt.md) such as 7digital and Grooveshark can also "
-"play music."
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -166,8 +158,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 
 #. !!QA
@@ -193,8 +185,8 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 
 #. !!QA
@@ -206,8 +198,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 
@@ -388,8 +380,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
-"images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -427,8 +419,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -472,7 +464,9 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
+msgid ""
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -484,8 +478,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -515,7 +509,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -527,8 +522,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -557,10 +552,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -572,14 +567,15 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid "What are the small characters on the keyboard and how can I select them?"
+msgid ""
+"What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -657,14 +653,16 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
+msgid ""
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -700,8 +698,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -714,8 +712,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained store](https://";
-"appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained "
+"store](https://appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -748,8 +746,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
-"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' "
+"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA
@@ -775,17 +773,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -825,11 +812,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -862,10 +849,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -896,8 +883,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -909,9 +896,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1037,8 +1024,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1071,3 +1058,39 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.pt.md) such as 7digital and Grooveshark can also "
+#~ "play music."
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""

=== modified file 'po/ro.po'
--- po/ro.po	2015-03-31 08:03:47 +0000
+++ po/ro.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the ubuntu-devices-help package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-devices-help\n"
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17413)\n"
 "X-Launchpad-Export-Date: 2015-03-31 06:05+0000\n"
-"X-Generator: Launchpad (build 17413)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -30,9 +30,9 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr "[TOC]"
 
@@ -93,20 +93,23 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
+msgid ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your pin/"
-"passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your "
+"pin/passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid "How can I stop someone using the indicators when the phone is unlocked?"
+msgid ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -146,17 +149,6 @@
 msgid "How do I play music?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.ro.md) such as 7digital and Grooveshark can also "
-"play music."
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -166,8 +158,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 
 #. !!QA
@@ -193,8 +185,8 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 
 #. !!QA
@@ -206,8 +198,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 
@@ -384,8 +376,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
-"images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -423,8 +415,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -468,7 +460,9 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
+msgid ""
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -480,8 +474,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -511,7 +505,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -523,8 +518,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -553,10 +548,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -568,14 +563,15 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid "What are the small characters on the keyboard and how can I select them?"
+msgid ""
+"What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -653,14 +649,16 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
+msgid ""
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -694,8 +692,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -708,8 +706,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained store](https://";
-"appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained "
+"store](https://appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -742,8 +740,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
-"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' "
+"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA
@@ -769,17 +767,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -819,11 +806,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -856,10 +843,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -890,8 +877,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -903,9 +890,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1022,8 +1009,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1056,3 +1043,39 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.ro.md) such as 7digital and Grooveshark can also "
+#~ "play music."
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""

=== modified file 'po/ru.po'
--- po/ru.po	2015-04-30 05:34:15 +0000
+++ po/ru.po	2015-05-20 14:40:59 +0000
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
 # This file is distributed under the same license as the help-app package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: help-app\n"
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Launchpad (build 17453)\n"
 "X-Launchpad-Export-Date: 2015-04-30 05:34+0000\n"
-"X-Generator: Launchpad (build 17453)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -29,9 +29,9 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6
-#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
-#: content/pages/scopes.md:6
+#: content/pages/scopes.md:6 content/pages/security.md:6
+#: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
+#: content/pages/apps.md:7
 msgid "[TOC]"
 msgstr ""
 
@@ -93,8 +93,8 @@
 #: content/pages/security.md:19
 #, no-wrap
 msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
@@ -148,14 +148,6 @@
 msgid "How do I play music?"
 msgstr "Как воспроизвести музыку?"
 
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-
 #. !!QA
 #: content/pages/basic.md:10
 #, no-wrap
@@ -165,8 +157,8 @@
 #. type: Plain text
 #: content/pages/basic.md:12
 msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
 msgstr ""
 
 #. !!QA
@@ -192,8 +184,8 @@
 #: content/pages/basic.md:18
 msgid ""
 "Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
 msgstr ""
 
 #. !!QA
@@ -205,8 +197,8 @@
 #. type: Plain text
 #: content/pages/basic.md:21
 msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
+"If you've just taken a picture, you can see it easily by swiping to the left"
+" from the right edge inside the camera app. Alternatively, use the gallery "
 "app to find the picture."
 msgstr ""
 
@@ -422,8 +414,8 @@
 #. type: Plain text
 #: content/pages/settings.md:22
 msgid ""
-"You can set up some of your accounts from the scopes. Today scope allows you "
-"to configure your Google and Fitbit account, while the Pictures scope lets "
+"You can set up some of your accounts from the scopes. Today scope allows you"
+" to configure your Google and Fitbit account, while the Pictures scope lets "
 "you configure your flickr, Facebook and Instagram account. You can manage "
 "all your accounts (including social media, email, etc) from the *System "
 "Settings* app, under *Personal*, *Accounts*."
@@ -468,8 +460,8 @@
 #: content/pages/ui.md:4
 #, no-wrap
 msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
 msgstr ""
 
 #. !!QA
@@ -481,8 +473,8 @@
 #. type: Plain text
 #: content/pages/ui.md:9
 msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
 "booting the phone. You can switch to it again at any time by swiping left "
 "from the right screen edge."
 msgstr ""
@@ -512,7 +504,8 @@
 "To pin a running app permanently to the launcher, long-press it to reveal "
 "the context menu and choose the Pin to launcher option. You can do the same "
 "to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be in."
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
 msgstr ""
 
 #. !!QA
@@ -524,8 +517,8 @@
 #. type: Plain text
 #: content/pages/ui.md:19
 msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
 "indicators at any time by swiping down from the top screen edge."
 msgstr ""
 
@@ -554,10 +547,10 @@
 #. type: Plain text
 #: content/pages/ui.md:26
 msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
 msgstr ""
 
 #. !!QA
@@ -569,8 +562,8 @@
 #. type: Plain text
 #: content/pages/ui.md:29
 msgid ""
-"For text that can be copied and pasted, press and hold the text in question. "
-"A menu will appear allowing you to cut, copy and paste."
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
 msgstr ""
 
 #. !!QA
@@ -656,15 +649,15 @@
 #: content/pages/ui.md:48
 #, no-wrap
 msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/ui.md:49
 msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
 "disable it by launching the *Settings* app, navigating to *Security and "
 "privacy* and unticking *Stats on Welcome screen*."
 msgstr ""
@@ -698,8 +691,8 @@
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
 #. !!QA
@@ -773,17 +766,6 @@
 msgid "How do I add music to my device?"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/apps.md:32
-msgid ""
-"You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
-"music app. Alternatively, you can acquire music directly using the device "
-"via a scope, such as grooveshark or by downloading via the browser or "
-"another application."
-msgstr ""
-
 #. !!QA
 #: content/pages/apps.md:33
 #, no-wrap
@@ -823,11 +805,11 @@
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -860,10 +842,10 @@
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -894,8 +876,8 @@
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
 #. !!QA
@@ -907,9 +889,9 @@
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -1026,8 +1008,8 @@
 #: content/pages/scopes.md:9
 msgid ""
 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
-"them again will remove the favorite. All favorited scopes will appear on "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
 "your dash."
 msgstr ""
 
@@ -1060,3 +1042,36 @@
 "will remove it from your dash. If you'd like to remove it completely, visit "
 "the scope page in the ubuntu store and select *Uninstall*."
 msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital can also play music."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/apps.md:32
+msgid ""
+"You can add music in multiple ways. If you have pre-existing music files, "
+"simply connect your phone to your pc via the usb cable. Next, copy the music"
+" you wish to listen to to the *Music* folder. Your music will appear in the "
+"music app. Alternatively, you can acquire music directly using the device "
+"via a scope, such as 7digital or by downloading via the browser or another "
+"application."
+msgstr ""
+
+#~ msgid ""
+#~ "The music app let's you play music copied to the device. In addition, "
+#~ "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+#~ " music."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You can add music in multiple ways. If you have pre-existing music files, "
+#~ "simply connect your phone to your pc via the usb cable. Next, copy the music"
+#~ " you wish to listen to to the *Music* folder. Your music will appear in the "
+#~ "music app. Alternatively, you can acquire music directly using the device "
+#~ "via a scope, such as grooveshark or by downloading via the browser or "
+#~ "another application."
+#~ msgstr ""