Merge lp:~dholbach/help-app/1430735 into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[Daniel Holbach]

This is a partial fix for bug 1430735.

What's happening here, is that we allow !!T and !!I as markup to indicate that a particular question/answer pair is either textonly (!!T) or include an image (!!I). This will add HTML markup through our our own q-and-a markdown extension.

We can now also use the attr_list markdown extension to show links as button. Merely add {: .button } at the end of a link.

Tests and stuff are updated as well.

What's not working yet:
 - !!I is implemented, but we need to figure out how to parse the image
   markup, so we can put it in its own <div>

[lp:~dholbach/help-app/1430735]

97. By Daniel Holbach on 2015-03-13

merge from trunk

98. By Daniel Holbach on 2015-03-13

remove superfluous print

99. By Daniel Holbach on 2015-03-13

remove stray print

100. By Daniel Holbach on 2015-03-13

add initial support for creating an answer-with-image block

[David Planella (dpm)]

I need to actually test the branch, but in the meantime I've looked at the code and added some comments.

review: Needs Fixing

[lp:~dholbach/help-app/1430735]

101. By Daniel Holbach on 2015-03-16

remove button tags, they are not 'Call To Action buttons'

102. By Daniel Holbach on 2015-03-16

use .link-cta-ubuntu instead of .button

103. By Daniel Holbach on 2015-03-16

updated .pot and .po files accordingly

104. By Daniel Holbach on 2015-03-16

merge trunk

105. By Daniel Holbach on 2015-03-16

remove bzr diffI tag for now, it's not implemented yet and we won't need it for version1 in ths store

[Nicholas Skaggs (nskaggs)]

Trying all the documented make targets:

make check: no errors
make click: no errors
make web: WARNING: Unable to find `/images/settings.gif`, skipping url replacement.
make html: WARNING: Unable to find `/images/settings.gif`, skipping url replacement.

[lp:~dholbach/help-app/1430735]

106. By Daniel Holbach on 2015-03-16

add image

[Daniel Holbach (dholbach)]

Fixed.

[lp:~dholbach/help-app/1430735]

107. By Daniel Holbach on 2015-03-16

add [TOC] to all FAQ pages, add T tag to all questions

108. By Daniel Holbach on 2015-03-16

make pep8 happy

109. By Daniel Holbach on 2015-03-16

remove attr_list (and other statements), if we find them in translated strings

110. By Daniel Holbach on 2015-03-16

simplify hide/readd logic somewhat

[Daniel Holbach (dholbach)]

Unfortunately translated links are broken again... I'll fix this tomorrow morning. It'd be nice though, if somebody could review the rest of the MP.

[Nicholas Skaggs (nskaggs)]

Just a question -- can we assume text only for any question / answer pairs so we don't have to litter all our our content with !!T?

[Daniel Holbach (dholbach)]

How can Markdown know which part is a questions/answer block and which one isn't? :-/

[Daniel Holbach (dholbach)]

I will break this up into smaller portions as it will be easier to review...

Unmerged revisions

110. By Daniel Holbach on 2015-03-16

simplify hide/readd logic somewhat

109. By Daniel Holbach on 2015-03-16

remove attr_list (and other statements), if we find them in translated strings

108. By Daniel Holbach on 2015-03-16

make pep8 happy

107. By Daniel Holbach on 2015-03-16

add [TOC] to all FAQ pages, add T tag to all questions

106. By Daniel Holbach on 2015-03-16

add image

105. By Daniel Holbach on 2015-03-16

remove bzr diffI tag for now, it's not implemented yet and we won't need it for version1 in ths store

104. By Daniel Holbach on 2015-03-16

merge trunk

103. By Daniel Holbach on 2015-03-16

updated .pot and .po files accordingly

102. By Daniel Holbach on 2015-03-16

use .link-cta-ubuntu instead of .button

101. By Daniel Holbach on 2015-03-16

remove button tags, they are not 'Call To Action buttons'

=== added directory 'edit-here/content/images'
=== added file 'edit-here/content/images/settings.gif'
Binary files edit-here/content/images/settings.gif	1970-01-01 00:00:00 +0000 and edit-here/content/images/settings.gif	2015-03-16 16:48:19 +0000 differ
=== modified file 'edit-here/content/pages/apps.md'
--- edit-here/content/pages/apps.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/apps.md	2015-03-16 16:48:19 +0000
@@ -3,63 +3,65 @@
 *Are you looking for a good way to do X and can't find it in the app
 store? Want some suggestions to solve a particular problem?*
 
+[TOC]
+
 ## Misc
 
-### Do you have Spotify?
+### Do you have Spotify? !!T
 If you have a Spotify premium account, just install 'CuteSpotify'
-([video](https://www.youtube.com/watch?v=ea90rwK_VuI)).
+([video](https://www.youtube.com/watch?v=ea90rwK_VuI)). 
 
-### Do you have Google Authenticator?
+### Do you have Google Authenticator? !!T
 Sure, install the 'Authenticator' app from the software store.
 
 ## Music
 
-### How do I add music to my device (usb/mtp, scp/rsync, download)?
+### How do I add music to my device (usb/mtp, scp/rsync, download)? !!T
 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.
 
-### What music formats are supported (flac, mp3 etc)?
+### What music formats are supported (flac, mp3 etc)? !!T
 The music app supports ogg, flac and mp3 formats.
 
 ## Contacts
 
-### How can I sync my Google contacts to my device?
+### How can I sync my Google contacts to my device? !!T
 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).
 
 
 ## Gallery
 
-### How can I share photos?
+### How can I share photos? !!T
 If you've just taken a picture, share it easily by swiping to the left from the right edge inside the camera app. Alternatively, use the gallery app to find the picture. Once loaded, select *Share* from the menu and choose how you wish to share your photo.
 
-### How can I share video?
+### How can I share video? !!T
 If you've just taken 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.
 
 
 ## Camera
 
-### How can I take a picture?
+### How can I take a picture? !!T
 Select the camera app from the launcher or app scope. Swipe up from the bottom edge of the phone for additional options. Enjoy taking your picture!
 
-### How can I crop / rotate a picture?
+### How can I crop / rotate a picture? !!T
 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.
 
-### How can I take video?
+### How can I take video? !!T
 Select the camera app from the launcher or app 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!
 
 ## Clock
 
-### How do I set an alarm?
+### How do I set an alarm? !!T
 Alarms are handled by the clock app. To add a new alarm, launch the clock app. Swipe up from the bottom, and tap on the “+” sign. Configure the time, repetition, name and ringtone, and to save it tap on the tick in the up right corner.  To modify alarms, just tap on it and change whatever you need. To cancel your changes, you can go back. To save your changes, tap on the tick again.
 To delete alarms, you can either see the alarm details and select “Delete” or, from the alarms list, swipe right on the alarm you want to delete, and then tap on the bin.
 
 
 ## HERE Maps
 
-### How can I get directions?
+### How can I get directions? !!T
 Load the HERE maps application from the app scope. Open the menu and select *Directions*. Enter your destination and tap the *Get Directions* button.
 
-### Can I navigate offline?
+### Can I navigate offline? !!T
 Unfortunately navigation requires an active connection.
 
-### Can I view the map offline?
+### Can I view the map offline? !!T
 Yes, although parts of the map may be missing and search is disabled while offline.

=== modified file 'edit-here/content/pages/basic.md'
--- edit-here/content/pages/basic.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/basic.md	2015-03-16 16:48:19 +0000
@@ -2,27 +2,28 @@
 
 *If you are wondering how to perform basic tasks, look here.*
 
+[TOC]
 
-### How do I play music?
+### How do I play music? !!T
 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.
 
-### How do I play videos?
+### How do I play videos? !!T
 The media player application will play videos copied to the device. You will also find applications like youtube that give you streaming options.
 
-### How do I take photos?
+### How do I take photos? !!T
 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.
 
-### How do I record videos?
+### How do I record videos? !!T
 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.
 
-### How do I see pictures I’ve taken?
+### How do I see pictures I’ve taken? !!T
 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.
 
-### How can I send a text?
+### How can I send a text? !!T
 The default messaging application allows you to send sms as well as mms messages.
 
-### How do I make a call?
+### How do I make a call? !!T
 The default dialer app lets you make calls using a contact or by dialing a number.
 
-### How do I check recently made/missed calls?
+### How do I check recently made/missed calls? !!T
 Swiping up from the bottom edge of the dialer app reveals the recent call list. You can also filter the list to include only missed calls.

=== added directory 'edit-here/content/pages/img'
=== added file 'edit-here/content/pages/img/settings.gif'
Binary files edit-here/content/pages/img/settings.gif	1970-01-01 00:00:00 +0000 and edit-here/content/pages/img/settings.gif	2015-03-16 16:48:19 +0000 differ
=== modified file 'edit-here/content/pages/index.md'
--- edit-here/content/pages/index.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/index.md	2015-03-16 16:48:19 +0000
@@ -7,5 +7,5 @@
   * Tips and tricks to make you more productive
   * Links to get in touch with experts and other community members
 
-[Take me to the FAQ!]({filename}faq.md)  
-[Get in touch]({filename}get-in-touch.md)  
+[Take me to the FAQ!]({filename}faq.md){: .link-cta-ubuntu }  
+[Get in touch]({filename}get-in-touch.md){: .link-cta-ubuntu }  

=== modified file 'edit-here/content/pages/scopes.md'
--- edit-here/content/pages/scopes.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/scopes.md	2015-03-16 16:48:19 +0000
@@ -2,12 +2,13 @@
 
 *Curious about scopes?*
 
+[TOC]
 
-### How do favorites work?
+### How do favorites work? !!T
 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.
 
-### How do I add new scopes?
+### How do I add new scopes? !!T
 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.
 
-### How do I remove a scope?
+### How do I remove a scope? !!T
 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*.

=== modified file 'edit-here/content/pages/security.md'
--- edit-here/content/pages/security.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/security.md	2015-03-16 16:48:19 +0000
@@ -2,24 +2,25 @@
 
 *Wondering how to make your phone more secure?*
 
+[TOC]
 
-### How do I lock the phone?
+### How do I lock the phone? !!T
 Pressing the power button to turn off the phone will lock it. In addition, you can control how long your phone will stay unlocked when idle. You can find this setting under the *System Settings* application. Select *Security & Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting.
 
-### How do I unlock the phone?
+### How do I unlock the phone? !!T
 Swipe the screen to the left or right. Depending on what security you have enabled, you might be required to enter a pin or passcode.
 
-### How do I unlock the bootloader?
+### How do I unlock the bootloader? !!T
 If you are trying to flash a developer image or perform other developer related tasks, see the [developer site](http://developer.ubuntu.com/)
 
-### How can I change my PIN/Passcode?
+### How can I change my PIN/Passcode? !!T
 You can find these setting under the *System Settings* application. Select *Security & Privacy* to adjust the *Lock when idle* setting.
 
-### 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)? !!T
 Since these applications allow for invasive system changes, your pin/passcode is required. This is for your phone security.
 
-### How can I stop someone using the indicators when the phone is unlocked?
+### How can I stop someone using the indicators when the phone is unlocked? !!T
 You can find this setting under the *System Settings* application. Select *Security & Privacy*, then *Phone Locking* to adjust the *When locked, allow* settings. Specifically, toggle off the *Notifications and quick settings* option.
 
-### I forgot my passworde/security code. How can I unlock the phone?
+### I forgot my passworde/security code. How can I unlock the phone? !!T
 TBD

=== modified file 'edit-here/content/pages/settings.md'
--- edit-here/content/pages/settings.md	2015-03-10 10:56:31 +0000
+++ edit-here/content/pages/settings.md	2015-03-16 16:48:19 +0000
@@ -4,23 +4,24 @@
 
 [TOC]
 
-### How do I update my system?
+### How do I update my system? !!T
 Your device will prompt you when an update is ready. A notification will appear informing you of the new update. If you wish, you can manually check and perform an update yourself. Open the *System Settings* application. Select *Update*, and then click the check for updates button.
 
-### How do I set the time / language?
+### How do I set the time / language? !!T
 Open the *System Settings* application. For the time, check out the *Time & Date* section. For language, select *Language & Text*.
+![Icon]({filename}/images/settings.gif)
 
-### How can I change my wallpaper/background?
+### How can I change my wallpaper/background? !!T
 Open the *System Settings* application. Select the *Background* option. Press the *Add Image* button and choice your image to set as a background.
 
-### How do I keep the screen on?
+### How do I keep the screen on? !!T
 Open the *System Settings* application, and select the *Security & Privacy* option. Select the *Lock Phone* option, and then *Lock when idle*. St 
 
-### How do I set up my accounts?
+### How do I set up my accounts? !!T
 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*.
 
-### How do I configure my notifications?
+### How do I configure my notifications? !!T
 If you’re receiving too many notifications of your activity or want to change it for whatever reason, you can do so by going to the *System Settings* and selecting *Notifications*. From here you can toggle on/off notifications from any application on your device.
 
-### How do I change the ringtone for calls and texts?
+### How do I change the ringtone for calls and texts? !!T
 You can change you ringtone for calls and texts to something new. Open the *System Settings* application, then select *Sound*. Under *Phone Calls* you will find your current ringtone. Tap it to open a page of ringtones to select from.

=== modified file 'edit-here/content/pages/store.md'
--- edit-here/content/pages/store.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/store.md	2015-03-16 16:48:19 +0000
@@ -2,12 +2,13 @@
 
 *Curious about the application store?*
 
+[TOC]
 
-### How do I find and install new applications?
+### How do I find and install new applications? !!T
 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.
 
-### How can I browse the app store from my PC?
+### How can I browse the app store from my PC? !!T
 At the moment, the app store is not able to be browsed from your pc.
 
-### How do I remove applications?
+### How do I remove applications? !!T
 Search for the application you wish to remove inside the store. Open it and press the *Uninstall* button to remove the application.

=== modified file 'edit-here/content/pages/ui.md'
--- edit-here/content/pages/ui.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/ui.md	2015-03-16 16:48:19 +0000
@@ -2,31 +2,32 @@
 
 *Are you confused about the dash, scopes, swiping? You've come to the right place!*
 
+[TOC]
 
-### What is the dash?
+### What is the dash? !!T
 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.
 
-### What is the launcher?
+### What is the launcher? !!T
 The launcher allows you to easily launch new applications. You can access the launcher at any time by swiping right from the left screen edge.
 
-### What are the indicators?
+### What are the indicators? !!T
 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.
 
-### How do I switch applications?
+### How do I switch applications? !!T
 To switch applications, slide your finger left from the right edge of the screen. If you slide quickly you will cycle through each application. However, if you slide more slowly, an application switcher will appear allowing you to select the application you wish to switch to, including the
 dash.
 
-### How do I close applications?
+### How do I close applications? !!T
 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.
 
-### How can I copy and paste?
+### How can I copy and paste? !!T
 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.
 
-### What are the small characters on the keyboard and how can I select them?
+### What are the small characters on the keyboard and how can I select them? !!T
 Tapping and hold a character on the keyboard brings up a menu allowing you to select secondary characters. This allows you to select things like numbers and accented characters. Give it a try!
 
-### The keyboard behaves funny. What can I do about it?
+### The keyboard behaves funny. What can I do about it? !!T
 From the Settings app, you can go to Keyboard and try unsetting the autocompletion feature, and/or the auto capitalize option. This way, you'll still receive suggestions on the words you're writing, while having full control of the input.
 
-### What is the round circle for? What does it show? Can I configure it?
+### What is the round circle for? What does it show? Can I configure it? !!T
 The round circle is the infographic. It hows you recent phone activity, like the number of messages received or the number of songs played.

=== modified file 'edit-here/pelicanconf.py'
--- edit-here/pelicanconf.py	2015-03-10 10:56:31 +0000
+++ edit-here/pelicanconf.py	2015-03-16 16:48:19 +0000
@@ -44,4 +44,12 @@
 TAG_SAVE_AS = ''
 THEME = 'themes/phone'
 
-MD_EXTENSIONS = ['toc']
+MD_EXTENSIONS = ['q-and-a', 'attr_list', 'toc']
+Q_AND_A_CLASSES = [
+    '!!T',
+    '!!I',
+]
+HIDE_FROM_POT = Q_AND_A_CLASSES + [
+    '{: .link-cta-ubuntu }',
+    '{: .link-cta-ubuntu}',
+]

=== modified file 'edit-here/po/de.po'
--- edit-here/po/de.po	2015-03-11 05:50:31 +0000
+++ edit-here/po/de.po	2015-03-16 16:48:19 +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-03-05 15:30+0000\n"
 "Last-Translator: Daniel Holbach <[e-mail]>\n"
 "Language-Team: LANGUAGE <[e-mail]>\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 17389)\n"
 "X-Launchpad-Export-Date: 2015-03-11 05:50+0000\n"
-"X-Generator: Launchpad (build 17389)\n"
-"Language: \n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -29,14 +29,14 @@
 msgid "*Wondering how to make your phone more secure?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:6
+#. !!T
+#: content/pages/security.md:7
 #, no-wrap
 msgid "How do I lock the phone?"
-msgstr ""
+msgstr "How do I lock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:8
+#: content/pages/security.md:9
 msgid ""
 "Pressing the power button to turn off the phone will lock it. In addition, "
 "you can control how long your phone will stay unlocked when idle. You can "
@@ -44,69 +44,72 @@
 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:9
+#. !!T
+#: content/pages/security.md:10
 #, no-wrap
 msgid "How do I unlock the phone?"
-msgstr ""
+msgstr "How do I unlock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:11
+#: content/pages/security.md:12
 msgid ""
 "Swipe the screen to the left or right. Depending on what security you have "
 "enabled, you might be required to enter a pin or passcode."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:12
+#. !!T
+#: content/pages/security.md:13
 #, no-wrap
 msgid "How do I unlock the bootloader?"
-msgstr ""
+msgstr "How do I unlock the bootloader?"
 
 #. type: Plain text
-#: content/pages/security.md:14
+#: content/pages/security.md:15
 msgid ""
 "If you are trying to flash a developer image or perform other developer "
 "related tasks, see the [developer site](http://developer.ubuntu.com/)"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:15
+#. !!T
+#: content/pages/security.md:16
 #, no-wrap
 msgid "How can I change my PIN/Passcode?"
-msgstr ""
+msgstr "How can I change my PIN/Passcode?"
 
 #. type: Plain text
-#: content/pages/security.md:17
+#: content/pages/security.md:18
 msgid ""
 "You can find these setting under the *System Settings* application. Select "
 "*Security & Privacy* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:18
+#. !!T
+#: 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 ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 
 #. type: Plain text
-#: content/pages/security.md:20
+#: 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:21
+#. !!T
+#: content/pages/security.md:22
 #, no-wrap
 msgid ""
 "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 
 #. type: Plain text
-#: content/pages/security.md:23
+#: content/pages/security.md:24
 msgid ""
 "You can find this setting under the *System Settings* application. Select "
 "*Security & Privacy*, then *Phone Locking* to adjust the *When locked, "
@@ -114,14 +117,14 @@
 "settings* option."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:24
+#. !!T
+#: content/pages/security.md:25
 #, no-wrap
 msgid "I forgot my passworde/security code. How can I unlock the phone?"
-msgstr ""
+msgstr "I forgot my passworde/security code. How can I unlock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:25
+#: content/pages/security.md:26
 msgid "TBD"
 msgstr ""
 
@@ -136,39 +139,39 @@
 msgid "*Curious about the application store?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:6
+#. !!T
+#: content/pages/store.md:7
 #, no-wrap
 msgid "How do I find and install new applications?"
-msgstr ""
+msgstr "How do I find and install new applications?"
 
 #. type: Plain text
-#: content/pages/store.md:8
+#: content/pages/store.md:9
 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 ""
 
-#. type: Title ###
-#: content/pages/store.md:9
+#. !!T
+#: content/pages/store.md:10
 #, no-wrap
 msgid "How can I browse the app store from my PC?"
-msgstr ""
+msgstr "How can I browse the app store from my PC?"
 
 #. type: Plain text
-#: content/pages/store.md:11
+#: content/pages/store.md:12
 msgid "At the moment, the app store is not able to be browsed from your pc."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:12
+#. !!T
+#: content/pages/store.md:13
 #, no-wrap
 msgid "How do I remove applications?"
-msgstr ""
+msgstr "How do I remove applications?"
 
 #. type: Plain text
-#: content/pages/store.md:13
+#: content/pages/store.md:14
 msgid ""
 "Search for the application you wish to remove inside the store. Open it and "
 "press the *Uninstall* button to remove the application."
@@ -185,107 +188,110 @@
 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:6
+#. !!T
+#: content/pages/basic.md:7
 #, no-wrap
 msgid "How do I play music?"
-msgstr ""
+msgstr "How do I play music?"
 
 #. type: Plain text
-#: content/pages/basic.md:8
-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 ""
-
-#. type: Title ###
 #: 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.de.md) such as 7digital and Grooveshark can also "
+"play music."
+
+#. !!T
+#: content/pages/basic.md:10
 #, no-wrap
 msgid "How do I play videos?"
-msgstr ""
+msgstr "How do I play videos?"
 
 #. type: Plain text
-#: content/pages/basic.md:11
-msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
-msgstr ""
-
-#. type: Title ###
 #: 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."
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:13
 #, no-wrap
 msgid "How do I take photos?"
-msgstr ""
+msgstr "How do I take photos?"
 
 #. type: Plain text
-#: content/pages/basic.md:14
+#: content/pages/basic.md:15
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:15
+#. !!T
+#: content/pages/basic.md:16
 #, no-wrap
 msgid "How do I record videos?"
-msgstr ""
+msgstr "How do I record videos?"
 
 #. type: Plain text
-#: content/pages/basic.md:17
+#: content/pages/basic.md:18
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:18
+#. !!T
+#: content/pages/basic.md:19
 #, no-wrap
 msgid "How do I see pictures I’ve taken?"
-msgstr ""
+msgstr "How do I see pictures I’ve taken?"
 
 #. type: Plain text
-#: content/pages/basic.md:20
+#: 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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:21
+#. !!T
+#: content/pages/basic.md:22
 #, no-wrap
 msgid "How can I send a text?"
-msgstr ""
+msgstr "How can I send a text?"
 
 #. type: Plain text
-#: content/pages/basic.md:23
+#: content/pages/basic.md:24
 msgid ""
 "The default messaging application allows you to send sms as well as mms "
 "messages."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:24
+#. !!T
+#: content/pages/basic.md:25
 #, no-wrap
 msgid "How do I make a call?"
-msgstr ""
+msgstr "How do I make a call?"
 
 #. type: Plain text
-#: content/pages/basic.md:26
+#: content/pages/basic.md:27
 msgid ""
 "The default dialer app lets you make calls using a contact or by dialing a "
 "number."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:27
+#. !!T
+#: content/pages/basic.md:28
 #, no-wrap
 msgid "How do I check recently made/missed calls?"
-msgstr ""
+msgstr "How do I check recently made/missed calls?"
 
 #. type: Plain text
-#: content/pages/basic.md:28
+#: content/pages/basic.md:29
 msgid ""
 "Swiping up from the bottom edge of the dialer app reveals the recent call "
 "list. You can also filter the list to include only missed calls."
@@ -309,25 +315,25 @@
 #: content/pages/faq.md:6
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.de.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:7
 #, no-wrap
 msgid "[User Interface]({filename}ui.md)"
-msgstr ""
+msgstr "[User Interface]({filename}ui.de.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[Settings]({filename}settings.md)"
-msgstr ""
+msgstr "[Settings]({filename}settings.de.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
 #, no-wrap
 msgid "[The Store]({filename}store.md)"
-msgstr ""
+msgstr "[The Store]({filename}store.de.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:10
@@ -339,13 +345,13 @@
 #: content/pages/faq.md:11
 #, no-wrap
 msgid "[Scopes]({filename}scopes.md)"
-msgstr ""
+msgstr "[Scopes]({filename}scopes.de.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:12
 #, no-wrap
 msgid "[Security]({filename}security.md)"
-msgstr ""
+msgstr "[Security]({filename}security.de.md)"
 
 #. type: Plain text
 #: content/pages/index.md:2
@@ -377,134 +383,6 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:10
-#, no-wrap
-msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
-msgstr "[Gib mir die Antworten!]({filename}faq.md)  \n"
-
-#. type: Plain text
-#: content/pages/index.md:11
-#, no-wrap
-msgid "[Get in touch]({filename}get-in-touch.md)  \n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:2
-msgid "FAQ - Settings"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:4
-#, no-wrap
-msgid "*How do I change my phone settings?*\n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:6
-msgid "[TOC]"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:7
-#, no-wrap
-msgid "How do I update my system?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:9
-msgid ""
-"Your device will prompt you when an update is ready. A notification will "
-"appear informing you of the new update. If you wish, you can manually check "
-"and perform an update yourself. Open the *System Settings* application. "
-"Select *Update*, and then click the check for updates button."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:10
-#, no-wrap
-msgid "How do I set the time / language?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:12
-msgid ""
-"Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:13
-#, no-wrap
-msgid "How can I change my wallpaper/background?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:15
-msgid ""
-"Open the *System Settings* application. Select the *Background* option. "
-"Press the *Add Image* button and choice your image to set as a background."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:16
-#, no-wrap
-msgid "How do I keep the screen on?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:18
-msgid ""
-"Open the *System Settings* application, and select the *Security & Privacy* "
-"option. Select the *Lock Phone* option, and then *Lock when idle*. St"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:19
-#, no-wrap
-msgid "How do I set up my accounts?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:21
-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 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*."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:22
-#, no-wrap
-msgid "How do I configure my notifications?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:24
-msgid ""
-"If you’re receiving too many notifications of your activity or want to "
-"change it for whatever reason, you can do so by going to the *System "
-"Settings* and selecting *Notifications*. From here you can toggle on/off "
-"notifications from any application on your device."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:25
-#, no-wrap
-msgid "How do I change the ringtone for calls and texts?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:26
-msgid ""
-"You can change you ringtone for calls and texts to something new. Open the "
-"*System Settings* application, then select *Sound*. Under *Phone Calls* you "
-"will find your current ringtone. Tap it to open a page of ringtones to "
-"select from."
-msgstr ""
-
-#. type: Plain text
 #: content/pages/ui.md:2
 msgid "FAQ - User Interface"
 msgstr ""
@@ -517,56 +395,56 @@
 "place!*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:6
+#. !!T
+#: content/pages/ui.md:7
 #, no-wrap
 msgid "What is the dash?"
-msgstr ""
+msgstr "What is the dash?"
 
 #. type: Plain text
-#: content/pages/ui.md:8
+#: 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 ""
 
-#. type: Title ###
-#: content/pages/ui.md:9
+#. !!T
+#: content/pages/ui.md:10
 #, no-wrap
 msgid "What is the launcher?"
-msgstr ""
+msgstr "What is the launcher?"
 
 #. type: Plain text
-#: content/pages/ui.md:11
+#: content/pages/ui.md:12
 msgid ""
 "The launcher allows you to easily launch new applications. You can access "
 "the launcher at any time by swiping right from the left screen edge."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:12
+#. !!T
+#: content/pages/ui.md:13
 #, no-wrap
 msgid "What are the indicators?"
-msgstr ""
+msgstr "What are the indicators?"
 
 #. type: Plain text
-#: content/pages/ui.md:14
+#: content/pages/ui.md:15
 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 ""
 
-#. type: Title ###
-#: content/pages/ui.md:15
+#. !!T
+#: content/pages/ui.md:16
 #, no-wrap
 msgid "How do I switch applications?"
-msgstr ""
+msgstr "How do I switch applications?"
 
 #. type: Plain text
-#: content/pages/ui.md:18
+#: content/pages/ui.md:19
 msgid ""
 "To switch applications, slide your finger left from the right edge of the "
 "screen. If you slide quickly you will cycle through each application. "
@@ -575,57 +453,58 @@
 "dash."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:19
+#. !!T
+#: content/pages/ui.md:20
 #, no-wrap
 msgid "How do I close applications?"
-msgstr ""
+msgstr "How do I close applications?"
 
 #. type: Plain text
-#: content/pages/ui.md:21
-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."
-msgstr ""
-
-#. type: Title ###
 #: content/pages/ui.md:22
+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."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:23
 #, no-wrap
 msgid "How can I copy and paste?"
-msgstr ""
+msgstr "How can I copy and paste?"
 
 #. type: Plain text
-#: content/pages/ui.md:24
-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."
-msgstr ""
-
-#. type: Title ###
 #: content/pages/ui.md:25
+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."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:26
 #, no-wrap
 msgid ""
 "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
+"What are the small characters on the keyboard and how can I select them?"
 
 #. type: Plain text
-#: content/pages/ui.md:27
+#: content/pages/ui.md:28
 msgid ""
 "Tapping and hold a character on the keyboard brings up a menu allowing you "
 "to select secondary characters. This allows you to select things like "
 "numbers and accented characters. Give it a try!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:28
+#. !!T
+#: content/pages/ui.md:29
 #, no-wrap
 msgid "The keyboard behaves funny. What can I do about it?"
-msgstr ""
+msgstr "The keyboard behaves funny. What can I do about it?"
 
 #. type: Plain text
-#: content/pages/ui.md:30
+#: content/pages/ui.md:31
 msgid ""
 "From the Settings app, you can go to Keyboard and try unsetting the "
 "autocompletion feature, and/or the auto capitalize option. This way, you'll "
@@ -633,17 +512,17 @@
 "control of the input."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:31
+#. !!T
+#: content/pages/ui.md:32
 #, no-wrap
 msgid "What is the round circle for? What does it show? Can I configure it?"
-msgstr ""
+msgstr "What is the round circle for? What does it show? Can I configure it?"
 
 #. type: Plain text
-#: content/pages/ui.md:32
+#: content/pages/ui.md:33
 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."
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played."
 msgstr ""
 
 #. type: Plain text
@@ -660,105 +539,105 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:6
+#: content/pages/apps.md:8
 #, no-wrap
 msgid "Misc"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:8
+#. !!T
+#: content/pages/apps.md:10
 #, no-wrap
 msgid "Do you have Spotify?"
-msgstr ""
+msgstr "Do you have Spotify?"
 
 #. type: Plain text
-#: content/pages/apps.md:11
+#: content/pages/apps.md:13
 msgid ""
 "If you have a Spotify premium account, just install 'CuteSpotify' "
 "([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:12
+#. !!T
+#: content/pages/apps.md:14
 #, no-wrap
 msgid "Do you have Google Authenticator?"
-msgstr ""
+msgstr "Do you have Google Authenticator?"
 
 #. type: Plain text
-#: content/pages/apps.md:14
+#: content/pages/apps.md:16
 msgid "Sure, install the 'Authenticator' app from the software store."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:15
+#: content/pages/apps.md:17
 #, no-wrap
 msgid "Music"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:17
+#. !!T
+#: content/pages/apps.md:19
 #, no-wrap
 msgid "How do I add music to my device (usb/mtp, scp/rsync, download)?"
-msgstr ""
+msgstr "How do I add music to my device (usb/mtp, scp/rsync, download)?"
 
 #. type: Plain text
-#: content/pages/apps.md:19
+#: content/pages/apps.md:21
 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 "
+"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 ""
 
-#. type: Title ###
-#: content/pages/apps.md:20
+#. !!T
+#: content/pages/apps.md:22
 #, no-wrap
 msgid "What music formats are supported (flac, mp3 etc)?"
-msgstr ""
+msgstr "What music formats are supported (flac, mp3 etc)?"
 
 #. type: Plain text
-#: content/pages/apps.md:22
+#: content/pages/apps.md:24
 msgid "The music app supports ogg, flac and mp3 formats."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:23
+#: content/pages/apps.md:25
 #, no-wrap
 msgid "Contacts"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:25
+#. !!T
+#: content/pages/apps.md:27
 #, no-wrap
 msgid "How can I sync my Google contacts to my device?"
-msgstr ""
+msgstr "How can I sync my Google contacts to my device?"
 
 #. type: Plain text
-#: content/pages/apps.md:27
-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)."
-msgstr ""
-
-#. type: Title ##
 #: content/pages/apps.md:29
+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)."
+msgstr ""
+
+#. type: Title ##
+#: content/pages/apps.md:31
 #, no-wrap
 msgid "Gallery"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:31
+#. !!T
+#: content/pages/apps.md:33
 #, no-wrap
 msgid "How can I share photos?"
-msgstr ""
+msgstr "How can I share photos?"
 
 #. type: Plain text
-#: content/pages/apps.md:33
+#: content/pages/apps.md:35
 msgid ""
 "If you've just taken a picture, share it easily by swiping to the left from "
 "the right edge inside the camera app. Alternatively, use the gallery app to "
@@ -766,61 +645,61 @@
 "you wish to share your photo."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:34
+#. !!T
+#: content/pages/apps.md:36
 #, no-wrap
 msgid "How can I share video?"
-msgstr ""
+msgstr "How can I share video?"
 
 #. type: Plain text
-#: content/pages/apps.md:36
+#: content/pages/apps.md:38
 msgid ""
 "If you've just taken 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."
+"find the video. Once loaded, select *Share* from the menu and choose how you"
+" wish to share your video."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:38
+#: content/pages/apps.md:40
 #, no-wrap
 msgid "Camera"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:40
+#. !!T
+#: content/pages/apps.md:42
 #, no-wrap
 msgid "How can I take a picture?"
-msgstr ""
+msgstr "How can I take a picture?"
 
 #. type: Plain text
-#: content/pages/apps.md:42
+#: content/pages/apps.md:44
 msgid ""
 "Select the camera app from the launcher or app scope. Swipe up from the "
 "bottom edge of the phone for additional options. Enjoy taking your picture!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:43
+#. !!T
+#: content/pages/apps.md:45
 #, no-wrap
 msgid "How can I crop / rotate a picture?"
-msgstr ""
+msgstr "How can I crop / rotate a picture?"
 
 #. type: Plain text
-#: content/pages/apps.md:45
+#: content/pages/apps.md:47
 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 ""
 
-#. type: Title ###
-#: content/pages/apps.md:46
+#. !!T
+#: content/pages/apps.md:48
 #, no-wrap
 msgid "How can I take video?"
-msgstr ""
+msgstr "How can I take video?"
 
 #. type: Plain text
-#: content/pages/apps.md:48
+#: content/pages/apps.md:50
 msgid ""
 "Select the camera app from the launcher or app scope. Select the video icon "
 "on the bottom of the screen. Swipe up from the bottom edge of the phone for "
@@ -828,19 +707,19 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:49
+#: content/pages/apps.md:51
 #, no-wrap
 msgid "Clock"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:51
+#. !!T
+#: content/pages/apps.md:53
 #, no-wrap
 msgid "How do I set an alarm?"
-msgstr ""
+msgstr "How do I set an alarm?"
 
 #. type: Plain text
-#: content/pages/apps.md:54
+#: content/pages/apps.md:56
 msgid ""
 "Alarms are handled by the clock app. To add a new alarm, launch the clock "
 "app. Swipe up from the bottom, and tap on the “+” sign. Configure the time, "
@@ -853,43 +732,43 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:56
+#: content/pages/apps.md:58
 #, no-wrap
 msgid "HERE Maps"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:58
+#. !!T
+#: content/pages/apps.md:60
 #, no-wrap
 msgid "How can I get directions?"
-msgstr ""
+msgstr "How can I get directions?"
 
 #. type: Plain text
-#: content/pages/apps.md:60
+#: content/pages/apps.md:62
 msgid ""
 "Load the HERE maps application from the app scope. Open the menu and select "
 "*Directions*. Enter your destination and tap the *Get Directions* button."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:61
+#. !!T
+#: content/pages/apps.md:63
 #, no-wrap
 msgid "Can I navigate offline?"
-msgstr ""
+msgstr "Can I navigate offline?"
 
 #. type: Plain text
-#: content/pages/apps.md:63
+#: content/pages/apps.md:65
 msgid "Unfortunately navigation requires an active connection."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:64
+#. !!T
+#: content/pages/apps.md:66
 #, no-wrap
 msgid "Can I view the map offline?"
-msgstr ""
+msgstr "Can I view the map offline?"
 
 #. type: Plain text
-#: content/pages/apps.md:65
+#: content/pages/apps.md:67
 msgid ""
 "Yes, although parts of the map may be missing and search is disabled while "
 "offline."
@@ -937,29 +816,29 @@
 msgid "*Curious about scopes?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/scopes.md:6
+#. !!T
+#: content/pages/scopes.md:7
 #, no-wrap
 msgid "How do favorites work?"
-msgstr ""
+msgstr "How do favorites work?"
 
 #. type: Plain text
-#: content/pages/scopes.md: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 ""
 
-#. type: Title ###
-#: content/pages/scopes.md:9
+#. !!T
+#: content/pages/scopes.md:10
 #, no-wrap
 msgid "How do I add new scopes?"
-msgstr ""
+msgstr "How do I add new scopes?"
 
 #. type: Plain text
-#: content/pages/scopes.md:11
+#: 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 "
@@ -967,17 +846,166 @@
 "store button in the upper right to look for it in the ubuntu store."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/scopes.md:12
+#. !!T
+#: content/pages/scopes.md:13
 #, no-wrap
 msgid "How do I remove a scope?"
-msgstr ""
+msgstr "How do I remove a scope?"
 
 #. type: Plain text
-#: content/pages/scopes.md:13
+#: 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 ""
+
+#. {: .link-cta-ubuntu }
+#: content/pages/index.md:10
+#, no-wrap
+msgid "[Take me to the FAQ!]({filename}faq.md)"
+msgstr "[Take me to the FAQ!]({filename}faq.de.md)"
+
+#. {: .link-cta-ubuntu }
+#: content/pages/index.md:11
+#, no-wrap
+msgid "[Get in touch]({filename}get-in-touch.md)"
+msgstr "[Get in touch]({filename}get-in-touch.de.md)"
+
+#. type: Plain text
+#: content/pages/settings.md:2
+msgid "FAQ - Settings"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/settings.md:4
+#, no-wrap
+msgid "*How do I change my phone settings?*\n"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/security.md:6 content/pages/store.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 "[TOC]"
+
+#. !!T
+#: content/pages/settings.md:7
+#, no-wrap
+msgid "How do I update my system?"
+msgstr "How do I update my system?"
+
+#. type: Plain text
+#: content/pages/settings.md:9
+msgid ""
+"Your device will prompt you when an update is ready. A notification will "
+"appear informing you of the new update. If you wish, you can manually check "
+"and perform an update yourself. Open the *System Settings* application. "
+"Select *Update*, and then click the check for updates button."
+msgstr ""
+"Your device will prompt you when an update is ready. A notification will "
+"appear informing you of the new update. If you wish, you can manually check "
+"and perform an update yourself. Open the *System Settings* application. "
+"Select *Update*, and then click the check for updates button. !!T"
+
+#. !!T
+#: content/pages/settings.md:10
+#, no-wrap
+msgid "How do I set the time / language?"
+msgstr "How do I set the time / language?"
+
+#. !!T
+#: content/pages/settings.md:14
+#, no-wrap
+msgid "How can I change my wallpaper/background?"
+msgstr "How can I change my wallpaper/background?"
+
+#. type: Plain text
+#: content/pages/settings.md:16
+msgid ""
+"Open the *System Settings* application. Select the *Background* option. "
+"Press the *Add Image* button and choice your image to set as a background."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:17
+#, no-wrap
+msgid "How do I keep the screen on?"
+msgstr "How do I keep the screen on?"
+
+#. type: Plain text
+#: content/pages/settings.md:19
+msgid ""
+"Open the *System Settings* application, and select the *Security & Privacy* "
+"option. Select the *Lock Phone* option, and then *Lock when idle*. St"
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:20
+#, no-wrap
+msgid "How do I set up my accounts?"
+msgstr "How do I set up my accounts?"
+
+#. 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 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*."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:23
+#, no-wrap
+msgid "How do I configure my notifications?"
+msgstr "How do I configure my notifications?"
+
+#. type: Plain text
+#: content/pages/settings.md:25
+msgid ""
+"If you’re receiving too many notifications of your activity or want to "
+"change it for whatever reason, you can do so by going to the *System "
+"Settings* and selecting *Notifications*. From here you can toggle on/off "
+"notifications from any application on your device."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:26
+#, no-wrap
+msgid "How do I change the ringtone for calls and texts?"
+msgstr "How do I change the ringtone for calls and texts?"
+
+#. type: Plain text
+#: content/pages/settings.md:27
+msgid ""
+"You can change you ringtone for calls and texts to something new. Open the "
+"*System Settings* application, then select *Sound*. Under *Phone Calls* you "
+"will find your current ringtone. Tap it to open a page of ringtones to "
+"select from."
+msgstr ""
+
+#. type: Plain text
+#: 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)"
+msgstr ""
+"Open the *System Settings* application. For the time, check out the *Time & "
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif) !!I"
+
+#~ msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
+#~ msgstr "[Gib mir die Antworten!]({filename}faq.de.md)  \n"
+
+#~ msgid "[Get in touch]({filename}get-in-touch.md)  \n"
+#~ msgstr "[Get in touch]({filename}get-in-touch.de.md)  \n"
+
+#~ msgid ""
+#~ "Open the *System Settings* application. For the time, check out the *Time & "
+#~ "Date* section. For language, select *Language & Text*."
+#~ msgstr ""

=== modified file 'edit-here/po/es.po'
--- edit-here/po/es.po	2015-03-11 05:50:31 +0000
+++ edit-here/po/es.po	2015-03-16 16:48:19 +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"
@@ -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 17389)\n"
 "X-Launchpad-Export-Date: 2015-03-11 05:50+0000\n"
-"X-Generator: Launchpad (build 17389)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -28,14 +28,14 @@
 msgid "*Wondering how to make your phone more secure?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:6
+#. !!T
+#: content/pages/security.md:7
 #, no-wrap
 msgid "How do I lock the phone?"
-msgstr ""
+msgstr "How do I lock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:8
+#: content/pages/security.md:9
 msgid ""
 "Pressing the power button to turn off the phone will lock it. In addition, "
 "you can control how long your phone will stay unlocked when idle. You can "
@@ -43,69 +43,72 @@
 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:9
+#. !!T
+#: content/pages/security.md:10
 #, no-wrap
 msgid "How do I unlock the phone?"
-msgstr ""
+msgstr "How do I unlock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:11
+#: content/pages/security.md:12
 msgid ""
 "Swipe the screen to the left or right. Depending on what security you have "
 "enabled, you might be required to enter a pin or passcode."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:12
+#. !!T
+#: content/pages/security.md:13
 #, no-wrap
 msgid "How do I unlock the bootloader?"
-msgstr ""
+msgstr "How do I unlock the bootloader?"
 
 #. type: Plain text
-#: content/pages/security.md:14
+#: content/pages/security.md:15
 msgid ""
 "If you are trying to flash a developer image or perform other developer "
 "related tasks, see the [developer site](http://developer.ubuntu.com/)"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:15
+#. !!T
+#: content/pages/security.md:16
 #, no-wrap
 msgid "How can I change my PIN/Passcode?"
-msgstr ""
+msgstr "How can I change my PIN/Passcode?"
 
 #. type: Plain text
-#: content/pages/security.md:17
+#: content/pages/security.md:18
 msgid ""
 "You can find these setting under the *System Settings* application. Select "
 "*Security & Privacy* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:18
+#. !!T
+#: 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 ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 
 #. type: Plain text
-#: content/pages/security.md:20
+#: 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:21
+#. !!T
+#: content/pages/security.md:22
 #, no-wrap
 msgid ""
 "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 
 #. type: Plain text
-#: content/pages/security.md:23
+#: content/pages/security.md:24
 msgid ""
 "You can find this setting under the *System Settings* application. Select "
 "*Security & Privacy*, then *Phone Locking* to adjust the *When locked, "
@@ -113,14 +116,14 @@
 "settings* option."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:24
+#. !!T
+#: content/pages/security.md:25
 #, no-wrap
 msgid "I forgot my passworde/security code. How can I unlock the phone?"
-msgstr ""
+msgstr "I forgot my passworde/security code. How can I unlock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:25
+#: content/pages/security.md:26
 msgid "TBD"
 msgstr ""
 
@@ -135,39 +138,39 @@
 msgid "*Curious about the application store?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:6
+#. !!T
+#: content/pages/store.md:7
 #, no-wrap
 msgid "How do I find and install new applications?"
-msgstr ""
+msgstr "How do I find and install new applications?"
 
 #. type: Plain text
-#: content/pages/store.md:8
+#: content/pages/store.md:9
 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 ""
 
-#. type: Title ###
-#: content/pages/store.md:9
+#. !!T
+#: content/pages/store.md:10
 #, no-wrap
 msgid "How can I browse the app store from my PC?"
-msgstr ""
+msgstr "How can I browse the app store from my PC?"
 
 #. type: Plain text
-#: content/pages/store.md:11
+#: content/pages/store.md:12
 msgid "At the moment, the app store is not able to be browsed from your pc."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:12
+#. !!T
+#: content/pages/store.md:13
 #, no-wrap
 msgid "How do I remove applications?"
-msgstr ""
+msgstr "How do I remove applications?"
 
 #. type: Plain text
-#: content/pages/store.md:13
+#: content/pages/store.md:14
 msgid ""
 "Search for the application you wish to remove inside the store. Open it and "
 "press the *Uninstall* button to remove the application."
@@ -184,107 +187,110 @@
 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:6
+#. !!T
+#: content/pages/basic.md:7
 #, no-wrap
 msgid "How do I play music?"
-msgstr ""
+msgstr "How do I play music?"
 
 #. type: Plain text
-#: content/pages/basic.md:8
-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 ""
-
-#. type: Title ###
 #: 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."
+
+#. !!T
+#: content/pages/basic.md:10
 #, no-wrap
 msgid "How do I play videos?"
-msgstr ""
+msgstr "How do I play videos?"
 
 #. type: Plain text
-#: content/pages/basic.md:11
-msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
-msgstr ""
-
-#. type: Title ###
 #: 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."
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:13
 #, no-wrap
 msgid "How do I take photos?"
-msgstr ""
+msgstr "How do I take photos?"
 
 #. type: Plain text
-#: content/pages/basic.md:14
+#: content/pages/basic.md:15
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:15
+#. !!T
+#: content/pages/basic.md:16
 #, no-wrap
 msgid "How do I record videos?"
-msgstr ""
+msgstr "How do I record videos?"
 
 #. type: Plain text
-#: content/pages/basic.md:17
+#: content/pages/basic.md:18
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:18
+#. !!T
+#: content/pages/basic.md:19
 #, no-wrap
 msgid "How do I see pictures I’ve taken?"
-msgstr ""
+msgstr "How do I see pictures I’ve taken?"
 
 #. type: Plain text
-#: content/pages/basic.md:20
+#: 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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:21
+#. !!T
+#: content/pages/basic.md:22
 #, no-wrap
 msgid "How can I send a text?"
-msgstr ""
+msgstr "How can I send a text?"
 
 #. type: Plain text
-#: content/pages/basic.md:23
+#: content/pages/basic.md:24
 msgid ""
 "The default messaging application allows you to send sms as well as mms "
 "messages."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:24
+#. !!T
+#: content/pages/basic.md:25
 #, no-wrap
 msgid "How do I make a call?"
-msgstr ""
+msgstr "How do I make a call?"
 
 #. type: Plain text
-#: content/pages/basic.md:26
+#: content/pages/basic.md:27
 msgid ""
 "The default dialer app lets you make calls using a contact or by dialing a "
 "number."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:27
+#. !!T
+#: content/pages/basic.md:28
 #, no-wrap
 msgid "How do I check recently made/missed calls?"
-msgstr ""
+msgstr "How do I check recently made/missed calls?"
 
 #. type: Plain text
-#: content/pages/basic.md:28
+#: content/pages/basic.md:29
 msgid ""
 "Swiping up from the bottom edge of the dialer app reveals the recent call "
 "list. You can also filter the list to include only missed calls."
@@ -308,43 +314,43 @@
 #: content/pages/faq.md:6
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.es.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:7
 #, no-wrap
 msgid "[User Interface]({filename}ui.md)"
-msgstr "[Interfaz de usuario]({filename}ui.md)"
+msgstr "[Interfaz de usuario]({filename}ui.es.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[Settings]({filename}settings.md)"
-msgstr "[Configuración]({filename}settings.md)"
+msgstr "[Configuración]({filename}settings.es.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
 #, no-wrap
 msgid "[The Store]({filename}store.md)"
-msgstr ""
+msgstr "[The Store]({filename}store.es.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:10
 #, no-wrap
 msgid "[Apps]({filename}apps.md)"
-msgstr "[Aplicaciones]({filename}apps.md)"
+msgstr "[Aplicaciones]({filename}apps.es.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:11
 #, no-wrap
 msgid "[Scopes]({filename}scopes.md)"
-msgstr "[«Scopes»]({filename}scopes.md)"
+msgstr "[«Scopes»]({filename}scopes.es.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:12
 #, no-wrap
 msgid "[Security]({filename}security.md)"
-msgstr "[Seguridad]({filename}security.md)"
+msgstr "[Seguridad]({filename}security.es.md)"
 
 #. type: Plain text
 #: content/pages/index.md:2
@@ -357,8 +363,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
@@ -376,134 +382,6 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:10
-#, no-wrap
-msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:11
-#, no-wrap
-msgid "[Get in touch]({filename}get-in-touch.md)  \n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:2
-msgid "FAQ - Settings"
-msgstr "PP. FF. – Configuración"
-
-#. type: Plain text
-#: content/pages/settings.md:4
-#, no-wrap
-msgid "*How do I change my phone settings?*\n"
-msgstr "*¿Cómo modifico los ajustes del teléfono?*\n"
-
-#. type: Plain text
-#: content/pages/settings.md:6
-msgid "[TOC]"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:7
-#, no-wrap
-msgid "How do I update my system?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:9
-msgid ""
-"Your device will prompt you when an update is ready. A notification will "
-"appear informing you of the new update. If you wish, you can manually check "
-"and perform an update yourself. Open the *System Settings* application. "
-"Select *Update*, and then click the check for updates button."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:10
-#, no-wrap
-msgid "How do I set the time / language?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:12
-msgid ""
-"Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:13
-#, no-wrap
-msgid "How can I change my wallpaper/background?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:15
-msgid ""
-"Open the *System Settings* application. Select the *Background* option. "
-"Press the *Add Image* button and choice your image to set as a background."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:16
-#, no-wrap
-msgid "How do I keep the screen on?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:18
-msgid ""
-"Open the *System Settings* application, and select the *Security & Privacy* "
-"option. Select the *Lock Phone* option, and then *Lock when idle*. St"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:19
-#, no-wrap
-msgid "How do I set up my accounts?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:21
-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 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*."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:22
-#, no-wrap
-msgid "How do I configure my notifications?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:24
-msgid ""
-"If you’re receiving too many notifications of your activity or want to "
-"change it for whatever reason, you can do so by going to the *System "
-"Settings* and selecting *Notifications*. From here you can toggle on/off "
-"notifications from any application on your device."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:25
-#, no-wrap
-msgid "How do I change the ringtone for calls and texts?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:26
-msgid ""
-"You can change you ringtone for calls and texts to something new. Open the "
-"*System Settings* application, then select *Sound*. Under *Phone Calls* you "
-"will find your current ringtone. Tap it to open a page of ringtones to "
-"select from."
-msgstr ""
-
-#. type: Plain text
 #: content/pages/ui.md:2
 msgid "FAQ - User Interface"
 msgstr "PP. FF. – Interfaz de usuario"
@@ -516,56 +394,56 @@
 "place!*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:6
+#. !!T
+#: content/pages/ui.md:7
 #, no-wrap
 msgid "What is the dash?"
-msgstr ""
+msgstr "What is the dash?"
 
 #. type: Plain text
-#: content/pages/ui.md:8
+#: 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 ""
 
-#. type: Title ###
-#: content/pages/ui.md:9
+#. !!T
+#: content/pages/ui.md:10
 #, no-wrap
 msgid "What is the launcher?"
-msgstr ""
+msgstr "What is the launcher?"
 
 #. type: Plain text
-#: content/pages/ui.md:11
+#: content/pages/ui.md:12
 msgid ""
 "The launcher allows you to easily launch new applications. You can access "
 "the launcher at any time by swiping right from the left screen edge."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:12
+#. !!T
+#: content/pages/ui.md:13
 #, no-wrap
 msgid "What are the indicators?"
-msgstr ""
+msgstr "What are the indicators?"
 
 #. type: Plain text
-#: content/pages/ui.md:14
+#: content/pages/ui.md:15
 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 ""
 
-#. type: Title ###
-#: content/pages/ui.md:15
+#. !!T
+#: content/pages/ui.md:16
 #, no-wrap
 msgid "How do I switch applications?"
-msgstr ""
+msgstr "How do I switch applications?"
 
 #. type: Plain text
-#: content/pages/ui.md:18
+#: content/pages/ui.md:19
 msgid ""
 "To switch applications, slide your finger left from the right edge of the "
 "screen. If you slide quickly you will cycle through each application. "
@@ -574,57 +452,58 @@
 "dash."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:19
+#. !!T
+#: content/pages/ui.md:20
 #, no-wrap
 msgid "How do I close applications?"
-msgstr ""
+msgstr "How do I close applications?"
 
 #. type: Plain text
-#: content/pages/ui.md:21
-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."
-msgstr ""
-
-#. type: Title ###
 #: content/pages/ui.md:22
+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."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:23
 #, no-wrap
 msgid "How can I copy and paste?"
-msgstr ""
+msgstr "How can I copy and paste?"
 
 #. type: Plain text
-#: content/pages/ui.md:24
-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."
-msgstr ""
-
-#. type: Title ###
 #: content/pages/ui.md:25
+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."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:26
 #, no-wrap
 msgid ""
 "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
+"What are the small characters on the keyboard and how can I select them?"
 
 #. type: Plain text
-#: content/pages/ui.md:27
+#: content/pages/ui.md:28
 msgid ""
 "Tapping and hold a character on the keyboard brings up a menu allowing you "
 "to select secondary characters. This allows you to select things like "
 "numbers and accented characters. Give it a try!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:28
+#. !!T
+#: content/pages/ui.md:29
 #, no-wrap
 msgid "The keyboard behaves funny. What can I do about it?"
-msgstr ""
+msgstr "The keyboard behaves funny. What can I do about it?"
 
 #. type: Plain text
-#: content/pages/ui.md:30
+#: content/pages/ui.md:31
 msgid ""
 "From the Settings app, you can go to Keyboard and try unsetting the "
 "autocompletion feature, and/or the auto capitalize option. This way, you'll "
@@ -632,17 +511,17 @@
 "control of the input."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:31
+#. !!T
+#: content/pages/ui.md:32
 #, no-wrap
 msgid "What is the round circle for? What does it show? Can I configure it?"
-msgstr ""
+msgstr "What is the round circle for? What does it show? Can I configure it?"
 
 #. type: Plain text
-#: content/pages/ui.md:32
+#: content/pages/ui.md:33
 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."
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played."
 msgstr ""
 
 #. type: Plain text
@@ -659,105 +538,105 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:6
+#: content/pages/apps.md:8
 #, no-wrap
 msgid "Misc"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:8
+#. !!T
+#: content/pages/apps.md:10
 #, no-wrap
 msgid "Do you have Spotify?"
-msgstr ""
+msgstr "Do you have Spotify?"
 
 #. type: Plain text
-#: content/pages/apps.md:11
+#: content/pages/apps.md:13
 msgid ""
 "If you have a Spotify premium account, just install 'CuteSpotify' "
 "([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:12
+#. !!T
+#: content/pages/apps.md:14
 #, no-wrap
 msgid "Do you have Google Authenticator?"
-msgstr ""
+msgstr "Do you have Google Authenticator?"
 
 #. type: Plain text
-#: content/pages/apps.md:14
+#: content/pages/apps.md:16
 msgid "Sure, install the 'Authenticator' app from the software store."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:15
+#: content/pages/apps.md:17
 #, no-wrap
 msgid "Music"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:17
+#. !!T
+#: content/pages/apps.md:19
 #, no-wrap
 msgid "How do I add music to my device (usb/mtp, scp/rsync, download)?"
-msgstr ""
+msgstr "How do I add music to my device (usb/mtp, scp/rsync, download)?"
 
 #. type: Plain text
-#: content/pages/apps.md:19
+#: content/pages/apps.md:21
 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 "
+"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 ""
 
-#. type: Title ###
-#: content/pages/apps.md:20
+#. !!T
+#: content/pages/apps.md:22
 #, no-wrap
 msgid "What music formats are supported (flac, mp3 etc)?"
-msgstr ""
+msgstr "What music formats are supported (flac, mp3 etc)?"
 
 #. type: Plain text
-#: content/pages/apps.md:22
+#: content/pages/apps.md:24
 msgid "The music app supports ogg, flac and mp3 formats."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:23
+#: content/pages/apps.md:25
 #, no-wrap
 msgid "Contacts"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:25
+#. !!T
+#: content/pages/apps.md:27
 #, no-wrap
 msgid "How can I sync my Google contacts to my device?"
-msgstr ""
+msgstr "How can I sync my Google contacts to my device?"
 
 #. type: Plain text
-#: content/pages/apps.md:27
-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)."
-msgstr ""
-
-#. type: Title ##
 #: content/pages/apps.md:29
+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)."
+msgstr ""
+
+#. type: Title ##
+#: content/pages/apps.md:31
 #, no-wrap
 msgid "Gallery"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:31
+#. !!T
+#: content/pages/apps.md:33
 #, no-wrap
 msgid "How can I share photos?"
-msgstr ""
+msgstr "How can I share photos?"
 
 #. type: Plain text
-#: content/pages/apps.md:33
+#: content/pages/apps.md:35
 msgid ""
 "If you've just taken a picture, share it easily by swiping to the left from "
 "the right edge inside the camera app. Alternatively, use the gallery app to "
@@ -765,61 +644,61 @@
 "you wish to share your photo."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:34
+#. !!T
+#: content/pages/apps.md:36
 #, no-wrap
 msgid "How can I share video?"
-msgstr ""
+msgstr "How can I share video?"
 
 #. type: Plain text
-#: content/pages/apps.md:36
+#: content/pages/apps.md:38
 msgid ""
 "If you've just taken 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."
+"find the video. Once loaded, select *Share* from the menu and choose how you"
+" wish to share your video."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:38
+#: content/pages/apps.md:40
 #, no-wrap
 msgid "Camera"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:40
+#. !!T
+#: content/pages/apps.md:42
 #, no-wrap
 msgid "How can I take a picture?"
-msgstr ""
+msgstr "How can I take a picture?"
 
 #. type: Plain text
-#: content/pages/apps.md:42
+#: content/pages/apps.md:44
 msgid ""
 "Select the camera app from the launcher or app scope. Swipe up from the "
 "bottom edge of the phone for additional options. Enjoy taking your picture!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:43
+#. !!T
+#: content/pages/apps.md:45
 #, no-wrap
 msgid "How can I crop / rotate a picture?"
-msgstr ""
+msgstr "How can I crop / rotate a picture?"
 
 #. type: Plain text
-#: content/pages/apps.md:45
+#: content/pages/apps.md:47
 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 ""
 
-#. type: Title ###
-#: content/pages/apps.md:46
+#. !!T
+#: content/pages/apps.md:48
 #, no-wrap
 msgid "How can I take video?"
-msgstr ""
+msgstr "How can I take video?"
 
 #. type: Plain text
-#: content/pages/apps.md:48
+#: content/pages/apps.md:50
 msgid ""
 "Select the camera app from the launcher or app scope. Select the video icon "
 "on the bottom of the screen. Swipe up from the bottom edge of the phone for "
@@ -827,19 +706,19 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:49
+#: content/pages/apps.md:51
 #, no-wrap
 msgid "Clock"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:51
+#. !!T
+#: content/pages/apps.md:53
 #, no-wrap
 msgid "How do I set an alarm?"
-msgstr ""
+msgstr "How do I set an alarm?"
 
 #. type: Plain text
-#: content/pages/apps.md:54
+#: content/pages/apps.md:56
 msgid ""
 "Alarms are handled by the clock app. To add a new alarm, launch the clock "
 "app. Swipe up from the bottom, and tap on the “+” sign. Configure the time, "
@@ -852,43 +731,43 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:56
+#: content/pages/apps.md:58
 #, no-wrap
 msgid "HERE Maps"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:58
+#. !!T
+#: content/pages/apps.md:60
 #, no-wrap
 msgid "How can I get directions?"
-msgstr ""
+msgstr "How can I get directions?"
 
 #. type: Plain text
-#: content/pages/apps.md:60
+#: content/pages/apps.md:62
 msgid ""
 "Load the HERE maps application from the app scope. Open the menu and select "
 "*Directions*. Enter your destination and tap the *Get Directions* button."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:61
+#. !!T
+#: content/pages/apps.md:63
 #, no-wrap
 msgid "Can I navigate offline?"
-msgstr ""
+msgstr "Can I navigate offline?"
 
 #. type: Plain text
-#: content/pages/apps.md:63
+#: content/pages/apps.md:65
 msgid "Unfortunately navigation requires an active connection."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:64
+#. !!T
+#: content/pages/apps.md:66
 #, no-wrap
 msgid "Can I view the map offline?"
-msgstr ""
+msgstr "Can I view the map offline?"
 
 #. type: Plain text
-#: content/pages/apps.md:65
+#: content/pages/apps.md:67
 msgid ""
 "Yes, although parts of the map may be missing and search is disabled while "
 "offline."
@@ -930,29 +809,29 @@
 msgid "*Curious about scopes?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/scopes.md:6
+#. !!T
+#: content/pages/scopes.md:7
 #, no-wrap
 msgid "How do favorites work?"
-msgstr ""
+msgstr "How do favorites work?"
 
 #. type: Plain text
-#: content/pages/scopes.md: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 ""
 
-#. type: Title ###
-#: content/pages/scopes.md:9
+#. !!T
+#: content/pages/scopes.md:10
 #, no-wrap
 msgid "How do I add new scopes?"
-msgstr ""
+msgstr "How do I add new scopes?"
 
 #. type: Plain text
-#: content/pages/scopes.md:11
+#: 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 "
@@ -960,17 +839,166 @@
 "store button in the upper right to look for it in the ubuntu store."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/scopes.md:12
+#. !!T
+#: content/pages/scopes.md:13
 #, no-wrap
 msgid "How do I remove a scope?"
-msgstr ""
+msgstr "How do I remove a scope?"
 
 #. type: Plain text
-#: content/pages/scopes.md:13
+#: 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 ""
+
+#. {: .link-cta-ubuntu }
+#: content/pages/index.md:10
+#, no-wrap
+msgid "[Take me to the FAQ!]({filename}faq.md)"
+msgstr "[Take me to the FAQ!]({filename}faq.es.md)"
+
+#. {: .link-cta-ubuntu }
+#: content/pages/index.md:11
+#, no-wrap
+msgid "[Get in touch]({filename}get-in-touch.md)"
+msgstr "[Get in touch]({filename}get-in-touch.es.md)"
+
+#. type: Plain text
+#: content/pages/settings.md:2
+msgid "FAQ - Settings"
+msgstr "PP. FF. – Configuración"
+
+#. type: Plain text
+#: content/pages/settings.md:4
+#, no-wrap
+msgid "*How do I change my phone settings?*\n"
+msgstr "*¿Cómo modifico los ajustes del teléfono?*\n"
+
+#. type: Plain text
+#: content/pages/security.md:6 content/pages/store.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 "[TOC]"
+
+#. !!T
+#: content/pages/settings.md:7
+#, no-wrap
+msgid "How do I update my system?"
+msgstr "How do I update my system?"
+
+#. type: Plain text
+#: content/pages/settings.md:9
+msgid ""
+"Your device will prompt you when an update is ready. A notification will "
+"appear informing you of the new update. If you wish, you can manually check "
+"and perform an update yourself. Open the *System Settings* application. "
+"Select *Update*, and then click the check for updates button."
+msgstr ""
+"Your device will prompt you when an update is ready. A notification will "
+"appear informing you of the new update. If you wish, you can manually check "
+"and perform an update yourself. Open the *System Settings* application. "
+"Select *Update*, and then click the check for updates button. !!T"
+
+#. !!T
+#: content/pages/settings.md:10
+#, no-wrap
+msgid "How do I set the time / language?"
+msgstr "How do I set the time / language?"
+
+#. !!T
+#: content/pages/settings.md:14
+#, no-wrap
+msgid "How can I change my wallpaper/background?"
+msgstr "How can I change my wallpaper/background?"
+
+#. type: Plain text
+#: content/pages/settings.md:16
+msgid ""
+"Open the *System Settings* application. Select the *Background* option. "
+"Press the *Add Image* button and choice your image to set as a background."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:17
+#, no-wrap
+msgid "How do I keep the screen on?"
+msgstr "How do I keep the screen on?"
+
+#. type: Plain text
+#: content/pages/settings.md:19
+msgid ""
+"Open the *System Settings* application, and select the *Security & Privacy* "
+"option. Select the *Lock Phone* option, and then *Lock when idle*. St"
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:20
+#, no-wrap
+msgid "How do I set up my accounts?"
+msgstr "How do I set up my accounts?"
+
+#. 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 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*."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:23
+#, no-wrap
+msgid "How do I configure my notifications?"
+msgstr "How do I configure my notifications?"
+
+#. type: Plain text
+#: content/pages/settings.md:25
+msgid ""
+"If you’re receiving too many notifications of your activity or want to "
+"change it for whatever reason, you can do so by going to the *System "
+"Settings* and selecting *Notifications*. From here you can toggle on/off "
+"notifications from any application on your device."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:26
+#, no-wrap
+msgid "How do I change the ringtone for calls and texts?"
+msgstr "How do I change the ringtone for calls and texts?"
+
+#. type: Plain text
+#: content/pages/settings.md:27
+msgid ""
+"You can change you ringtone for calls and texts to something new. Open the "
+"*System Settings* application, then select *Sound*. Under *Phone Calls* you "
+"will find your current ringtone. Tap it to open a page of ringtones to "
+"select from."
+msgstr ""
+
+#. type: Plain text
+#: 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)"
+msgstr ""
+"Open the *System Settings* application. For the time, check out the *Time & "
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif) !!I"
+
+#~ msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
+#~ msgstr "[Take me to the FAQ!]({filename}faq.es.md)  \n"
+
+#~ msgid "[Get in touch]({filename}get-in-touch.md)  \n"
+#~ msgstr "[Get in touch]({filename}get-in-touch.es.md)  \n"
+
+#~ msgid ""
+#~ "Open the *System Settings* application. For the time, check out the *Time & "
+#~ "Date* section. For language, select *Language & Text*."
+#~ msgstr ""

=== modified file 'edit-here/po/fr.po'
--- edit-here/po/fr.po	2015-03-11 05:50:31 +0000
+++ edit-here/po/fr.po	2015-03-16 16:48:19 +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"
@@ -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 17389)\n"
 "X-Launchpad-Export-Date: 2015-03-11 05:50+0000\n"
-"X-Generator: Launchpad (build 17389)\n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -28,14 +28,14 @@
 msgid "*Wondering how to make your phone more secure?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:6
+#. !!T
+#: content/pages/security.md:7
 #, no-wrap
 msgid "How do I lock the phone?"
-msgstr ""
+msgstr "How do I lock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:8
+#: content/pages/security.md:9
 msgid ""
 "Pressing the power button to turn off the phone will lock it. In addition, "
 "you can control how long your phone will stay unlocked when idle. You can "
@@ -43,69 +43,72 @@
 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:9
+#. !!T
+#: content/pages/security.md:10
 #, no-wrap
 msgid "How do I unlock the phone?"
-msgstr ""
+msgstr "How do I unlock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:11
+#: content/pages/security.md:12
 msgid ""
 "Swipe the screen to the left or right. Depending on what security you have "
 "enabled, you might be required to enter a pin or passcode."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:12
+#. !!T
+#: content/pages/security.md:13
 #, no-wrap
 msgid "How do I unlock the bootloader?"
-msgstr ""
+msgstr "How do I unlock the bootloader?"
 
 #. type: Plain text
-#: content/pages/security.md:14
+#: content/pages/security.md:15
 msgid ""
 "If you are trying to flash a developer image or perform other developer "
 "related tasks, see the [developer site](http://developer.ubuntu.com/)"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:15
+#. !!T
+#: content/pages/security.md:16
 #, no-wrap
 msgid "How can I change my PIN/Passcode?"
-msgstr ""
+msgstr "How can I change my PIN/Passcode?"
 
 #. type: Plain text
-#: content/pages/security.md:17
+#: content/pages/security.md:18
 msgid ""
 "You can find these setting under the *System Settings* application. Select "
 "*Security & Privacy* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:18
+#. !!T
+#: 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 ""
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 
 #. type: Plain text
-#: content/pages/security.md:20
+#: 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:21
+#. !!T
+#: content/pages/security.md:22
 #, no-wrap
 msgid ""
 "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 
 #. type: Plain text
-#: content/pages/security.md:23
+#: content/pages/security.md:24
 msgid ""
 "You can find this setting under the *System Settings* application. Select "
 "*Security & Privacy*, then *Phone Locking* to adjust the *When locked, "
@@ -113,14 +116,14 @@
 "settings* option."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:24
+#. !!T
+#: content/pages/security.md:25
 #, no-wrap
 msgid "I forgot my passworde/security code. How can I unlock the phone?"
-msgstr ""
+msgstr "I forgot my passworde/security code. How can I unlock the phone?"
 
 #. type: Plain text
-#: content/pages/security.md:25
+#: content/pages/security.md:26
 msgid "TBD"
 msgstr ""
 
@@ -135,39 +138,39 @@
 msgid "*Curious about the application store?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:6
+#. !!T
+#: content/pages/store.md:7
 #, no-wrap
 msgid "How do I find and install new applications?"
-msgstr ""
+msgstr "How do I find and install new applications?"
 
 #. type: Plain text
-#: content/pages/store.md:8
+#: content/pages/store.md:9
 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 ""
 
-#. type: Title ###
-#: content/pages/store.md:9
+#. !!T
+#: content/pages/store.md:10
 #, no-wrap
 msgid "How can I browse the app store from my PC?"
-msgstr ""
+msgstr "How can I browse the app store from my PC?"
 
 #. type: Plain text
-#: content/pages/store.md:11
+#: content/pages/store.md:12
 msgid "At the moment, the app store is not able to be browsed from your pc."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:12
+#. !!T
+#: content/pages/store.md:13
 #, no-wrap
 msgid "How do I remove applications?"
-msgstr ""
+msgstr "How do I remove applications?"
 
 #. type: Plain text
-#: content/pages/store.md:13
+#: content/pages/store.md:14
 msgid ""
 "Search for the application you wish to remove inside the store. Open it and "
 "press the *Uninstall* button to remove the application."
@@ -184,107 +187,110 @@
 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:6
+#. !!T
+#: content/pages/basic.md:7
 #, no-wrap
 msgid "How do I play music?"
-msgstr ""
+msgstr "How do I play music?"
 
 #. type: Plain text
-#: content/pages/basic.md:8
-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 ""
-
-#. type: Title ###
 #: 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."
+
+#. !!T
+#: content/pages/basic.md:10
 #, no-wrap
 msgid "How do I play videos?"
-msgstr ""
+msgstr "How do I play videos?"
 
 #. type: Plain text
-#: content/pages/basic.md:11
-msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
-msgstr ""
-
-#. type: Title ###
 #: 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."
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:13
 #, no-wrap
 msgid "How do I take photos?"
-msgstr ""
+msgstr "How do I take photos?"
 
 #. type: Plain text
-#: content/pages/basic.md:14
+#: content/pages/basic.md:15
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:15
+#. !!T
+#: content/pages/basic.md:16
 #, no-wrap
 msgid "How do I record videos?"
-msgstr ""
+msgstr "How do I record videos?"
 
 #. type: Plain text
-#: content/pages/basic.md:17
+#: content/pages/basic.md:18
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:18
+#. !!T
+#: content/pages/basic.md:19
 #, no-wrap
 msgid "How do I see pictures I’ve taken?"
-msgstr ""
+msgstr "How do I see pictures I’ve taken?"
 
 #. type: Plain text
-#: content/pages/basic.md:20
+#: 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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:21
+#. !!T
+#: content/pages/basic.md:22
 #, no-wrap
 msgid "How can I send a text?"
-msgstr ""
+msgstr "How can I send a text?"
 
 #. type: Plain text
-#: content/pages/basic.md:23
+#: content/pages/basic.md:24
 msgid ""
 "The default messaging application allows you to send sms as well as mms "
 "messages."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:24
+#. !!T
+#: content/pages/basic.md:25
 #, no-wrap
 msgid "How do I make a call?"
-msgstr ""
+msgstr "How do I make a call?"
 
 #. type: Plain text
-#: content/pages/basic.md:26
+#: content/pages/basic.md:27
 msgid ""
 "The default dialer app lets you make calls using a contact or by dialing a "
 "number."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:27
+#. !!T
+#: content/pages/basic.md:28
 #, no-wrap
 msgid "How do I check recently made/missed calls?"
-msgstr ""
+msgstr "How do I check recently made/missed calls?"
 
 #. type: Plain text
-#: content/pages/basic.md:28
+#: content/pages/basic.md:29
 msgid ""
 "Swiping up from the bottom edge of the dialer app reveals the recent call "
 "list. You can also filter the list to include only missed calls."
@@ -306,43 +312,43 @@
 #: content/pages/faq.md:6
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:7
 #, no-wrap
 msgid "[User Interface]({filename}ui.md)"
-msgstr ""
+msgstr "[User Interface]({filename}ui.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[Settings]({filename}settings.md)"
-msgstr ""
+msgstr "[Settings]({filename}settings.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
 #, no-wrap
 msgid "[The Store]({filename}store.md)"
-msgstr ""
+msgstr "[The Store]({filename}store.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:10
 #, no-wrap
 msgid "[Apps]({filename}apps.md)"
-msgstr ""
+msgstr "[Apps]({filename}apps.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:11
 #, no-wrap
 msgid "[Scopes]({filename}scopes.md)"
-msgstr ""
+msgstr "[Scopes]({filename}scopes.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:12
 #, no-wrap
 msgid "[Security]({filename}security.md)"
-msgstr ""
+msgstr "[Security]({filename}security.fr.md)"
 
 #. type: Plain text
 #: content/pages/index.md:2
@@ -372,134 +378,6 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:10
-#, no-wrap
-msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:11
-#, no-wrap
-msgid "[Get in touch]({filename}get-in-touch.md)  \n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:2
-msgid "FAQ - Settings"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:4
-#, no-wrap
-msgid "*How do I change my phone settings?*\n"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:6
-msgid "[TOC]"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:7
-#, no-wrap
-msgid "How do I update my system?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:9
-msgid ""
-"Your device will prompt you when an update is ready. A notification will "
-"appear informing you of the new update. If you wish, you can manually check "
-"and perform an update yourself. Open the *System Settings* application. "
-"Select *Update*, and then click the check for updates button."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:10
-#, no-wrap
-msgid "How do I set the time / language?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:12
-msgid ""
-"Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:13
-#, no-wrap
-msgid "How can I change my wallpaper/background?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:15
-msgid ""
-"Open the *System Settings* application. Select the *Background* option. "
-"Press the *Add Image* button and choice your image to set as a background."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:16
-#, no-wrap
-msgid "How do I keep the screen on?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:18
-msgid ""
-"Open the *System Settings* application, and select the *Security & Privacy* "
-"option. Select the *Lock Phone* option, and then *Lock when idle*. St"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:19
-#, no-wrap
-msgid "How do I set up my accounts?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:21
-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 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*."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:22
-#, no-wrap
-msgid "How do I configure my notifications?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:24
-msgid ""
-"If you’re receiving too many notifications of your activity or want to "
-"change it for whatever reason, you can do so by going to the *System "
-"Settings* and selecting *Notifications*. From here you can toggle on/off "
-"notifications from any application on your device."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:25
-#, no-wrap
-msgid "How do I change the ringtone for calls and texts?"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:26
-msgid ""
-"You can change you ringtone for calls and texts to something new. Open the "
-"*System Settings* application, then select *Sound*. Under *Phone Calls* you "
-"will find your current ringtone. Tap it to open a page of ringtones to "
-"select from."
-msgstr ""
-
-#. type: Plain text
 #: content/pages/ui.md:2
 msgid "FAQ - User Interface"
 msgstr ""
@@ -512,56 +390,56 @@
 "place!*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:6
+#. !!T
+#: content/pages/ui.md:7
 #, no-wrap
 msgid "What is the dash?"
-msgstr ""
+msgstr "What is the dash?"
 
 #. type: Plain text
-#: content/pages/ui.md:8
+#: 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 ""
 
-#. type: Title ###
-#: content/pages/ui.md:9
+#. !!T
+#: content/pages/ui.md:10
 #, no-wrap
 msgid "What is the launcher?"
-msgstr ""
+msgstr "What is the launcher?"
 
 #. type: Plain text
-#: content/pages/ui.md:11
+#: content/pages/ui.md:12
 msgid ""
 "The launcher allows you to easily launch new applications. You can access "
 "the launcher at any time by swiping right from the left screen edge."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:12
+#. !!T
+#: content/pages/ui.md:13
 #, no-wrap
 msgid "What are the indicators?"
-msgstr ""
+msgstr "What are the indicators?"
 
 #. type: Plain text
-#: content/pages/ui.md:14
+#: content/pages/ui.md:15
 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 ""
 
-#. type: Title ###
-#: content/pages/ui.md:15
+#. !!T
+#: content/pages/ui.md:16
 #, no-wrap
 msgid "How do I switch applications?"
-msgstr ""
+msgstr "How do I switch applications?"
 
 #. type: Plain text
-#: content/pages/ui.md:18
+#: content/pages/ui.md:19
 msgid ""
 "To switch applications, slide your finger left from the right edge of the "
 "screen. If you slide quickly you will cycle through each application. "
@@ -570,57 +448,58 @@
 "dash."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:19
+#. !!T
+#: content/pages/ui.md:20
 #, no-wrap
 msgid "How do I close applications?"
-msgstr ""
+msgstr "How do I close applications?"
 
 #. type: Plain text
-#: content/pages/ui.md:21
-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."
-msgstr ""
-
-#. type: Title ###
 #: content/pages/ui.md:22
+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."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:23
 #, no-wrap
 msgid "How can I copy and paste?"
-msgstr ""
+msgstr "How can I copy and paste?"
 
 #. type: Plain text
-#: content/pages/ui.md:24
-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."
-msgstr ""
-
-#. type: Title ###
 #: content/pages/ui.md:25
+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."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:26
 #, no-wrap
 msgid ""
 "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
+"What are the small characters on the keyboard and how can I select them?"
 
 #. type: Plain text
-#: content/pages/ui.md:27
+#: content/pages/ui.md:28
 msgid ""
 "Tapping and hold a character on the keyboard brings up a menu allowing you "
 "to select secondary characters. This allows you to select things like "
 "numbers and accented characters. Give it a try!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:28
+#. !!T
+#: content/pages/ui.md:29
 #, no-wrap
 msgid "The keyboard behaves funny. What can I do about it?"
-msgstr ""
+msgstr "The keyboard behaves funny. What can I do about it?"
 
 #. type: Plain text
-#: content/pages/ui.md:30
+#: content/pages/ui.md:31
 msgid ""
 "From the Settings app, you can go to Keyboard and try unsetting the "
 "autocompletion feature, and/or the auto capitalize option. This way, you'll "
@@ -628,17 +507,17 @@
 "control of the input."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:31
+#. !!T
+#: content/pages/ui.md:32
 #, no-wrap
 msgid "What is the round circle for? What does it show? Can I configure it?"
-msgstr ""
+msgstr "What is the round circle for? What does it show? Can I configure it?"
 
 #. type: Plain text
-#: content/pages/ui.md:32
+#: content/pages/ui.md:33
 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."
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played."
 msgstr ""
 
 #. type: Plain text
@@ -655,105 +534,105 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:6
+#: content/pages/apps.md:8
 #, no-wrap
 msgid "Misc"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:8
+#. !!T
+#: content/pages/apps.md:10
 #, no-wrap
 msgid "Do you have Spotify?"
-msgstr ""
+msgstr "Do you have Spotify?"
 
 #. type: Plain text
-#: content/pages/apps.md:11
+#: content/pages/apps.md:13
 msgid ""
 "If you have a Spotify premium account, just install 'CuteSpotify' "
 "([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:12
+#. !!T
+#: content/pages/apps.md:14
 #, no-wrap
 msgid "Do you have Google Authenticator?"
-msgstr ""
+msgstr "Do you have Google Authenticator?"
 
 #. type: Plain text
-#: content/pages/apps.md:14
+#: content/pages/apps.md:16
 msgid "Sure, install the 'Authenticator' app from the software store."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:15
+#: content/pages/apps.md:17
 #, no-wrap
 msgid "Music"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:17
+#. !!T
+#: content/pages/apps.md:19
 #, no-wrap
 msgid "How do I add music to my device (usb/mtp, scp/rsync, download)?"
-msgstr ""
+msgstr "How do I add music to my device (usb/mtp, scp/rsync, download)?"
 
 #. type: Plain text
-#: content/pages/apps.md:19
+#: content/pages/apps.md:21
 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 "
+"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 ""
 
-#. type: Title ###
-#: content/pages/apps.md:20
+#. !!T
+#: content/pages/apps.md:22
 #, no-wrap
 msgid "What music formats are supported (flac, mp3 etc)?"
-msgstr ""
+msgstr "What music formats are supported (flac, mp3 etc)?"
 
 #. type: Plain text
-#: content/pages/apps.md:22
+#: content/pages/apps.md:24
 msgid "The music app supports ogg, flac and mp3 formats."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:23
+#: content/pages/apps.md:25
 #, no-wrap
 msgid "Contacts"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:25
+#. !!T
+#: content/pages/apps.md:27
 #, no-wrap
 msgid "How can I sync my Google contacts to my device?"
-msgstr ""
+msgstr "How can I sync my Google contacts to my device?"
 
 #. type: Plain text
-#: content/pages/apps.md:27
-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)."
-msgstr ""
-
-#. type: Title ##
 #: content/pages/apps.md:29
+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)."
+msgstr ""
+
+#. type: Title ##
+#: content/pages/apps.md:31
 #, no-wrap
 msgid "Gallery"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:31
+#. !!T
+#: content/pages/apps.md:33
 #, no-wrap
 msgid "How can I share photos?"
-msgstr ""
+msgstr "How can I share photos?"
 
 #. type: Plain text
-#: content/pages/apps.md:33
+#: content/pages/apps.md:35
 msgid ""
 "If you've just taken a picture, share it easily by swiping to the left from "
 "the right edge inside the camera app. Alternatively, use the gallery app to "
@@ -761,61 +640,61 @@
 "you wish to share your photo."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:34
+#. !!T
+#: content/pages/apps.md:36
 #, no-wrap
 msgid "How can I share video?"
-msgstr ""
+msgstr "How can I share video?"
 
 #. type: Plain text
-#: content/pages/apps.md:36
+#: content/pages/apps.md:38
 msgid ""
 "If you've just taken 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."
+"find the video. Once loaded, select *Share* from the menu and choose how you"
+" wish to share your video."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:38
+#: content/pages/apps.md:40
 #, no-wrap
 msgid "Camera"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:40
+#. !!T
+#: content/pages/apps.md:42
 #, no-wrap
 msgid "How can I take a picture?"
-msgstr ""
+msgstr "How can I take a picture?"
 
 #. type: Plain text
-#: content/pages/apps.md:42
+#: content/pages/apps.md:44
 msgid ""
 "Select the camera app from the launcher or app scope. Swipe up from the "
 "bottom edge of the phone for additional options. Enjoy taking your picture!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:43
+#. !!T
+#: content/pages/apps.md:45
 #, no-wrap
 msgid "How can I crop / rotate a picture?"
-msgstr ""
+msgstr "How can I crop / rotate a picture?"
 
 #. type: Plain text
-#: content/pages/apps.md:45
+#: content/pages/apps.md:47
 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 ""
 
-#. type: Title ###
-#: content/pages/apps.md:46
+#. !!T
+#: content/pages/apps.md:48
 #, no-wrap
 msgid "How can I take video?"
-msgstr ""
+msgstr "How can I take video?"
 
 #. type: Plain text
-#: content/pages/apps.md:48
+#: content/pages/apps.md:50
 msgid ""
 "Select the camera app from the launcher or app scope. Select the video icon "
 "on the bottom of the screen. Swipe up from the bottom edge of the phone for "
@@ -823,19 +702,19 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:49
+#: content/pages/apps.md:51
 #, no-wrap
 msgid "Clock"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:51
+#. !!T
+#: content/pages/apps.md:53
 #, no-wrap
 msgid "How do I set an alarm?"
-msgstr ""
+msgstr "How do I set an alarm?"
 
 #. type: Plain text
-#: content/pages/apps.md:54
+#: content/pages/apps.md:56
 msgid ""
 "Alarms are handled by the clock app. To add a new alarm, launch the clock "
 "app. Swipe up from the bottom, and tap on the “+” sign. Configure the time, "
@@ -848,43 +727,43 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:56
+#: content/pages/apps.md:58
 #, no-wrap
 msgid "HERE Maps"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:58
+#. !!T
+#: content/pages/apps.md:60
 #, no-wrap
 msgid "How can I get directions?"
-msgstr ""
+msgstr "How can I get directions?"
 
 #. type: Plain text
-#: content/pages/apps.md:60
+#: content/pages/apps.md:62
 msgid ""
 "Load the HERE maps application from the app scope. Open the menu and select "
 "*Directions*. Enter your destination and tap the *Get Directions* button."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:61
+#. !!T
+#: content/pages/apps.md:63
 #, no-wrap
 msgid "Can I navigate offline?"
-msgstr ""
+msgstr "Can I navigate offline?"
 
 #. type: Plain text
-#: content/pages/apps.md:63
+#: content/pages/apps.md:65
 msgid "Unfortunately navigation requires an active connection."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:64
+#. !!T
+#: content/pages/apps.md:66
 #, no-wrap
 msgid "Can I view the map offline?"
-msgstr ""
+msgstr "Can I view the map offline?"
 
 #. type: Plain text
-#: content/pages/apps.md:65
+#: content/pages/apps.md:67
 msgid ""
 "Yes, although parts of the map may be missing and search is disabled while "
 "offline."
@@ -926,29 +805,29 @@
 msgid "*Curious about scopes?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/scopes.md:6
+#. !!T
+#: content/pages/scopes.md:7
 #, no-wrap
 msgid "How do favorites work?"
-msgstr ""
+msgstr "How do favorites work?"
 
 #. type: Plain text
-#: content/pages/scopes.md: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 ""
 
-#. type: Title ###
-#: content/pages/scopes.md:9
+#. !!T
+#: content/pages/scopes.md:10
 #, no-wrap
 msgid "How do I add new scopes?"
-msgstr ""
+msgstr "How do I add new scopes?"
 
 #. type: Plain text
-#: content/pages/scopes.md:11
+#: 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 "
@@ -956,17 +835,166 @@
 "store button in the upper right to look for it in the ubuntu store."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/scopes.md:12
+#. !!T
+#: content/pages/scopes.md:13
 #, no-wrap
 msgid "How do I remove a scope?"
-msgstr ""
+msgstr "How do I remove a scope?"
 
 #. type: Plain text
-#: content/pages/scopes.md:13
+#: 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 ""
+
+#. {: .link-cta-ubuntu }
+#: content/pages/index.md:10
+#, no-wrap
+msgid "[Take me to the FAQ!]({filename}faq.md)"
+msgstr "[Take me to the FAQ!]({filename}faq.fr.md)"
+
+#. {: .link-cta-ubuntu }
+#: content/pages/index.md:11
+#, no-wrap
+msgid "[Get in touch]({filename}get-in-touch.md)"
+msgstr "[Get in touch]({filename}get-in-touch.fr.md)"
+
+#. type: Plain text
+#: content/pages/settings.md:2
+msgid "FAQ - Settings"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/settings.md:4
+#, no-wrap
+msgid "*How do I change my phone settings?*\n"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/security.md:6 content/pages/store.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 "[TOC]"
+
+#. !!T
+#: content/pages/settings.md:7
+#, no-wrap
+msgid "How do I update my system?"
+msgstr "How do I update my system?"
+
+#. type: Plain text
+#: content/pages/settings.md:9
+msgid ""
+"Your device will prompt you when an update is ready. A notification will "
+"appear informing you of the new update. If you wish, you can manually check "
+"and perform an update yourself. Open the *System Settings* application. "
+"Select *Update*, and then click the check for updates button."
+msgstr ""
+"Your device will prompt you when an update is ready. A notification will "
+"appear informing you of the new update. If you wish, you can manually check "
+"and perform an update yourself. Open the *System Settings* application. "
+"Select *Update*, and then click the check for updates button. !!T"
+
+#. !!T
+#: content/pages/settings.md:10
+#, no-wrap
+msgid "How do I set the time / language?"
+msgstr "How do I set the time / language?"
+
+#. !!T
+#: content/pages/settings.md:14
+#, no-wrap
+msgid "How can I change my wallpaper/background?"
+msgstr "How can I change my wallpaper/background?"
+
+#. type: Plain text
+#: content/pages/settings.md:16
+msgid ""
+"Open the *System Settings* application. Select the *Background* option. "
+"Press the *Add Image* button and choice your image to set as a background."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:17
+#, no-wrap
+msgid "How do I keep the screen on?"
+msgstr "How do I keep the screen on?"
+
+#. type: Plain text
+#: content/pages/settings.md:19
+msgid ""
+"Open the *System Settings* application, and select the *Security & Privacy* "
+"option. Select the *Lock Phone* option, and then *Lock when idle*. St"
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:20
+#, no-wrap
+msgid "How do I set up my accounts?"
+msgstr "How do I set up my accounts?"
+
+#. 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 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*."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:23
+#, no-wrap
+msgid "How do I configure my notifications?"
+msgstr "How do I configure my notifications?"
+
+#. type: Plain text
+#: content/pages/settings.md:25
+msgid ""
+"If you’re receiving too many notifications of your activity or want to "
+"change it for whatever reason, you can do so by going to the *System "
+"Settings* and selecting *Notifications*. From here you can toggle on/off "
+"notifications from any application on your device."
+msgstr ""
+
+#. !!T
+#: content/pages/settings.md:26
+#, no-wrap
+msgid "How do I change the ringtone for calls and texts?"
+msgstr "How do I change the ringtone for calls and texts?"
+
+#. type: Plain text
+#: content/pages/settings.md:27
+msgid ""
+"You can change you ringtone for calls and texts to something new. Open the "
+"*System Settings* application, then select *Sound*. Under *Phone Calls* you "
+"will find your current ringtone. Tap it to open a page of ringtones to "
+"select from."
+msgstr ""
+
+#. type: Plain text
+#: 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)"
+msgstr ""
+"Open the *System Settings* application. For the time, check out the *Time & "
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif) !!I"
+
+#~ msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
+#~ msgstr "[Take me to the FAQ!]({filename}faq.fr.md)  \n"
+
+#~ msgid "[Get in touch]({filename}get-in-touch.md)  \n"
+#~ msgstr "[Get in touch]({filename}get-in-touch.fr.md)  \n"
+
+#~ msgid ""
+#~ "Open the *System Settings* application. For the time, check out the *Time & "
+#~ "Date* section. For language, select *Language & Text*."
+#~ msgstr ""

=== modified file 'edit-here/po/help.pot'
--- edit-here/po/help.pot	2015-03-10 13:32:04 +0000
+++ edit-here/po/help.pot	2015-03-16 16:48:19 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-10 14:30+0100\n"
+"POT-Creation-Date: 2015-03-16 17:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -27,14 +27,21 @@
 msgid "*Wondering how to make your phone more secure?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:6
+#. type: Plain text
+#: content/pages/security.md:6 content/pages/store.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 ""
+
+#. !!T
+#: content/pages/security.md:7
 #, no-wrap
 msgid "How do I lock the phone?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:8
+#: content/pages/security.md:9
 msgid ""
 "Pressing the power button to turn off the phone will lock it. In addition, "
 "you can control how long your phone will stay unlocked when idle. You can "
@@ -42,47 +49,47 @@
 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:9
+#. !!T
+#: content/pages/security.md:10
 #, no-wrap
 msgid "How do I unlock the phone?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:11
+#: content/pages/security.md:12
 msgid ""
 "Swipe the screen to the left or right. Depending on what security you have "
 "enabled, you might be required to enter a pin or passcode."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:12
+#. !!T
+#: content/pages/security.md:13
 #, no-wrap
 msgid "How do I unlock the bootloader?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:14
+#: content/pages/security.md:15
 msgid ""
 "If you are trying to flash a developer image or perform other developer "
 "related tasks, see the [developer site](http://developer.ubuntu.com/)"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:15
+#. !!T
+#: content/pages/security.md:16
 #, no-wrap
 msgid "How can I change my PIN/Passcode?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:17
+#: content/pages/security.md:18
 msgid ""
 "You can find these setting under the *System Settings* application. Select "
 "*Security & Privacy* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:18
+#. !!T
+#: content/pages/security.md:19
 #, no-wrap
 msgid ""
 "Why do I have to type my PIN when using File Manager & Terminal (not default"
@@ -90,21 +97,21 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:20
+#: 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:21
+#. !!T
+#: content/pages/security.md:22
 #, no-wrap
 msgid ""
 "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:23
+#: content/pages/security.md:24
 msgid ""
 "You can find this setting under the *System Settings* application. Select "
 "*Security & Privacy*, then *Phone Locking* to adjust the *When locked, "
@@ -112,14 +119,14 @@
 "settings* option."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/security.md:24
+#. !!T
+#: content/pages/security.md:25
 #, no-wrap
 msgid "I forgot my passworde/security code. How can I unlock the phone?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:25
+#: content/pages/security.md:26
 msgid "TBD"
 msgstr ""
 
@@ -134,39 +141,39 @@
 msgid "*Curious about the application store?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:6
+#. !!T
+#: content/pages/store.md:7
 #, no-wrap
 msgid "How do I find and install new applications?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/store.md:8
+#: content/pages/store.md:9
 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:9
+#. !!T
+#: content/pages/store.md:10
 #, no-wrap
 msgid "How can I browse the app store from my PC?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/store.md:11
+#: content/pages/store.md:12
 msgid "At the moment, the app store is not able to be browsed from your pc."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/store.md:12
+#. !!T
+#: content/pages/store.md:13
 #, no-wrap
 msgid "How do I remove applications?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/store.md:13
+#: content/pages/store.md:14
 msgid ""
 "Search for the application you wish to remove inside the store. Open it and "
 "press the *Uninstall* button to remove the application."
@@ -183,107 +190,107 @@
 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:6
+#. !!T
+#: content/pages/basic.md:7
 #, no-wrap
 msgid "How do I play music?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:8
+#: 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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:9
+#. !!T
+#: content/pages/basic.md:10
 #, no-wrap
 msgid "How do I play videos?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:11
+#: 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:12
+#. !!T
+#: content/pages/basic.md:13
 #, no-wrap
 msgid "How do I take photos?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:14
+#: content/pages/basic.md:15
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:15
+#. !!T
+#: content/pages/basic.md:16
 #, no-wrap
 msgid "How do I record videos?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:17
+#: content/pages/basic.md:18
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/basic.md:18
+#. !!T
+#: content/pages/basic.md:19
 #, no-wrap
 msgid "How do I see pictures I’ve taken?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:20
+#: 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 "
 "app to find the picture."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:21
+#. !!T
+#: content/pages/basic.md:22
 #, no-wrap
 msgid "How can I send a text?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:23
+#: content/pages/basic.md:24
 msgid ""
 "The default messaging application allows you to send sms as well as mms "
 "messages."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:24
+#. !!T
+#: content/pages/basic.md:25
 #, no-wrap
 msgid "How do I make a call?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:26
+#: content/pages/basic.md:27
 msgid ""
 "The default dialer app lets you make calls using a contact or by dialing a "
 "number."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/basic.md:27
+#. !!T
+#: content/pages/basic.md:28
 #, no-wrap
 msgid "How do I check recently made/missed calls?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:28
+#: content/pages/basic.md:29
 msgid ""
 "Swiping up from the bottom edge of the dialer app reveals the recent call "
 "list. You can also filter the list to include only missed calls."
@@ -370,16 +377,16 @@
 msgid "Links to get in touch with experts and other community members"
 msgstr ""
 
-#. type: Plain text
+#. {: .link-cta-ubuntu }
 #: content/pages/index.md:10
 #, no-wrap
-msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
+msgid "[Take me to the FAQ!]({filename}faq.md)"
 msgstr ""
 
-#. type: Plain text
+#. {: .link-cta-ubuntu }
 #: content/pages/index.md:11
 #, no-wrap
-msgid "[Get in touch]({filename}get-in-touch.md)  \n"
+msgid "[Get in touch]({filename}get-in-touch.md)"
 msgstr ""
 
 #. type: Plain text
@@ -393,12 +400,7 @@
 msgid "*How do I change my phone settings?*\n"
 msgstr ""
 
-#. type: Plain text
-#: content/pages/settings.md:6
-msgid "[TOC]"
-msgstr ""
-
-#. type: Title ###
+#. !!T
 #: content/pages/settings.md:7
 #, no-wrap
 msgid "How do I update my system?"
@@ -413,53 +415,54 @@
 "Select *Update*, and then click the check for updates button."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/settings.md:10
 #, no-wrap
 msgid "How do I set the time / language?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/settings.md:12
+#: 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*."
+"Date* section. For language, select *Language & Text*.  "
+"![Icon]({filename}/images/settings.gif)"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/settings.md:13
+#. !!T
+#: content/pages/settings.md:14
 #, no-wrap
 msgid "How can I change my wallpaper/background?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/settings.md:15
+#: content/pages/settings.md:16
 msgid ""
 "Open the *System Settings* application. Select the *Background* option. "
 "Press the *Add Image* button and choice your image to set as a background."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/settings.md:16
+#. !!T
+#: content/pages/settings.md:17
 #, no-wrap
 msgid "How do I keep the screen on?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/settings.md:18
+#: content/pages/settings.md:19
 msgid ""
 "Open the *System Settings* application, and select the *Security & Privacy* "
 "option. Select the *Lock Phone* option, and then *Lock when idle*. St"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/settings.md:19
+#. !!T
+#: content/pages/settings.md:20
 #, no-wrap
 msgid "How do I set up my accounts?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/settings.md:21
+#: 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 "
@@ -468,14 +471,14 @@
 "Settings* app, under *Personal*, *Accounts*."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/settings.md:22
+#. !!T
+#: content/pages/settings.md:23
 #, no-wrap
 msgid "How do I configure my notifications?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/settings.md:24
+#: content/pages/settings.md:25
 msgid ""
 "If you’re receiving too many notifications of your activity or want to "
 "change it for whatever reason, you can do so by going to the *System "
@@ -483,14 +486,14 @@
 "notifications from any application on your device."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/settings.md:25
+#. !!T
+#: content/pages/settings.md:26
 #, no-wrap
 msgid "How do I change the ringtone for calls and texts?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/settings.md:26
+#: content/pages/settings.md:27
 msgid ""
 "You can change you ringtone for calls and texts to something new. Open the "
 "*System Settings* application, then select *Sound*. Under *Phone Calls* you "
@@ -511,14 +514,14 @@
 "place!*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:6
+#. !!T
+#: content/pages/ui.md:7
 #, no-wrap
 msgid "What is the dash?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:8
+#: 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 "
@@ -526,41 +529,41 @@
 "from the right screen edge."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:9
+#. !!T
+#: content/pages/ui.md:10
 #, no-wrap
 msgid "What is the launcher?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:11
+#: content/pages/ui.md:12
 msgid ""
 "The launcher allows you to easily launch new applications. You can access "
 "the launcher at any time by swiping right from the left screen edge."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:12
+#. !!T
+#: content/pages/ui.md:13
 #, no-wrap
 msgid "What are the indicators?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:14
+#: content/pages/ui.md:15
 msgid ""
 "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 ""
 
-#. type: Title ###
-#: content/pages/ui.md:15
+#. !!T
+#: content/pages/ui.md:16
 #, no-wrap
 msgid "How do I switch applications?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:18
+#: content/pages/ui.md:19
 msgid ""
 "To switch applications, slide your finger left from the right edge of the "
 "screen. If you slide quickly you will cycle through each application. "
@@ -569,14 +572,14 @@
 "dash."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:19
+#. !!T
+#: content/pages/ui.md:20
 #, no-wrap
 msgid "How do I close applications?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:21
+#: content/pages/ui.md:22
 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 "
@@ -584,42 +587,42 @@
 "application will disappear."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:22
+#. !!T
+#: content/pages/ui.md:23
 #, no-wrap
 msgid "How can I copy and paste?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:24
+#: content/pages/ui.md:25
 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:25
+#. !!T
+#: content/pages/ui.md:26
 #, no-wrap
 msgid ""
 "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:27
+#: content/pages/ui.md:28
 msgid ""
 "Tapping and hold a character on the keyboard brings up a menu allowing you "
 "to select secondary characters. This allows you to select things like "
 "numbers and accented characters. Give it a try!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:28
+#. !!T
+#: content/pages/ui.md:29
 #, no-wrap
 msgid "The keyboard behaves funny. What can I do about it?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:30
+#: content/pages/ui.md:31
 msgid ""
 "From the Settings app, you can go to Keyboard and try unsetting the "
 "autocompletion feature, and/or the auto capitalize option. This way, you'll "
@@ -627,14 +630,14 @@
 "control of the input."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/ui.md:31
+#. !!T
+#: content/pages/ui.md:32
 #, no-wrap
 msgid "What is the round circle for? What does it show? Can I configure it?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/ui.md:32
+#: content/pages/ui.md:33
 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."
@@ -654,49 +657,49 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:6
+#: content/pages/apps.md:8
 #, no-wrap
 msgid "Misc"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:8
+#. !!T
+#: content/pages/apps.md:10
 #, no-wrap
 msgid "Do you have Spotify?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:11
+#: content/pages/apps.md:13
 msgid ""
 "If you have a Spotify premium account, just install 'CuteSpotify' "
 "([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:12
+#. !!T
+#: content/pages/apps.md:14
 #, no-wrap
 msgid "Do you have Google Authenticator?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:14
+#: content/pages/apps.md:16
 msgid "Sure, install the 'Authenticator' app from the software store."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:15
+#: content/pages/apps.md:17
 #, no-wrap
 msgid "Music"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:17
+#. !!T
+#: content/pages/apps.md:19
 #, no-wrap
 msgid "How do I add music to my device (usb/mtp, scp/rsync, download)?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:19
+#: content/pages/apps.md:21
 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"
@@ -706,31 +709,31 @@
 "another application."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:20
+#. !!T
+#: content/pages/apps.md:22
 #, no-wrap
 msgid "What music formats are supported (flac, mp3 etc)?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:22
+#: content/pages/apps.md:24
 msgid "The music app supports ogg, flac and mp3 formats."
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:23
+#: content/pages/apps.md:25
 #, no-wrap
 msgid "Contacts"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:25
+#. !!T
+#: content/pages/apps.md:27
 #, no-wrap
 msgid "How can I sync my Google contacts to my device?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:27
+#: content/pages/apps.md:29
 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 "
@@ -740,19 +743,19 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:29
+#: content/pages/apps.md:31
 #, no-wrap
 msgid "Gallery"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:31
+#. !!T
+#: content/pages/apps.md:33
 #, no-wrap
 msgid "How can I share photos?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:33
+#: content/pages/apps.md:35
 msgid ""
 "If you've just taken a picture, share it easily by swiping to the left from "
 "the right edge inside the camera app. Alternatively, use the gallery app to "
@@ -760,14 +763,14 @@
 "you wish to share your photo."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:34
+#. !!T
+#: content/pages/apps.md:36
 #, no-wrap
 msgid "How can I share video?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:36
+#: content/pages/apps.md:38
 msgid ""
 "If you've just taken a video, share it easily by swiping to the left from "
 "the right edge inside the camera app. Alternatively, use the gallery app to "
@@ -776,45 +779,45 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:38
+#: content/pages/apps.md:40
 #, no-wrap
 msgid "Camera"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:40
+#. !!T
+#: content/pages/apps.md:42
 #, no-wrap
 msgid "How can I take a picture?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:42
+#: content/pages/apps.md:44
 msgid ""
 "Select the camera app from the launcher or app scope. Swipe up from the "
 "bottom edge of the phone for additional options. Enjoy taking your picture!"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:43
+#. !!T
+#: content/pages/apps.md:45
 #, no-wrap
 msgid "How can I crop / rotate a picture?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:45
+#: content/pages/apps.md:47
 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."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:46
+#. !!T
+#: content/pages/apps.md:48
 #, no-wrap
 msgid "How can I take video?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:48
+#: content/pages/apps.md:50
 msgid ""
 "Select the camera app from the launcher or app scope. Select the video icon "
 "on the bottom of the screen. Swipe up from the bottom edge of the phone for "
@@ -822,19 +825,19 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:49
+#: content/pages/apps.md:51
 #, no-wrap
 msgid "Clock"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:51
+#. !!T
+#: content/pages/apps.md:53
 #, no-wrap
 msgid "How do I set an alarm?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:54
+#: content/pages/apps.md:56
 msgid ""
 "Alarms are handled by the clock app. To add a new alarm, launch the clock "
 "app. Swipe up from the bottom, and tap on the “+” sign. Configure the time, "
@@ -847,43 +850,43 @@
 msgstr ""
 
 #. type: Title ##
-#: content/pages/apps.md:56
+#: content/pages/apps.md:58
 #, no-wrap
 msgid "HERE Maps"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:58
+#. !!T
+#: content/pages/apps.md:60
 #, no-wrap
 msgid "How can I get directions?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:60
+#: content/pages/apps.md:62
 msgid ""
 "Load the HERE maps application from the app scope. Open the menu and select "
 "*Directions*. Enter your destination and tap the *Get Directions* button."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:61
+#. !!T
+#: content/pages/apps.md:63
 #, no-wrap
 msgid "Can I navigate offline?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:63
+#: content/pages/apps.md:65
 msgid "Unfortunately navigation requires an active connection."
 msgstr ""
 
-#. type: Title ###
-#: content/pages/apps.md:64
+#. !!T
+#: content/pages/apps.md:66
 #, no-wrap
 msgid "Can I view the map offline?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:65
+#: content/pages/apps.md:67
 msgid ""
 "Yes, although parts of the map may be missing and search is disabled while "
 "offline."
@@ -925,14 +928,14 @@
 msgid "*Curious about scopes?*\n"
 msgstr ""
 
-#. type: Title ###
-#: content/pages/scopes.md:6
+#. !!T
+#: content/pages/scopes.md:7
 #, no-wrap
 msgid "How do favorites work?"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/scopes.md:8
+#: content/pages/scopes.md:9