Merge lp:~dpm/help-app/metadata-fixes into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[David Planella]

With this branch, Pelican metadata in the original markdown files is now preserved in the translated markdown files. This allows specifying more metadata, including customized one. An example is the ability to specify the template to use when building the final HTML files, so that it can be different than the 'page' default.

This would be useful to build the index pages for the web and app themes, and would allow us to drop the JavaScript code that does all the inserting of multiple pages into one for the app theme.

I've added metadata to the faq.md file, including a custom 'Sortorder' key to show how it works.

Notes:
- I'm not a regex expert, perhaps the part that extracts metadata from the original markdown could be done in a cleverer way
- This branch relies on the facts that:
  a) Metadata is at the start of the file
  b) The title line is always the first line of the file (which Pelican seems to rely on too)
  c) When manipulating the original markdown files, as markdown does not support line breaks too well (unless explicitly marked as two trailing spaces at the end of a line), the metadata is rolled into one single line. I've noticed that if a metadata line is finished by a colon (.), that is no longer the case, which might bring some problems. But I think it's fair to assume that we won't be using colons for metadata.

[Daniel Holbach (dholbach)]

Please have a look at https://code.launchpad.net/~dholbach/help-app/metadata-fixes.fixes/+merge/253646

review: Needs Fixing

[Daniel Holbach (dholbach)]

This could generally be broken up a little bit and have a few more tests, which is something we can deal with separately and I'm happy to look into. The MP above should make your branch good for inclusion.

Thanks a lot for your work on this!

[lp:~dpm/help-app/metadata-fixes]

121. By David Planella on 2015-03-20

Merged fixes from dholbach

Unmerged revisions

121. By David Planella on 2015-03-20

Merged fixes from dholbach

120. By David Planella on 2015-03-20

Added some custom metadata to the FAQ page

119. By David Planella on 2015-03-20

Updated translation template

118. By David Planella on 2015-03-20

Metadata should not contain colons, it gets either python-markdown or po4a confused

117. By David Planella on 2015-03-20

Preserve the metadata added to the original markdown files when writing their translated versions

=== modified file 'content/pages/faq.md'
--- content/pages/faq.md	2015-03-19 08:33:13 +0000
+++ content/pages/faq.md	2015-03-20 07:04:51 +0000
@@ -1,4 +1,6 @@
-Title: Get your questions answered.
+Title: Get your questions answered
+Sortorder: 20
+Template: page
 
 We divided the questions up into categories, so you can spot yours more
 easily. Here we go:

=== modified file 'internals/translations/build.py'
--- internals/translations/build.py	2015-03-19 17:23:39 +0000
+++ internals/translations/build.py	2015-03-20 07:04:51 +0000
@@ -4,6 +4,7 @@
 import re
 import shutil
 import subprocess
+from collections import OrderedDict
 
 from translations.utils import (
     find_bcp47_code,
@@ -112,7 +113,9 @@
 
     def replace_title_lines(self):
         for entry, first_line in self.find_title_lines():
-            if entry.msgid != first_line:
+            if entry.msgid.startswith(first_line):
+                entry.msgid = first_line
+            else:
                 print('Title line "%s" found, but not on the first line '
                       'of "%s".' % (entry.msgid, entry.linenum))
                 return False
@@ -154,7 +157,7 @@
     def __init__(self, po4a):
         self.fake_lang_code = 'en_US'
         self.fake_po_fn = normalise_path(
-            os.path.join(TRANSLATIONS_DIR, 
+            os.path.join(TRANSLATIONS_DIR,
                          '%s.po' % self.fake_lang_code))
         self.pot_fn = normalise_path(os.path.join(TRANSLATIONS_DIR,
                                                   'help.pot'))
@@ -258,14 +261,30 @@
             po.langs[po_fn]['pofile'].readd_attr_list_statements()
             for doc_fn in self.docs:
                 output = self._call_po4a_translate(doc_fn, po_fn, po4a)
-                title_line = output.split('\n')[0].split('Title: ')[1]
+
+                # Extract the metadata from the first line
+                first_line = output.split('\n')[0]
+                metadata_keys = re.findall(r'\w+:', first_line)
+                metadata_values = re.split(r'[\s]?\w+:\s', first_line)[1:]
+                metadata = OrderedDict(zip(metadata_keys, metadata_values))
+
+                # Replace the title string by its translated version
                 translated_title_line = po.find_translated_title_line(
-                    title_line, po_fn)
-                output = '\n'.join([line for line in output.split('\n')][1:])
-                new_path = full_path(self.translated_doc_fn(
-                    doc_fn, po.langs[po_fn]['bcp47']))
-                text = "Title: %s\nDate:\n\n" % (translated_title_line)
-                text += output
+                    metadata['Title:'], po_fn)
+                metadata['Title:'] = translated_title_line
+
+                # Remove the metadata line
+                content = '\n'.join([line for line in output.split('\n')][1:])
+                new_path = self.translated_doc_fn(doc_fn,
+                                                  po.langs[po_fn]['bcp47'])
+
+                # Flatten the metadata dict into a string
+                metadata_serialized = '\n'.join("{} {}".format(key, val)
+                    for (key, val) in metadata.items())
+
+                # Join the metadata and content into the final,
+                # translated markdown text
+                text = metadata_serialized + '\n' + content
                 if os.path.exists(new_path):
                     os.remove(new_path)
                 if not os.path.exists(os.path.dirname(new_path)):

=== modified file 'po/help.pot'
--- po/help.pot	2015-03-19 14:41:33 +0000
+++ po/help.pot	2015-03-20 07:04:51 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-19 15:41+0100\n"
+"POT-Creation-Date: 2015-03-20 07:43+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"
@@ -18,7 +18,7 @@
 
 #. type: Plain text
 #: content/pages/security.md:2
-msgid "Title: Security"
+msgid "Security"
 msgstr ""
 
 #. type: Plain text
@@ -28,14 +28,16 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/security.md:6 content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7 content/pages/scopes.md:6
+#: content/pages/security.md:6 content/pages/apps.md:7
+#: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/basic.md:6
+#: content/pages/scopes.md:6
 msgid "[TOC]"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/security.md:7
 #, no-wrap
-msgid "How do I lock the phone? !!T"
+msgid "How do I lock the phone?"
 msgstr ""
 
 #. type: Plain text
@@ -47,10 +49,10 @@
 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/security.md:10
 #, no-wrap
-msgid "How do I unlock the phone? !!T"
+msgid "How do I unlock the phone?"
 msgstr ""
 
 #. type: Plain text
@@ -60,10 +62,10 @@
 "enabled, you might be required to enter a pin or passcode."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/security.md:13
 #, no-wrap
-msgid "How do I unlock the bootloader? !!T"
+msgid "How do I unlock the bootloader?"
 msgstr ""
 
 #. type: Plain text
@@ -73,10 +75,10 @@
 "related tasks, see the [developer site](http://developer.ubuntu.com/)"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/security.md:16
 #, no-wrap
-msgid "How can I change my PIN/Passcode? !!T"
+msgid "How can I change my PIN/Passcode?"
 msgstr ""
 
 #. type: Plain text
@@ -86,12 +88,12 @@
 "*Security & Privacy* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. type: Title ###
+#. !!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)? !!T"
+"Why do I have to type my PIN when using File Manager & Terminal (not default"
+" apps)?"
 msgstr ""
 
 #. type: Plain text
@@ -101,10 +103,11 @@
 "pin/passcode is required. This is for your phone security."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/security.md:22
 #, no-wrap
-msgid "How can I stop someone using the indicators when the phone is unlocked? !!T"
+msgid ""
+"How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -116,10 +119,10 @@
 "settings* option."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/security.md:25
 #, no-wrap
-msgid "I forgot my password or passcode. How can I unlock the phone? !!T"
+msgid "I forgot my password or passcode. How can I unlock the phone?"
 msgstr ""
 
 #. type: Plain text
@@ -128,548 +131,8 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/basic.md:2
-msgid "Title: Basic tasks"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:4
-#, no-wrap
-msgid "*If you are wondering how to perform basic tasks, look here.*\n"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/basic.md:7
-#, no-wrap
-msgid "How do I play music? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:9
-msgid ""
-"The music app let's you play music copied to the device. In addition, "
-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
-"music."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/basic.md:10
-#, no-wrap
-msgid "How do I play videos? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:12
-msgid ""
-"The media player application will play videos copied to the device. You will "
-"also find applications like youtube that give you streaming options."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/basic.md:13
-#, no-wrap
-msgid "How do I take photos? !!T"
-msgstr ""
-
-#. type: Plain text
-#: 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:16
-#, no-wrap
-msgid "How do I take a screenshot? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:18
-msgid ""
-"Press the Volume Up and Volume Down buttons at the same time until you see "
-"the screen flashing. The screenshot will capture what is on your screen, and "
-"you can see the resulting picture in the Gallery app or the Photos scope."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/basic.md:19
-#, no-wrap
-msgid "How do I see pictures I’ve taken? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:21
-msgid ""
-"If you've just taken a picture, you can see it easily by swiping to the left "
-"from the right edge inside the camera app. Alternatively, use the gallery "
-"app to find the picture."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/basic.md:22
-#, no-wrap
-msgid "How do I record videos? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:24
-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:25
-#, no-wrap
-msgid "How can I send a text? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:27
-msgid ""
-"The default messaging application allows you to send sms as well as mms "
-"messages."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/basic.md:28
-#, no-wrap
-msgid "How do I make a call? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:30
-msgid ""
-"The default dialer app lets you make calls using a contact or by dialing a "
-"number."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/basic.md:31
-#, no-wrap
-msgid "How do I check recently made/missed calls? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/basic.md:32
-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."
-msgstr ""
-
-#. type: Plain text
-#: content/pages/faq.md:2
-msgid "Title: Get your questions answered."
-msgstr ""
-
-#. type: Plain text
-#: content/pages/faq.md:5
-msgid ""
-"We divided the questions up into categories, so you can spot yours more "
-"easily. Here we go:"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:6
-#, no-wrap
-msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:7
-#, no-wrap
-msgid "[User Interface]({filename}ui.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:8
-#, no-wrap
-msgid "[Settings]({filename}settings.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:9
-#, no-wrap
-msgid "[Apps]({filename}apps.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:10
-#, no-wrap
-msgid "[Scopes]({filename}scopes.md)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/faq.md:11
-#, no-wrap
-msgid "[Security]({filename}security.md)"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:2
-msgid "Title: Welcome"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:5
-msgid ""
-"The world-wide Ubuntu community wants to give you the best possible "
-"experience on your Ubuntu device. This is why we collected:"
-msgstr ""
-
-#. type: Bullet: '  * '
-#: content/pages/index.md:9
-msgid "Answers to frequently asked questions"
-msgstr ""
-
-#. type: Bullet: '  * '
-#: content/pages/index.md:9
-msgid "Tips and tricks to make you more productive"
-msgstr ""
-
-#. type: Bullet: '  * '
-#: content/pages/index.md:9
-msgid "Links to get in touch with experts and other community members"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:11
-msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/index.md:12
-msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:2
-msgid "Title: Settings"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/settings.md:4
-#, no-wrap
-msgid "*How do I change my phone settings?*\n"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/settings.md:7
-#, no-wrap
-msgid "How do I update my system? !!T"
-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? !!T"
-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 ""
-
-#. type: Title ###
-#: content/pages/settings.md:14
-#, no-wrap
-msgid "How can I change my wallpaper/background? !!T"
-msgstr ""
-
-#. 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 ""
-
-#. type: Title ###
-#: content/pages/settings.md:17
-#, no-wrap
-msgid "How do I keep the screen on? !!T"
-msgstr ""
-
-#. 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 ""
-
-#. type: Title ###
-#: content/pages/settings.md:20
-#, no-wrap
-msgid "How do I set up my accounts? !!T"
-msgstr ""
-
-#. 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 ""
-
-#. type: Title ###
-#: content/pages/settings.md:23
-#, no-wrap
-msgid "How do I configure my notifications? !!T"
-msgstr ""
-
-#. 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 ""
-
-#. type: Title ###
-#: content/pages/settings.md:26
-#, no-wrap
-msgid "How do I change the ringtone for calls and texts? !!T"
-msgstr ""
-
-#. 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/ui.md:2
-msgid "Title: User Interface"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:4
-#, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:7
-#, no-wrap
-msgid "What is the dash? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:9
-msgid ""
-"The dash contains a list of applications installed on the device, along with "
-"presenting the scopes and store. The dash is the first thing you see when "
-"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:10
-#, no-wrap
-msgid "What is the launcher? !!T"
-msgstr ""
-
-#. type: Plain text
-#: 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:13
-#, no-wrap
-msgid "How can I customize the launcher? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:16
-msgid ""
-"To pin a running app permanently to the launcher, long-press it to reveal "
-"the context menu and choose the Pin to launcher option. You can do the same "
-"to unpin apps.  You can also move launcher icons around by long-pressing "
-"them and dragging and dropping them to the position you'd like them to be "
-"in."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:17
-#, no-wrap
-msgid "What are the indicators? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:19
-msgid ""
-"Indicators convey quick useful information about your device, like the time, "
-"data connection, location, sound, and notifications. You can access the "
-"indicators at any time by swiping down from the top screen edge."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:20
-#, no-wrap
-msgid "How do I switch applications? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:23
-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. 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."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:24
-#, no-wrap
-msgid "How do I close applications? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:26
-msgid ""
-"To close an application, slide your finger *slowly* left from the right edge "
-"of the screen. An application switcher will appear. Place your finger on the "
-"application preview you wish to close and swipe up or down. The application "
-"will disappear."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:27
-#, no-wrap
-msgid "How can I copy and paste? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:29
-msgid ""
-"For text that can be copied and pasted, press and hold the text in "
-"question. A menu will appear allowing you to cut, copy and paste."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:30
-#, no-wrap
-msgid "What are the small characters on the keyboard and how can I select them? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:32
-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:33
-#, no-wrap
-msgid "The keyboard behaves funny. What can I do about it? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:35
-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 "
-"still receive suggestions on the words you're writing, while having full "
-"control of the input."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:36
-#, no-wrap
-msgid "How can I add a new keyboard language? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:39
-msgid ""
-"Adding a new keyboard language will enable you to type specific characters "
-"that might not be available in other keyboards and (if available) use word "
-"prediction and spell checking for that new language.  Go to the Settings "
-"app, tap on Language/Text and then on Keyboard layouts. From there, you can "
-"then tick the keyboard you want to add and then [use "
-"it](#how-can-i-switch-between-keyboard-languages)"
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:40
-#, no-wrap
-msgid "How can I switch between keyboard languages? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:43
-msgid ""
-"While typing on the keyboard, tap on the globe icon near the bottom left "
-"corner. A new pop-up will appear, where you can select the new keyboard you "
-"want to switch to.  You can do this to switch back and forth between "
-"keyboards in different languages. [Make sure the language you want is "
-"activated it in the Settings app](#how-can-i-add-a-new-keyboard-language)."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:44
-#, no-wrap
-msgid "How can I type Emoji icons? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:47
-msgid ""
-"[Learn wow to switch between keyboard "
-"languages](#how-can-i-switch-between-keyboard-languages) to alternate "
-"between the regular keyboard and the Emoji keyboard. Once done with typing "
-"Emojis, you can switch back to the regular keyboard.  If you can't see the "
-"Emoji keyboard, make sure you've [activated it in the Settings "
-"app](#how-can-i-add-a-new-keyboard-language)."
-msgstr ""
-
-#. type: Title ###
-#: content/pages/ui.md:48
-#, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it? !!T"
-msgstr ""
-
-#. type: Plain text
-#: content/pages/ui.md:49
-msgid ""
-"The round circle is the infographic. It hows you recent phone activity, like "
-"the number of messages received or the number of songs played. You can "
-"disable it by launching the *Settings* app, navigating to *Security and "
-"privacy* and unticking *Stats on Welcome screen*."
-msgstr ""
-
-#. type: Plain text
 #: content/pages/apps.md:2
-msgid "Title: Apps"
+msgid "Apps"
 msgstr ""
 
 #. type: Plain text
@@ -686,24 +149,24 @@
 msgid "The Store"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:10
 #, no-wrap
-msgid "How do I find and install new scopes and applications? !!T"
+msgid "How do I find and install new scopes and applications?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/apps.md:12
 msgid ""
 "From the Apps scope, you can either tap on the “search” icon on the right "
-"and start searching by name, or you can go all the way down in the scope and "
-"tap on the Ubuntu Store icon."
+"and start searching by name, or you can go all the way down in the scope and"
+" tap on the Ubuntu Store icon."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:13
 #, no-wrap
-msgid "How can I browse the store from my PC? !!T"
+msgid "How can I browse the store from my PC?"
 msgstr ""
 
 #. type: Plain text
@@ -714,19 +177,19 @@
 "store](https://appstore.bhdouglass.com/apps)."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:16
 #, no-wrap
-msgid "How do I remove scopes and applications? !!T"
+msgid "How do I remove scopes and applications?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/apps.md:18
 msgid ""
-"Search for the scope or application you wish to remove inside the "
-"store. Open it and press the *Uninstall* button to remove the "
-"application. Alternatively, for applications you can also long-press their "
-"icons on the dash to show their store page and the *Uninstall* button."
+"Search for the scope or application you wish to remove inside the store. "
+"Open it and press the *Uninstall* button to remove the application. "
+"Alternatively, for applications you can also long-press their icons on the "
+"dash to show their store page and the *Uninstall* button."
 msgstr ""
 
 #. type: Title ##
@@ -735,10 +198,10 @@
 msgid "Misc"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:21
 #, no-wrap
-msgid "Do you have Spotify? !!T"
+msgid "Do you have Spotify?"
 msgstr ""
 
 #. type: Plain text
@@ -748,10 +211,10 @@
 "([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:25
 #, no-wrap
-msgid "Do you have Google Authenticator? !!T"
+msgid "Do you have Google Authenticator?"
 msgstr ""
 
 #. type: Plain text
@@ -765,27 +228,27 @@
 msgid "Music"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:30
 #, no-wrap
-msgid "How do I add music to my device? !!T"
+msgid "How do I add music to my device?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/apps.md:32
 msgid ""
 "You can add music in multiple ways. If you have pre-existing music files, "
-"simply connect your phone to your pc via the usb cable. Next, copy the music "
-"you wish to listen to to the *Music* folder. Your music will appear in the "
+"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 ###
+#. !!T
 #: content/pages/apps.md:33
 #, no-wrap
-msgid "What music formats are supported? !!T"
+msgid "What music formats are supported?"
 msgstr ""
 
 #. type: Plain text
@@ -793,10 +256,10 @@
 msgid "The music app supports OGG, FLAG and MP3 formats."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:36
 #, no-wrap
-msgid "How do I listen to podcasts? !!!T"
+msgid "How do I listen to podcasts? !"
 msgstr ""
 
 #. type: Plain text
@@ -812,20 +275,20 @@
 msgid "Contacts"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:41
 #, no-wrap
-msgid "How can I sync my Google contacts to my device? !!T"
+msgid "How can I sync my Google contacts to my device?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/apps.md:43
 msgid ""
-"The first time you open the Contacts app you’ll be asked if you want to sync "
-"contacts with your Google account. If you have answered “no” but change your "
-"mind later, you can do so by going to the Today scope, and setting up your "
-"Google account there. After that you can sync your contacts (and, if you "
-"want, calendar events as well)."
+"The first time you open the Contacts app you’ll be asked if you want to sync"
+" contacts with your Google account. If you have answered “no” but change "
+"your mind later, you can do so by going to the Today scope, and setting up "
+"your Google account there. After that you can sync your contacts (and, if "
+"you want, calendar events as well)."
 msgstr ""
 
 #. type: Title ##
@@ -834,10 +297,10 @@
 msgid "Gallery"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:46
 #, no-wrap
-msgid "How can I share photos? !!T"
+msgid "How can I share photos?"
 msgstr ""
 
 #. type: Plain text
@@ -849,19 +312,19 @@
 "you wish to share your photo."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:49
 #, no-wrap
-msgid "How can I share videos? !!T"
+msgid "How can I share videos?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/apps.md:51
 msgid ""
-"If you've just recorded a video, share it easily by swiping to the left from "
-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
-"find the video. Once loaded, select *Share* from the menu and choose how you "
-"wish to share your video."
+"If you've just recorded a video, share it easily by swiping to the left from"
+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
+" find the video. Once loaded, select *Share* from the menu and choose how "
+"you wish to share your video."
 msgstr ""
 
 #. type: Title ##
@@ -870,10 +333,10 @@
 msgid "Camera"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:54
 #, no-wrap
-msgid "How can I take a picture? !!T"
+msgid "How can I take a picture?"
 msgstr ""
 
 #. type: Plain text
@@ -883,31 +346,31 @@
 "bottom edge of the phone for additional options. Enjoy taking your picture!"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:57
 #, no-wrap
-msgid "How can I crop / rotate a picture? !!T"
+msgid "How can I crop / rotate a picture?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/apps.md:59
 msgid ""
-"Use the gallery app to select your picture. Select the *Edit* button next to "
-"the menu. Inside you'll find options to crop and rotate your picture."
+"Use the gallery app to select your picture. Select the *Edit* button next to"
+" the menu. Inside you'll find options to crop and rotate your picture."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:60
 #, no-wrap
-msgid "How can I record video? !!T"
+msgid "How can I record video?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/apps.md:62
 msgid ""
-"Select the Camera app from the launcher or apps scope. Select the video icon "
-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
-"additional options. Enjoy taking your video!"
+"Select the Camera app from the launcher or apps scope. Select the video icon"
+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
+" additional options. Enjoy taking your video!"
 msgstr ""
 
 #. type: Title ##
@@ -916,10 +379,10 @@
 msgid "Clock"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:65
 #, no-wrap
-msgid "How do I set an alarm? !!T"
+msgid "How do I set an alarm?"
 msgstr ""
 
 #. type: Plain text
@@ -941,10 +404,10 @@
 msgid "HERE Maps"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:71
 #, no-wrap
-msgid "How can I get directions? !!T"
+msgid "How can I get directions?"
 msgstr ""
 
 #. type: Plain text
@@ -954,10 +417,10 @@
 "*Directions*. Enter your destination and tap the *Get Directions* button."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:74
 #, no-wrap
-msgid "Can I navigate offline? !!T"
+msgid "Can I navigate offline?"
 msgstr ""
 
 #. type: Plain text
@@ -965,10 +428,10 @@
 msgid "Unfortunately navigation requires an active connection."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/apps.md:77
 #, no-wrap
-msgid "Can I view the map offline? !!T"
+msgid "Can I view the map offline?"
 msgstr ""
 
 #. type: Plain text
@@ -979,8 +442,120 @@
 msgstr ""
 
 #. type: Plain text
+#: content/pages/settings.md:2
+msgid "Settings"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/settings.md:4
+#, no-wrap
+msgid "*How do I change my phone settings?*\n"
+msgstr ""
+
+#. !!T
+#: 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 ""
+
+#. !!T
+#: content/pages/settings.md:10
+#, no-wrap
+msgid "How do I set the time / language?"
+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 ""
+
+#. !!T
+#: content/pages/settings.md:14
+#, no-wrap
+msgid "How can I change my wallpaper/background?"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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/get-in-touch.md:2
-msgid "Title: Get in touch"
+msgid "Get in touch"
 msgstr ""
 
 #. type: Plain text
@@ -1004,8 +579,435 @@
 msgstr ""
 
 #. type: Plain text
+#: content/pages/index.md:2
+msgid "Welcome"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:5
+msgid ""
+"The world-wide Ubuntu community wants to give you the best possible "
+"experience on your Ubuntu device. This is why we collected:"
+msgstr ""
+
+#. type: Bullet: '  * '
+#: content/pages/index.md:9
+msgid "Answers to frequently asked questions"
+msgstr ""
+
+#. type: Bullet: '  * '
+#: content/pages/index.md:9
+msgid "Tips and tricks to make you more productive"
+msgstr ""
+
+#. type: Bullet: '  * '
+#: content/pages/index.md:9
+msgid "Links to get in touch with experts and other community members"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:11
+msgid "[Take me to the FAQ!]({filename}faq.md)"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/index.md:12
+msgid "[Get in touch]({filename}get-in-touch.md)"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/faq.md:2
+msgid "Get your questions answered"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/faq.md:5
+msgid ""
+"We divided the questions up into categories, so you can spot yours more "
+"easily. Here we go:"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:6
+#, no-wrap
+msgid "[First day tasks]({filename}basic.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:7
+#, no-wrap
+msgid "[User Interface]({filename}ui.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:8
+#, no-wrap
+msgid "[Settings]({filename}settings.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:9
+#, no-wrap
+msgid "[Apps]({filename}apps.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:10
+#, no-wrap
+msgid "[Scopes]({filename}scopes.md)"
+msgstr ""
+
+#. type: Title ###
+#: content/pages/faq.md:11
+#, no-wrap
+msgid "[Security]({filename}security.md)"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:2
+msgid "User Interface"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:4
+#, no-wrap
+msgid ""
+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
+" place!*\n"
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:7
+#, no-wrap
+msgid "What is the dash?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:9
+msgid ""
+"The dash contains a list of applications installed on the device, along with"
+" presenting the scopes and store. The dash is the first thing you see when "
+"booting the phone. You can switch to it again at any time by swiping left "
+"from the right screen edge."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:10
+#, no-wrap
+msgid "What is the launcher?"
+msgstr ""
+
+#. type: Plain text
+#: 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 ""
+
+#. !!T
+#: content/pages/ui.md:13
+#, no-wrap
+msgid "How can I customize the launcher?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:16
+msgid ""
+"To pin a running app permanently to the launcher, long-press it to reveal "
+"the context menu and choose the Pin to launcher option. You can do the same "
+"to unpin apps.  You can also move launcher icons around by long-pressing "
+"them and dragging and dropping them to the position you'd like them to be "
+"in."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:17
+#, no-wrap
+msgid "What are the indicators?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:19
+msgid ""
+"Indicators convey quick useful information about your device, like the time,"
+" data connection, location, sound, and notifications. You can access the "
+"indicators at any time by swiping down from the top screen edge."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:20
+#, no-wrap
+msgid "How do I switch applications?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:23
+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. "
+"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."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:24
+#, no-wrap
+msgid "How do I close applications?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:26
+msgid ""
+"To close an application, slide your finger *slowly* left from the right edge"
+" of the screen. An application switcher will appear. Place your finger on "
+"the application preview you wish to close and swipe up or down. The "
+"application will disappear."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:27
+#, no-wrap
+msgid "How can I copy and paste?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:29
+msgid ""
+"For text that can be copied and pasted, press and hold the text in question."
+" A menu will appear allowing you to cut, copy and paste."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:30
+#, 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:32
+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 ""
+
+#. !!T
+#: content/pages/ui.md:33
+#, no-wrap
+msgid "The keyboard behaves funny. What can I do about it?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:35
+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 "
+"still receive suggestions on the words you're writing, while having full "
+"control of the input."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:36
+#, no-wrap
+msgid "How can I add a new keyboard language?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:39
+msgid ""
+"Adding a new keyboard language will enable you to type specific characters "
+"that might not be available in other keyboards and (if available) use word "
+"prediction and spell checking for that new language.  Go to the Settings "
+"app, tap on Language/Text and then on Keyboard layouts. From there, you can "
+"then tick the keyboard you want to add and then [use it](#how-can-i-switch-"
+"between-keyboard-languages)"
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:40
+#, no-wrap
+msgid "How can I switch between keyboard languages?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:43
+msgid ""
+"While typing on the keyboard, tap on the globe icon near the bottom left "
+"corner. A new pop-up will appear, where you can select the new keyboard you "
+"want to switch to.  You can do this to switch back and forth between "
+"keyboards in different languages. [Make sure the language you want is "
+"activated it in the Settings app](#how-can-i-add-a-new-keyboard-language)."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:44
+#, no-wrap
+msgid "How can I type Emoji icons?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:47
+msgid ""
+"[Learn wow to switch between keyboard languages](#how-can-i-switch-between-"
+"keyboard-languages) to alternate between the regular keyboard and the Emoji "
+"keyboard. Once done with typing Emojis, you can switch back to the regular "
+"keyboard.  If you can't see the Emoji keyboard, make sure you've [activated "
+"it in the Settings app](#how-can-i-add-a-new-keyboard-language)."
+msgstr ""
+
+#. !!T
+#: content/pages/ui.md:48
+#, no-wrap
+msgid ""
+"What is the round circle on the welcome screen for? What does it show? Can I"
+" configure it?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/ui.md:49
+msgid ""
+"The round circle is the infographic. It hows you recent phone activity, like"
+" the number of messages received or the number of songs played. You can "
+"disable it by launching the *Settings* app, navigating to *Security and "
+"privacy* and unticking *Stats on Welcome screen*."
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:2
+msgid "Basic tasks"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:4
+#, no-wrap
+msgid "*If you are wondering how to perform basic tasks, look here.*\n"
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:7
+#, no-wrap
+msgid "How do I play music?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:9
+msgid ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
+" music."
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:10
+#, no-wrap
+msgid "How do I play videos?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:12
+msgid ""
+"The media player application will play videos copied to the device. You will"
+" also find applications like youtube that give you streaming options."
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:13
+#, no-wrap
+msgid "How do I take photos?"
+msgstr ""
+
+#. type: Plain text
+#: 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 ""
+
+#. !!T
+#: content/pages/basic.md:16
+#, no-wrap
+msgid "How do I take a screenshot?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:18
+msgid ""
+"Press the Volume Up and Volume Down buttons at the same time until you see "
+"the screen flashing. The screenshot will capture what is on your screen, and"
+" you can see the resulting picture in the Gallery app or the Photos scope."
+msgstr ""
+
+#. !!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: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 ""
+
+#. !!T
+#: content/pages/basic.md:22
+#, no-wrap
+msgid "How do I record videos?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:24
+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 ""
+
+#. !!T
+#: content/pages/basic.md:25
+#, no-wrap
+msgid "How can I send a text?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:27
+msgid ""
+"The default messaging application allows you to send sms as well as mms "
+"messages."
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:28
+#, no-wrap
+msgid "How do I make a call?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:30
+msgid ""
+"The default dialer app lets you make calls using a contact or by dialing a "
+"number."
+msgstr ""
+
+#. !!T
+#: content/pages/basic.md:31
+#, no-wrap
+msgid "How do I check recently made/missed calls?"
+msgstr ""
+
+#. type: Plain text
+#: content/pages/basic.md:32
+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."
+msgstr ""
+
+#. type: Plain text
 #: content/pages/scopes.md:2
-msgid "Title: Scopes"
+msgid "Scopes"
 msgstr ""
 
 #. type: Plain text
@@ -1014,25 +1016,25 @@
 msgid "*Curious about scopes?*\n"
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/scopes.md:7
 #, no-wrap
-msgid "How do favorites work? !!T"
+msgid "How do favorites work?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/scopes.md:9
 msgid ""
-"Swipe up from the bottom edge of the dash to reveal a scopes "
-"manager. Favorite scopes you wish to appear on your dash by selecting "
-"them. Selecting them again will remove the favorite. All favorited scopes "
-"will appear on your dash."
+"Swipe up from the bottom edge of the dash to reveal a scopes manager. "
+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
+" them again will remove the favorite. All favorited scopes will appear on "
+"your dash."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/scopes.md:10
 #, no-wrap
-msgid "How do I add new scopes? !!T"
+msgid "How do I add new scopes?"
 msgstr ""
 
 #. type: Plain text
@@ -1044,10 +1046,10 @@
 "store button in the upper right to look for it in the ubuntu store."
 msgstr ""
 
-#. type: Title ###
+#. !!T
 #: content/pages/scopes.md:13
 #, no-wrap
-msgid "How do I remove a scope? !!T"
+msgid "How do I remove a scope?"
 msgstr ""
 
 #. type: Plain text