Merge lp:~dholbach/help-app/1434210 into lp:help-app

[Daniel Holbach]

Separate our build process steps further:
 - Edits of our (English) content happen in ./content/
 - Translations (from LP) are in ./po/
 - 'make translations' generates translated markdown in ./build/i18n/
 - pelican then uses this to generate HTML in either ./build/phone/
   or ./build/web/ (depending on the theme or make target used).

Misc fixes:
 - Remove cleanup function. It's not necessary any more.
 - Fix test case (for en_US locale).
 - Add 'date:' to translated markdown file if necessary.

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

FAILED: Continuous integration, rev:134
http://91.189.93.70:8080/job/help-app-ci/22/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/help-app-utopic-amd64-ci/22/console
    FAILURE: http://91.189.93.70:8080/job/help-app-vivid-amd64-ci/24/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/help-app-ci/22/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:136
http://91.189.93.70:8080/job/help-app-ci/23/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/help-app-utopic-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/help-app-vivid-amd64-ci/25

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/help-app-ci/23/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Works well, but I've noticed a couple of things that might need fixing while we're at it:

- Running 'make html' and then 'make web' deletes the ./build/app directory. I'd expect the web build not to affect the app build, which would only be deleted after a 'make clean'
- It might be worth renaming 'make html' to 'make app' for consistency with the changes in the tree.

review: Needs Fixing

[Daniel Holbach (dholbach)]

Re: cleaning: this is from a time, when it was necessary to do this because else stuff would break. I'll investigate and see if this is still necessary.

In ./Makefile this is already an alias:
html: app (line 67).

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

PASSED: Continuous integration, rev:138
http://91.189.93.70:8080/job/help-app-ci/24/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/help-app-utopic-amd64-ci/24
    SUCCESS: http://91.189.93.70:8080/job/help-app-vivid-amd64-ci/26

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/help-app-ci/24/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

LGTM now, thanks!

Just one typo on the HACKING doc `make appl` -> `make app`

review: Approve

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/help-app-autolanding/5/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/help-app-utopic-amd64-autolanding/5
    SUCCESS: http://91.189.93.70:8080/job/help-app-vivid-amd64-autolanding/5

review: Needs Fixing (continuous-integration)

[Daniel Holbach (dholbach)]

Reapproving since it was an obvious change in the HACKING doc.

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

review: Approve (continuous-integration)

=== modified file 'HACKING'
--- HACKING	2015-03-25 10:14:27 +0000
+++ HACKING	2015-03-31 12:28:04 +0000
@@ -169,7 +169,7 @@
 While you can just generate and install the click package manually,
 we recommend the SDK for testing the phone app.
 
-You can run the `make appl` target to generate the HTML files and then
+You can run the `make app` target to generate the HTML files and then
 open the app/help.ubuntuhtmlproject file with the Ubuntu SDK IDE.
 
 From there, you can set up a desktop kit to run it on your host,

=== modified file 'Makefile'
--- Makefile	2015-03-25 10:14:27 +0000
+++ Makefile	2015-03-31 12:28:04 +0000
@@ -3,8 +3,8 @@
 PELICANOPTS=
 
 BASEDIR=$(CURDIR)
-INPUTDIR=$(BASEDIR)/content
 INTERNALS_DIR=$(BASEDIR)/internals
+DOCS_DIR=$(BASEDIR)/content
 PO_DIR=$(BASEDIR)/po
 STATIC_DIR=$(BASEDIR)/static
 
@@ -13,6 +13,7 @@
 BUILD_DIR=$(BASEDIR)/build
 APP_DIR=$(BUILD_DIR)/app
 OUTPUTDIR_APP=$(APP_DIR)/www
+INPUTDIR=$(BUILD_DIR)/i18n/content
 
 OUTPUTDIR_WEB=$(BUILD_DIR)/web/www
 THEMEDIR_WEB=$(STATIC_DIR)/themes/web
@@ -58,6 +59,7 @@
 
 translations:
 	cd $(INTERNALS_DIR); ./generate-translations
+	cp -r $(DOCS_DIR)/images/ $(INPUTDIR)
 
 web: translations
 	cd $(INTERNALS_DIR); $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_WEB) -s $(CONFFILE) $(PELICANOPTS) -t $(THEMEDIR_WEB)

=== modified file 'internals/pelicanconf.py'
--- internals/pelicanconf.py	2015-03-30 14:18:49 +0000
+++ internals/pelicanconf.py	2015-03-31 12:28:04 +0000
@@ -7,9 +7,16 @@
 SITEURL = ''
 
 TOP_LEVEL_DIR = '../'
-PATH = TOP_LEVEL_DIR+'content/'
+DOCS_PATH = TOP_LEVEL_DIR+'content/'
 INTERNALS_DIR = TOP_LEVEL_DIR+'internals/'
 TRANSLATIONS_DIR = TOP_LEVEL_DIR+'po/'
+I18N_BUILD_DIR = TOP_LEVEL_DIR+'build/i18n/'
+
+# PATH is what pelican uses to determine where to read docs from.
+# As we use our own tools to generate translated docs (in
+# I18N_BUILD_DIR) pelican needs to use this directory instead of
+# DOCS_PATH.
+PATH = I18N_BUILD_DIR+'content/'
 
 TIMEZONE = 'Europe/Paris'
 

=== modified file 'internals/tests/test_links.py'
--- internals/tests/test_links.py	2015-03-19 14:23:27 +0000
+++ internals/tests/test_links.py	2015-03-31 12:28:04 +0000
@@ -57,8 +57,7 @@
 
     def _test_local_links(self, build):
         (ret, tempdir) = require_build(build)
-        if ret:
-            return False
+        self.assertEqual(ret, 0)
         for dirpath, dirnames, filenames in os.walk(tempdir):
             for fn in filenames:
                 full_fn = os.path.join(dirpath, fn)

=== modified file 'internals/tests/test_translations.py'
--- internals/tests/test_translations.py	2015-03-24 22:44:58 +0000
+++ internals/tests/test_translations.py	2015-03-31 12:28:04 +0000
@@ -29,7 +29,7 @@
                         if doc.endswith(link_msgid)]:
                     self.assertNotIn(link_msgid, link_msgstr)
                     self.assertEqual(1, len(link_msgstr))
-                    self.assertIn(po.langs[po_fn]['gettext_code'],
+                    self.assertIn(po.langs[po_fn]['bcp47'],
                                   link_msgstr[0])
 
     def test_markup_in_po_or_pot_files(self):

=== modified file 'internals/translations/build.py'
--- internals/translations/build.py	2015-03-24 17:11:10 +0000
+++ internals/translations/build.py	2015-03-31 12:28:04 +0000
@@ -3,7 +3,6 @@
 import os
 import re
 import shutil
-import subprocess
 from collections import OrderedDict
 
 from translations.utils import (
@@ -24,9 +23,10 @@
     require('python3-polib')
 
 from pelicanconf import (
+    DOCS_PATH,
     HIDE_FROM_POT,
+    I18N_BUILD_DIR,
     META_TAGS,
-    PATH,
     TRANSLATIONS_DIR,
 )
 
@@ -148,10 +148,9 @@
 
     def find_translated_title_line(self, original_title):
         for entry in self.find_in_msgid(original_title):
-            if entry.msgid == original_title:
-                if entry.msgstr:
-                    return entry.msgstr
-                return entry.msgid
+            if entry.msgid == original_title and entry.msgstr:
+                return entry.msgstr
+        return original_title
 
 
 class PO(object):
@@ -240,7 +239,7 @@
 
     def find_docs(self):
         docs = []
-        for dirpath, dirnames, fns in os.walk(PATH):
+        for dirpath, dirnames, fns in os.walk(DOCS_PATH):
             docs += [normalise_path(os.path.join(dirpath, fn))
                      for fn in fns
                      if fn.endswith('.md')]
@@ -269,6 +268,8 @@
                 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))
+                if 'Date:' not in metadata:
+                    metadata['Date:'] = ''
 
                 # Replace the title string by its translated version
                 translated_title_line = po.find_translated_title_line(
@@ -277,7 +278,8 @@
 
                 # Remove the metadata line
                 content = '\n'.join([line for line in output.split('\n')][1:])
-                new_path = full_path(
+                new_path = os.path.join(
+                    I18N_BUILD_DIR,
                     self.translated_doc_fn(doc_fn, po.langs[po_fn]['bcp47']))
 
                 # Flatten the metadata dict into a string
@@ -299,23 +301,10 @@
 
 class Translations(object):
     def __init__(self):
-        self._cleanup()
         self.documents = Documents()
         self.po4a = PO4A()
         self.po = PO(self.po4a)
 
-    def _cleanup(self):
-        r = subprocess.Popen(['bzr', 'ignored'], stdout=subprocess.PIPE)
-        fns = [full_path(f.split(' ')[0])
-               for f in codecs.decode(r.communicate()[0]).split('\n')
-               if f.strip() != '']
-        fns = [f for f in fns if os.path.exists(f)]
-        for f in fns:
-            try:
-                shutil.rmtree(f)
-            except NotADirectoryError:
-                os.remove(f)
-
     def generate_pot_file(self):
         return self.po.generate_pot_file(self.documents)
 

=== modified file 'internals/translations/utils.py'
--- internals/translations/utils.py	2015-03-23 15:51:11 +0000
+++ internals/translations/utils.py	2015-03-31 12:28:04 +0000
@@ -21,7 +21,7 @@
 from pelicanconf import (
     INTERNALS_DIR,
     MD_EXTENSIONS,
-    PATH,
+    DOCS_PATH,
     TOP_LEVEL_DIR,
 )
 
@@ -56,7 +56,7 @@
 
 
 def use_docs_path():
-    return use_path(PATH)
+    return use_path(DOCS_PATH)
 
 
 def use_internals_dir():

=== modified file 'po/de.po'
--- po/de.po	2015-03-31 06:05:05 +0000
+++ po/de.po	2015-03-31 12:28:04 +0000
@@ -11,12 +11,12 @@
 "PO-Revision-Date: 2015-03-31 05:57+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-Launchpad-Export-Date: 2015-03-31 06:05+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
-"Language: \n"
 
 #. type: Plain text
 #: content/pages/security.md:2
@@ -34,7 +34,7 @@
 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
 #: content/pages/scopes.md:6
 msgid "[TOC]"
-msgstr ""
+msgstr "[TOC]"
 
 #. !!QA
 #: content/pages/security.md:7
@@ -93,23 +93,20 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your "
-"pin/passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your pin/"
+"passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid ""
-"How can I stop someone using the indicators when the phone is unlocked?"
+msgid "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -156,6 +153,9 @@
 "[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."
 
 #. !!QA
 #: content/pages/basic.md:10
@@ -345,7 +345,7 @@
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.de.md)"
 
 #. type: Plain text
 #: content/pages/index.md:12
@@ -388,8 +388,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  "
-"![Icon]({filename}/images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
+"images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -472,9 +472,7 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
 msgstr ""
 
 #. !!QA
@@ -581,8 +579,7 @@
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid ""
-"What are the small characters on the keyboard and how can I select them?"
+msgid "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -660,9 +657,7 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
 msgstr ""
 
 #. type: Plain text
@@ -717,8 +712,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained "
-"store](https://appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained store](https://"
+"appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -751,8 +746,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' "
-"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
+"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA

=== modified file 'po/es.po'
--- po/es.po	2015-03-31 06:05:05 +0000
+++ po/es.po	2015-03-31 12:28:04 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2015-03-08 10:33+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@
 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
 #: content/pages/scopes.md:6
 msgid "[TOC]"
-msgstr ""
+msgstr "[TOC]"
 
 #. !!QA
 #: content/pages/security.md:7
@@ -92,23 +93,20 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your "
-"pin/passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your pin/"
+"passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid ""
-"How can I stop someone using the indicators when the phone is unlocked?"
+msgid "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -155,6 +153,9 @@
 "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
 "music."
 msgstr ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.es.md) such as 7digital and Grooveshark can also "
+"play music."
 
 #. !!QA
 #: content/pages/basic.md:10
@@ -280,7 +281,7 @@
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.es.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
@@ -344,12 +345,12 @@
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.es.md)"
 
 #. type: Plain text
 #: content/pages/index.md:12
 msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
+msgstr "[Get in touch]({filename}get-in-touch.es.md)"
 
 #. type: Plain text
 #: content/pages/settings.md:2
@@ -387,8 +388,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  "
-"![Icon]({filename}/images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
+"images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -471,9 +472,7 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
 msgstr ""
 
 #. !!QA
@@ -580,8 +579,7 @@
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid ""
-"What are the small characters on the keyboard and how can I select them?"
+msgid "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -659,9 +657,7 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
 msgstr ""
 
 #. type: Plain text
@@ -716,8 +712,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained "
-"store](https://appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained store](https://"
+"appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -750,8 +746,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' "
-"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
+"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA

=== modified file 'po/fr.po'
--- po/fr.po	2015-03-31 06:05:05 +0000
+++ po/fr.po	2015-03-31 12:28:04 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2015-02-27 12:21+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@
 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
 #: content/pages/scopes.md:6
 msgid "[TOC]"
-msgstr ""
+msgstr "[TOC]"
 
 #. !!QA
 #: content/pages/security.md:7
@@ -92,23 +93,20 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your "
-"pin/passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your pin/"
+"passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid ""
-"How can I stop someone using the indicators when the phone is unlocked?"
+msgid "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -155,6 +153,9 @@
 "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
 "music."
 msgstr ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.fr.md) such as 7digital and Grooveshark can also "
+"play music."
 
 #. !!QA
 #: content/pages/basic.md:10
@@ -278,37 +279,37 @@
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
 #, no-wrap
 msgid "[User Interface]({filename}ui.md)"
-msgstr ""
+msgstr "[User Interface]({filename}ui.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:10
 #, no-wrap
 msgid "[Settings]({filename}settings.md)"
-msgstr ""
+msgstr "[Settings]({filename}settings.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:11
 #, no-wrap
 msgid "[Apps]({filename}apps.md)"
-msgstr ""
+msgstr "[Apps]({filename}apps.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:12
 #, no-wrap
 msgid "[Scopes]({filename}scopes.md)"
-msgstr ""
+msgstr "[Scopes]({filename}scopes.fr.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:13
 #, no-wrap
 msgid "[Security]({filename}security.md)"
-msgstr ""
+msgstr "[Security]({filename}security.fr.md)"
 
 #. type: Plain text
 #: content/pages/index.md:2
@@ -340,12 +341,12 @@
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.fr.md)"
 
 #. type: Plain text
 #: content/pages/index.md:12
 msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
+msgstr "[Get in touch]({filename}get-in-touch.fr.md)"
 
 #. type: Plain text
 #: content/pages/settings.md:2
@@ -383,8 +384,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  "
-"![Icon]({filename}/images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
+"images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -467,9 +468,7 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
 msgstr ""
 
 #. !!QA
@@ -576,8 +575,7 @@
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid ""
-"What are the small characters on the keyboard and how can I select them?"
+msgid "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -655,9 +653,7 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
 msgstr ""
 
 #. type: Plain text
@@ -712,8 +708,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained "
-"store](https://appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained store](https://"
+"appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -746,8 +742,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' "
-"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
+"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA

=== modified file 'po/it.po'
--- po/it.po	2015-03-31 06:05:05 +0000
+++ po/it.po	2015-03-31 12:28:04 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2015-03-05 11:21+0000\n"
 "Last-Translator: Silvia Bindelli <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@
 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
 #: content/pages/scopes.md:6
 msgid "[TOC]"
-msgstr ""
+msgstr "[TOC]"
 
 #. !!QA
 #: content/pages/security.md:7
@@ -92,23 +93,20 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your "
-"pin/passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your pin/"
+"passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid ""
-"How can I stop someone using the indicators when the phone is unlocked?"
+msgid "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -155,6 +153,9 @@
 "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
 "music."
 msgstr ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.it.md) such as 7digital and Grooveshark can also "
+"play music."
 
 #. !!QA
 #: content/pages/basic.md:10
@@ -280,37 +281,37 @@
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.it.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
 #, no-wrap
 msgid "[User Interface]({filename}ui.md)"
-msgstr ""
+msgstr "[User Interface]({filename}ui.it.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:10
 #, no-wrap
 msgid "[Settings]({filename}settings.md)"
-msgstr ""
+msgstr "[Settings]({filename}settings.it.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:11
 #, no-wrap
 msgid "[Apps]({filename}apps.md)"
-msgstr ""
+msgstr "[Apps]({filename}apps.it.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:12
 #, no-wrap
 msgid "[Scopes]({filename}scopes.md)"
-msgstr ""
+msgstr "[Scopes]({filename}scopes.it.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:13
 #, no-wrap
 msgid "[Security]({filename}security.md)"
-msgstr ""
+msgstr "[Security]({filename}security.it.md)"
 
 #. type: Plain text
 #: content/pages/index.md:2
@@ -344,12 +345,12 @@
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.it.md)"
 
 #. type: Plain text
 #: content/pages/index.md:12
 msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
+msgstr "[Get in touch]({filename}get-in-touch.it.md)"
 
 #. type: Plain text
 #: content/pages/settings.md:2
@@ -387,8 +388,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  "
-"![Icon]({filename}/images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
+"images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -471,9 +472,7 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
 msgstr ""
 
 #. !!QA
@@ -580,8 +579,7 @@
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid ""
-"What are the small characters on the keyboard and how can I select them?"
+msgid "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -659,9 +657,7 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
 msgstr ""
 
 #. type: Plain text
@@ -716,8 +712,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained "
-"store](https://appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained store](https://"
+"appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -750,8 +746,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' "
-"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
+"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA

=== modified file 'po/pt.po'
--- po/pt.po	2015-03-31 06:05:05 +0000
+++ po/pt.po	2015-03-31 12:28:04 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2015-03-19 00:27+0000\n"
 "Last-Translator: Ivo Xavier <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@
 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
 #: content/pages/scopes.md:6
 msgid "[TOC]"
-msgstr ""
+msgstr "[TOC]"
 
 #. !!QA
 #: content/pages/security.md:7
@@ -92,23 +93,20 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your "
-"pin/passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your pin/"
+"passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid ""
-"How can I stop someone using the indicators when the phone is unlocked?"
+msgid "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -140,8 +138,7 @@
 #: content/pages/basic.md:4
 #, no-wrap
 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
-msgstr ""
-"*Se está à procura de como fazer as tarefas básicas, procure aqui.*\n"
+msgstr "*Se está à procura de como fazer as tarefas básicas, procure aqui.*\n"
 
 #. !!QA
 #: content/pages/basic.md:7
@@ -156,6 +153,9 @@
 "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
 "music."
 msgstr ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.pt.md) such as 7digital and Grooveshark can also "
+"play music."
 
 #. !!QA
 #: content/pages/basic.md:10
@@ -281,7 +281,7 @@
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.pt.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
@@ -345,12 +345,12 @@
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.pt.md)"
 
 #. type: Plain text
 #: content/pages/index.md:12
 msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
+msgstr "[Get in touch]({filename}get-in-touch.pt.md)"
 
 #. type: Plain text
 #: content/pages/settings.md:2
@@ -388,8 +388,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  "
-"![Icon]({filename}/images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
+"images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -472,9 +472,7 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
 msgstr ""
 
 #. !!QA
@@ -581,8 +579,7 @@
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid ""
-"What are the small characters on the keyboard and how can I select them?"
+msgid "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -660,9 +657,7 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
 msgstr ""
 
 #. type: Plain text
@@ -686,8 +681,7 @@
 "*Are you looking for a good way to do X and can't find it in the app\n"
 "store? Want some suggestions to solve a particular problem?*\n"
 msgstr ""
-"*Está à procura de uma maneira para fazer bem X e não consegue encontrar na "
-"loja de\n"
+"*Está à procura de uma maneira para fazer bem X e não consegue encontrar na loja de\n"
 "aplicações? Quer alguma sugestão de como resolver um problema particular?*\n"
 
 #. type: Title ##
@@ -720,8 +714,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained "
-"store](https://appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained store](https://"
+"appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -754,8 +748,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' "
-"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
+"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA
@@ -1003,8 +997,7 @@
 "collaboratively-edited question and answer site for Ubuntu users and \n"
 "developers. 100% free, no registration required.  \n"
 msgstr ""
-"O Ubuntu tem uma grande comunidade . Pode facilmente entrar em contacto com "
-"peritos e\n"
+"O Ubuntu tem uma grande comunidade . Pode facilmente entrar em contacto com peritos e\n"
 "outros entusiastas. Um bom modo de o fazer, particularmente se**tiver \n"
 "questões**, é através [AskUbuntu](http://www.askubuntu.com). É uma \n"
 " página de perguntas e respostas colaborativa para utilizadores Ubuntu e \n"

=== modified file 'po/ro.po'
--- po/ro.po	2015-03-31 06:05:05 +0000
+++ po/ro.po	2015-03-31 12:28:04 +0000
@@ -11,6 +11,7 @@
 "PO-Revision-Date: 2015-02-27 11:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <[e-mail]>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@
 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
 #: content/pages/scopes.md:6
 msgid "[TOC]"
-msgstr ""
+msgstr "[TOC]"
 
 #. !!QA
 #: content/pages/security.md:7
@@ -92,23 +93,20 @@
 #. !!QA
 #: content/pages/security.md:19
 #, no-wrap
-msgid ""
-"Why do I have to type my PIN when using File Manager & Terminal (not default "
-"apps)?"
+msgid "Why do I have to type my PIN when using File Manager & Terminal (not default apps)?"
 msgstr ""
 
 #. type: Plain text
 #: content/pages/security.md:21
 msgid ""
-"Since these applications allow for invasive system changes, your "
-"pin/passcode is required. This is for your phone security."
+"Since these applications allow for invasive system changes, your pin/"
+"passcode is required. This is for your phone security."
 msgstr ""
 
 #. !!QA
 #: content/pages/security.md:22
 #, no-wrap
-msgid ""
-"How can I stop someone using the indicators when the phone is unlocked?"
+msgid "How can I stop someone using the indicators when the phone is unlocked?"
 msgstr ""
 
 #. type: Plain text
@@ -155,6 +153,9 @@
 "[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
 "music."
 msgstr ""
+"The music app let's you play music copied to the device. In addition, "
+"[scopes]({filename}scopes.ro.md) such as 7digital and Grooveshark can also "
+"play music."
 
 #. !!QA
 #: content/pages/basic.md:10
@@ -278,37 +279,37 @@
 #: content/pages/faq.md:8
 #, no-wrap
 msgid "[First day tasks]({filename}basic.md)"
-msgstr ""
+msgstr "[First day tasks]({filename}basic.ro.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:9
 #, no-wrap
 msgid "[User Interface]({filename}ui.md)"
-msgstr ""
+msgstr "[User Interface]({filename}ui.ro.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:10
 #, no-wrap
 msgid "[Settings]({filename}settings.md)"
-msgstr ""
+msgstr "[Settings]({filename}settings.ro.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:11
 #, no-wrap
 msgid "[Apps]({filename}apps.md)"
-msgstr ""
+msgstr "[Apps]({filename}apps.ro.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:12
 #, no-wrap
 msgid "[Scopes]({filename}scopes.md)"
-msgstr ""
+msgstr "[Scopes]({filename}scopes.ro.md)"
 
 #. type: Title ###
 #: content/pages/faq.md:13
 #, no-wrap
 msgid "[Security]({filename}security.md)"
-msgstr ""
+msgstr "[Security]({filename}security.ro.md)"
 
 #. type: Plain text
 #: content/pages/index.md:2
@@ -340,12 +341,12 @@
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "[Take me to the FAQ!]({filename}faq.md)"
-msgstr ""
+msgstr "[Take me to the FAQ!]({filename}faq.ro.md)"
 
 #. type: Plain text
 #: content/pages/index.md:12
 msgid "[Get in touch]({filename}get-in-touch.md)"
-msgstr ""
+msgstr "[Get in touch]({filename}get-in-touch.ro.md)"
 
 #. type: Plain text
 #: content/pages/settings.md:2
@@ -383,8 +384,8 @@
 #: content/pages/settings.md:13
 msgid ""
 "Open the *System Settings* application. For the time, check out the *Time & "
-"Date* section. For language, select *Language & Text*.  "
-"![Icon]({filename}/images/settings.gif)"
+"Date* section. For language, select *Language & Text*.  ![Icon]({filename}/"
+"images/settings.gif)"
 msgstr ""
 
 #. !!QA
@@ -467,9 +468,7 @@
 #. type: Plain text
 #: content/pages/ui.md:4
 #, no-wrap
-msgid ""
-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
-"place!*\n"
+msgid "*Are you wondering about the dash, scopes, swiping? You've come to the right place!*\n"
 msgstr ""
 
 #. !!QA
@@ -576,8 +575,7 @@
 #. !!QA
 #: content/pages/ui.md:30
 #, no-wrap
-msgid ""
-"What are the small characters on the keyboard and how can I select them?"
+msgid "What are the small characters on the keyboard and how can I select them?"
 msgstr ""
 
 #. type: Plain text
@@ -655,9 +653,7 @@
 #. !!QA
 #: content/pages/ui.md:48
 #, no-wrap
-msgid ""
-"What is the round circle on the welcome screen for? What does it show? Can I "
-"configure it?"
+msgid "What is the round circle on the welcome screen for? What does it show? Can I configure it?"
 msgstr ""
 
 #. type: Plain text
@@ -712,8 +708,8 @@
 #: content/pages/apps.md:15
 msgid ""
 "At the moment, the store is not able to be browsed from your PC. In the "
-"meantime you can check the unofficial, [community-maintained "
-"store](https://appstore.bhdouglass.com/apps)."
+"meantime you can check the unofficial, [community-maintained store](https://"
+"appstore.bhdouglass.com/apps)."
 msgstr ""
 
 #. !!QA
@@ -746,8 +742,8 @@
 #. type: Plain text
 #: content/pages/apps.md:24
 msgid ""
-"If you have a Spotify premium account, just install 'CuteSpotify' "
-"([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
+"If you have a Spotify premium account, just install 'CuteSpotify' ([video]"
+"(https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
 #. !!QA