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

[Daniel Holbach]

.
├── content
│   ├── images
│   └── pages
├── debian
│   └── source
├── internals
│   ├── tests
│   └── translations
├── po
└── static
    ├── app
    └── themes
        ├── app
        │   ├── static
        │   │   ├── css
        │   │   └── js
        │   └── templates
        └── web
            ├── static
            │   ├── css
            │   ├── img
            │   └── js
            │   └── plugins
            └── templates

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

119. By Daniel Holbach on 2015-03-19

remove some superfluous code

120. By Daniel Holbach on 2015-03-19

break po4a bits out into separate module

[Nicholas Skaggs (nskaggs)]

Directory structure above needs to be added to the FAQ. Also update the other sections, including testings and generating content.

review: Needs Fixing

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

121. By Daniel Holbach on 2015-03-19

update HACKING doc

122. By Daniel Holbach on 2015-03-19

update packaging to use proper build path

123. By Daniel Holbach on 2015-03-19

fix cleanup

124. By Daniel Holbach on 2015-03-19

requiring the 'clean' target to be run before is unnecessary - it's done as part of instantiating Translations anyway

[Daniel Holbach (dholbach)]

If you could let me know how to reproduce this, that'd be great. :)

[Nicholas Skaggs (nskaggs)]

Apart from it not building on my box, I'm happy with this merge. Now to solve that pesky not building thing . . .

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

125. By Daniel Holbach on 2015-03-19

normalise path of fake po file

[Nicholas Skaggs (nskaggs)]

Yay! This looks wonderful.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-03-18 06:57:45 +0000
+++ .bzrignore	2015-03-19 17:24:01 +0000
@@ -1,8 +1,7 @@
-app/www
+build/
 *.click
 *.user
-edit-here/cache
-edit-here/backup
-edit-here/po/en_US.po
-edit-here/content/pages/*.*.md
-web/
+cache
+backup
+po/en_US.po
+content/pages/*.*.md
 
=== modified file 'HACKING'
--- HACKING	2015-03-18 10:37:42 +0000
+++ HACKING	2015-03-19 17:24:01 +0000
@@ -50,22 +50,24 @@
 Directory structure
 -------------------
 
-
-├── app                 ← Everything related to the devices app.
-│   └── www             ← The viewable content of the app.
-├── edit-here
-│   ├── content
-│   │   └── pages       ← Here is the place to edit the content.
-│   ├── po              ← Translations.
-│   ├── tests           ← Code for automated testing goes here.
-│   └── themes          ← Themes files, both templates and css/js.
-│       ├── phone       ← Phone/device app theme.
-│       └── web         ← Online build (.ubuntu.com) theme.
-└── web                 ← The viewable content of of the online build. 
-
-Note: Everything in ./app/www and ./web/ is automatically generated.
-      Edit content in ./edit-here/content/pages/ and edit themes in
-      ./edit-here/themes/.
+.
+├── content            ← Here is the place to edit the content.
+│   ├── images         ← Images to be used in the docs.
+│   └── pages          ← Actual text to be edited.
+├── debian             ← Everything related to .deb packaging.
+├── internals          ← Build tools, pelican config.
+│   ├── tests          ← Code for automated testing.
+│   └── translations   ← Python code for handling translations.
+├── po                 ← Translations (.pot and po files).
+└── static
+    ├── app            ← Static files for the click app.
+    └── themes         ← Themes files, both templates and css/js.
+        ├── app
+        └── web
+
+Note: Everything in .build is automatically generated.
+      Edit content in ./content/pages/ and edit themes in
+      ./static/themes/.
 
 
 Prerequisites
@@ -96,7 +98,7 @@
 This app is structured in a very simple way. All the content is and all your
 edits happen in
 
-	./edit-here/content/pages/
+	./content/pages/
 
 The markup for the text is Markdown, which is very easy to learn. Just have 
 a look at http://daringfireball.net/projects/markdown/ and some of the 
@@ -104,18 +106,18 @@
 
 Once you're happy with your edits, change to the top-level directory and run
 
-	make html
+	make app
 
 This will also generate translated pages.
 
-You can find the updated HTML in ./app/www/.
+You can find the updated HTML in ./build/app/www/.
 
 To launch the app, you can use ubuntu-html5-app-launcher in the www dir, or
 just call
 
 	make launch
 
-(This will also run the 'make html' command for you.)
+(This will also run the 'make app' command for you.)
 
 
 Creating a click
@@ -137,7 +139,7 @@
 
 	make web
 
-Find the resulting files in ./web in the top-level directory.
+Find the resulting files in the ./build/web directory.
 
 We plan to make use of 
 http://www.w3.org/International/questions/qa-apache-lang-neg for publishing
@@ -148,7 +150,7 @@
 
 We love automated testing! We added a couple of test cases to 
 
-	./edit-here/tests/
+	./internals/tests/
 
 and it would be great if you added more. We want to run these tests 
 whenever we build the package or publish the docs or whatever else. Just
@@ -162,7 +164,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 html` target to generate the HTML files and then
+You can run the `make appl` 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,
@@ -177,7 +179,7 @@
 
 	https://launchpad.net/help-app
 
-To update the .pot file, simply run the following command in the edit-here/
+To update the .pot file, simply run the following command in the top-level
 directory:
 
 	make update-pot
 
=== removed file 'Makefile'
--- Makefile	2015-03-18 10:36:10 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/make -f
-
-ignored := $(shell bzr ignored | cut -d' ' -f1)
-
-clean:
-ifneq ($(strip $(ignored)),)
-	$(foreach fn, $(ignored), $(shell rm -r $(fn);))
-endif
-
-check: clean
-	make -C edit-here check
-
-click: html
-	cd app && click build . && mv *.click ..
-
-html: clean
-	make -C edit-here html
-
-web: clean
-	make -C edit-here web
-
-update-pot:
-	cd edit-here && ./generate-pot
-
-launch:
-	make -C edit-here launch
-
-.PHONY: click html web update-pot clean check
 
=== renamed file 'edit-here/Makefile' => 'Makefile'
--- edit-here/Makefile	2015-03-18 10:36:10 +0000
+++ Makefile	2015-03-19 17:24:01 +0000
@@ -4,126 +4,74 @@
 
 BASEDIR=$(CURDIR)
 INPUTDIR=$(BASEDIR)/content
-OUTPUTDIR=$(BASEDIR)/../app/www
-CONFFILE=$(BASEDIR)/pelicanconf.py
-PUBLISHCONF=$(BASEDIR)/publishconf.py
-
-OUTPUTDIR_WEB=$(BASEDIR)/../web
-THEMEDIR_WEB=$(BASEDIR)/themes/web
-
-FTP_HOST=localhost
-FTP_USER=anonymous
-FTP_TARGET_DIR=/
-
-SSH_HOST=localhost
-SSH_PORT=22
-SSH_USER=root
-SSH_TARGET_DIR=/var/www
-
-S3_BUCKET=my_s3_bucket
-
-CLOUDFILES_USERNAME=my_rackspace_username
-CLOUDFILES_API_KEY=my_rackspace_api_key
-CLOUDFILES_CONTAINER=my_cloudfiles_container
-
-DROPBOX_DIR=~/Dropbox/Public/
-
-GITHUB_PAGES_BRANCH=gh-pages
+INTERNALS_DIR=$(BASEDIR)/internals
+PO_DIR=$(BASEDIR)/po
+STATIC_DIR=$(BASEDIR)/static
+
+CONFFILE=$(INTERNALS_DIR)/pelicanconf.py
+
+BUILD_DIR=$(BASEDIR)/build
+APP_DIR=$(BUILD_DIR)/app
+OUTPUTDIR_APP=$(APP_DIR)/www
+
+OUTPUTDIR_WEB=$(BUILD_DIR)/web/www
+THEMEDIR_WEB=$(STATIC_DIR)/themes/web
 
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
 	PELICANOPTS += -D
 endif
 
-MD_FILES=$(wildcard content/pages/*.md)
-PO_FILES=$(wildcard po/*.po)
+MD_FILES=$(wildcard $(INPUTDIR)/pages/*.md)
+PO_FILES=$(wildcard $(PO_DIR)/*.po)
+
+ignored := $(shell bzr ignored | cut -d' ' -f1)
+
+clean:
+ifneq ($(strip $(ignored)),)
+	$(foreach fn, $(ignored), $(shell rm -r $(fn);))
+endif
 
 help:
 	@echo 'Makefile for a pelican Web site                                        '
 	@echo '                                                                       '
 	@echo 'Usage:                                                                 '
-	@echo '   make html                        (re)generate the web site          '
+	@echo '   make web                         (re)generate the (online) web site '
+	@echo '   make app                         (re)generate the (offline) content ' 
+	@echo '                                    for the phone app ("html" is an    '
+	@echo '                                    alias)                             '
+	@echo '   make click                       generate click for the phone app   '
+	@echo '   make launch                      launch the phone app               '
+	@echo '   make translations                generate translated markdown       '
+	@echo '   make update-pot                  update the .pot file               '
 	@echo '   make clean                       remove the generated files         '
-	@echo '   make regenerate                  regenerate files upon modification '
-	@echo '   make publish                     generate using production settings '
-	@echo '   make serve [PORT=8000]           serve site at http://localhost:8000'
-	@echo '   make devserver [PORT=8000]       start/restart develop_server.sh    '
-	@echo '   make stopserver                  stop local server                  '
-	@echo '   make ssh_upload                  upload the web site via SSH        '
-	@echo '   make rsync_upload                upload the web site via rsync+ssh  '
-	@echo '   make dropbox_upload              upload the web site via Dropbox    '
-	@echo '   make ftp_upload                  upload the web site via FTP        '
-	@echo '   make s3_upload                   upload the web site via S3         '
-	@echo '   make cf_upload                   upload the web site via Cloud Files'
-	@echo '   make github                      upload the web site via gh-pages   '
 	@echo '                                                                       '
 	@echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html'
 	@echo '                                                                       '
 
 check:
-	./run-tests
-
-web:
-	./generate-translations
-	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_WEB) -s $(CONFFILE) $(PELICANOPTS) -t $(THEMEDIR_WEB)
-
-html:
-	./generate-translations
-	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
-	cp index.html $(OUTPUTDIR)
-
-clean:
-	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
-
-launch: html
-	cd ../app/; `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` &
-
-#regenerate:
-#	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
-#
-#serve:
-#ifdef PORT
-#	cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT)
-#else
-#	cd $(OUTPUTDIR) && $(PY) -m pelican.server
-#endif
-#
-#devserver:
-#ifdef PORT
-#	$(BASEDIR)/develop_server.sh restart $(PORT)
-#else
-#	$(BASEDIR)/develop_server.sh restart
-#endif
-#
-#stopserver:
-#	kill -9 `cat pelican.pid`
-#	kill -9 `cat srv.pid`
-#	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
-#
-#publish:
-#	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
-#
-#ssh_upload: publish
-#	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
-#
-#rsync_upload: publish
-#	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
-#
-#dropbox_upload: publish
-#	cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
-#
-#ftp_upload: publish
-#	lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
-#
-#s3_upload: publish
-#	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
-#
-#cf_upload: publish
-#	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
-#
-#github: publish
-#	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
-#	git push origin $(GITHUB_PAGES_BRANCH)
-#
-.PHONY: html help clean web check
-	#regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
+	cd $(INTERNALS_DIR); ./run-tests
+
+translations:
+	cd $(INTERNALS_DIR); ./generate-translations
+
+web: translations
+	cd $(INTERNALS_DIR); $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_WEB) -s $(CONFFILE) $(PELICANOPTS) -t $(THEMEDIR_WEB)
+
+app: translations
+	cd $(INTERNALS_DIR); $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_APP) -s $(CONFFILE) $(PELICANOPTS)
+	cp $(STATIC_DIR)/index.html $(OUTPUTDIR_APP)
+	cp $(STATIC_DIR)/app/* $(APP_DIR)
+
+html: app
+
+click: app
+	cd $(APP_DIR) && click build . && mv *.click $(BASEDIR)
+
+launch: app
+	cd $(APP_DIR); `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` &
+
+update-pot:
+	cd $(INTERNALS_DIR) && ./generate-pot
+
+.PHONY: html help clean web check launch click app update-pot translations
 
=== renamed directory 'edit-here/content' => 'content'
=== modified file 'debian/help-app-web.docs'
--- debian/help-app-web.docs	2015-03-09 15:47:10 +0000
+++ debian/help-app-web.docs	2015-03-19 17:24:01 +0000
@@ -1,1 +1,1 @@
-web/*
+build/web/www/*
 
=== removed directory 'edit-here'
=== removed file 'edit-here/develop_server.sh'
--- edit-here/develop_server.sh	2015-02-09 13:40:52 +0000
+++ edit-here/develop_server.sh	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-##
-# This section should match your Makefile
-##
-PY=${PY:-python}
-PELICAN=${PELICAN:-pelican}
-PELICANOPTS=
-
-BASEDIR=$(pwd)
-INPUTDIR=$BASEDIR/content
-OUTPUTDIR=$(BASEDIR)/../app/www
-CONFFILE=$BASEDIR/pelicanconf.py
-
-###
-# Don't change stuff below here unless you are sure
-###
-
-SRV_PID=$BASEDIR/srv.pid
-PELICAN_PID=$BASEDIR/pelican.pid
-
-function usage(){
-  echo "usage: $0 (stop) (start) (restart) [port]"
-  echo "This starts Pelican in debug and reload mode and then launches"
-  echo "an HTTP server to help site development. It doesn't read"
-  echo "your Pelican settings, so if you edit any paths in your Makefile"
-  echo "you will need to edit your settings as well."
-  exit 3
-}
-
-function alive() {
-  kill -0 $1 >/dev/null 2>&1
-}
-
-function shut_down(){
-  PID=$(cat $SRV_PID)
-  if [[ $? -eq 0 ]]; then
-    if alive $PID; then
-      echo "Stopping HTTP server"
-      kill $PID
-    else
-      echo "Stale PID, deleting"
-    fi
-    rm $SRV_PID
-  else
-    echo "HTTP server PIDFile not found"
-  fi
-
-  PID=$(cat $PELICAN_PID)
-  if [[ $? -eq 0 ]]; then
-    if alive $PID; then
-      echo "Killing Pelican"
-      kill $PID
-    else
-      echo "Stale PID, deleting"
-    fi
-    rm $PELICAN_PID
-  else
-    echo "Pelican PIDFile not found"
-  fi
-}
-
-function start_up(){
-  local port=$1
-  echo "Starting up Pelican and HTTP server"
-  shift
-  $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
-  pelican_pid=$!
-  echo $pelican_pid > $PELICAN_PID
-  cd $OUTPUTDIR
-  $PY -m pelican.server $port &
-  srv_pid=$!
-  echo $srv_pid > $SRV_PID
-  cd $BASEDIR
-  sleep 1
-  if ! alive $pelican_pid ; then
-    echo "Pelican didn't start. Is the Pelican package installed?"
-    return 1
-  elif ! alive $srv_pid ; then
-    echo "The HTTP server didn't start. Is there another service using port" $port "?"
-    return 1
-  fi
-  echo 'Pelican and HTTP server processes now running in background.'
-}
-
-###
-#  MAIN
-###
-[[ ($# -eq 0) || ($# -gt 2) ]] && usage
-port=''
-[[ $# -eq 2 ]] && port=$2
-
-if [[ $1 == "stop" ]]; then
-  shut_down
-elif [[ $1 == "restart" ]]; then
-  shut_down
-  start_up $port
-elif [[ $1 == "start" ]]; then
-  if ! start_up $port; then
-    shut_down
-  fi
-else
-  usage
-fi
 
=== removed file 'edit-here/fabfile.py'
--- edit-here/fabfile.py	2015-02-09 13:40:52 +0000
+++ edit-here/fabfile.py	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-from fabric.api import *
-import fabric.contrib.project as project
-import os
-import sys
-import SimpleHTTPServer
-import SocketServer
-
-# Local path configuration (can be absolute or relative to fabfile)
-env.deploy_path = '../app/www'
-DEPLOY_PATH = env.deploy_path
-
-# Remote server configuration
-production = 'root@localhost:22'
-dest_path = '/var/www'
-
-# Rackspace Cloud Files configuration settings
-env.cloudfiles_username = 'my_rackspace_username'
-env.cloudfiles_api_key = 'my_rackspace_api_key'
-env.cloudfiles_container = 'my_cloudfiles_container'
-
-
-def clean():
-    if os.path.isdir(DEPLOY_PATH):
-        local('rm -rf {deploy_path}'.format(**env))
-        local('mkdir {deploy_path}'.format(**env))
-
-def build():
-    local('pelican -s pelicanconf.py')
-
-def rebuild():
-    clean()
-    build()
-
-def regenerate():
-    local('pelican -r -s pelicanconf.py')
-
-def serve():
-    os.chdir(env.deploy_path)
-
-    PORT = 8000
-    class AddressReuseTCPServer(SocketServer.TCPServer):
-        allow_reuse_address = True
-
-    server = AddressReuseTCPServer(('', PORT), SimpleHTTPServer.SimpleHTTPRequestHandler)
-
-    sys.stderr.write('Serving on port {0} ...\n'.format(PORT))
-    server.serve_forever()
-
-def reserve():
-    build()
-    serve()
-
-def preview():
-    local('pelican -s publishconf.py')
-
-def cf_upload():
-    rebuild()
-    local('cd {deploy_path} && '
-          'swift -v -A https://auth.api.rackspacecloud.com/v1.0 '
-          '-U {cloudfiles_username} '
-          '-K {cloudfiles_api_key} '
-          'upload -c {cloudfiles_container} .'.format(**env))
-
-@hosts(production)
-def publish():
-    local('pelican -s publishconf.py')
-    project.rsync_project(
-        remote_dir=dest_path,
-        exclude=".DS_Store",
-        local_dir=DEPLOY_PATH.rstrip('/') + '/',
-        delete=True,
-        extra_opts='-c',
-    )
 
=== removed directory 'edit-here/local'
=== removed file 'edit-here/local/__init__.py'
=== removed file 'edit-here/publishconf.py'
--- edit-here/publishconf.py	2015-02-09 13:40:52 +0000
+++ edit-here/publishconf.py	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
-
-# This file is only used if you use `make publish` or
-# explicitly specify it as your config file.
-
-import os
-import sys
-sys.path.append(os.curdir)
-from pelicanconf import *
-
-SITEURL = ''
-RELATIVE_URLS = False
-
-FEED_ALL_ATOM = 'feeds/all.atom.xml'
-CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
-
-DELETE_OUTPUT_DIRECTORY = True
-
-# Following items are often useful when publishing
-
-#DISQUS_SITENAME = ""
-#GOOGLE_ANALYTICS = ""
 
=== added directory 'internals'
=== renamed file 'edit-here/__init__.py' => 'internals/__init__.py'
=== renamed file 'edit-here/generate-pot' => 'internals/generate-pot'
--- edit-here/generate-pot	2015-03-02 10:30:45 +0000
+++ internals/generate-pot	2015-03-19 17:24:01 +0000
@@ -5,7 +5,7 @@
 
 import sys
 
-from translations import Translations
+from translations.build import Translations
 
 
 def main():
 
=== renamed file 'edit-here/generate-translations' => 'internals/generate-translations'
--- edit-here/generate-translations	2015-03-02 10:30:45 +0000
+++ internals/generate-translations	2015-03-19 17:24:01 +0000
@@ -4,7 +4,7 @@
 
 import sys
 
-from translations import Translations
+from translations.build import Translations
 
 
 def main():
 
=== renamed file 'edit-here/pelicanconf.py' => 'internals/pelicanconf.py'
--- edit-here/pelicanconf.py	2015-03-17 16:40:17 +0000
+++ internals/pelicanconf.py	2015-03-19 17:24:01 +0000
@@ -6,7 +6,9 @@
 SITENAME = u'Ubuntu for devices: Help'
 SITEURL = ''
 
-PATH = 'content'
+TOP_LEVEL_DIR = '../'
+PATH = TOP_LEVEL_DIR+'content/'
+TRANSLATIONS_DIR = TOP_LEVEL_DIR+'po/'
 
 TIMEZONE = 'Europe/Paris'
 
@@ -17,9 +19,9 @@
 
 SLUGIFY_SOURCE = 'basename'
 FILENAME_METADATA = '(?P<slug>\S+)\.(?P<lang>\S+)\.*'
-PAGE_URL =          ''
-PAGE_SAVE_AS =      ''
-PAGE_LANG_URL =     '{slug}.{lang}.html'
+PAGE_URL = ''
+PAGE_SAVE_AS = ''
+PAGE_LANG_URL = '{slug}.{lang}.html'
 PAGE_LANG_SAVE_AS = '{slug}.{lang}.html'
 
 # Feed generation is usually not desired when developing
@@ -38,13 +40,13 @@
 DEFAULT_PAGINATION = False
 
 # Uncomment following line if you want document-relative URLs when developing
-#RELATIVE_URLS = True
+# RELATIVE_URLS = True
 
 TAGS_SAVE_AS = ''
 TAG_SAVE_AS = ''
-THEME = 'themes/phone'
+THEME = TOP_LEVEL_DIR+'static/themes/app/'
 
-MD_EXTENSIONS = ['local.q-and-a', 'attr_list', 'toc']
+MD_EXTENSIONS = ['q-and-a', 'attr_list', 'toc']
 
 META_TAGS = [
     '[TOC]',
 
=== renamed file 'edit-here/local/q-and-a.py' => 'internals/q-and-a.py'
=== renamed file 'edit-here/run-tests' => 'internals/run-tests'
--- edit-here/run-tests	2015-03-09 10:16:07 +0000
+++ internals/run-tests	2015-03-19 17:24:01 +0000
@@ -1,9 +1,12 @@
 #!/usr/bin/python3
 
+import os
 import sys
 import unittest
 
-test_directory = 'tests/'
+from pelicanconf import TOP_LEVEL_DIR
+
+test_directory = os.path.join(TOP_LEVEL_DIR, 'internals/tests')
 test_filename = 'test_*'
 if len(sys.argv) > 1:
     test_filename = sys.argv[1]
 
=== renamed directory 'edit-here/tests' => 'internals/tests'
=== modified file 'internals/tests/test_files.py'
--- edit-here/tests/test_files.py	2015-03-11 11:57:50 +0000
+++ internals/tests/test_files.py	2015-03-19 17:24:01 +0000
@@ -1,26 +1,31 @@
 import os
 from unittest import TestCase
 
-import translations
+from translations.build import Translations
+from translations import utils
 
 
 class HelpTestCase(TestCase):
     def __init__(self, *args):
-        self.translations = translations.Translations()
+        self.translations = Translations()
         TestCase.__init__(self, *args)
 
     def test_doc_files_size_not_0(self):
+        pwd = utils.use_top_level_dir()
         sizes = [os.stat(fn).st_size
                  for fn in self.translations.documents.docs]
         self.assertNotIn(0, sizes)
+        os.chdir(pwd)
 
     def test_po_files_size_not_0(self):
+        pwd = utils.use_top_level_dir()
         sizes = [os.stat(fn).st_size
                  for fn in self.translations.po.langs]
         self.assertNotIn(0, sizes)
+        os.chdir(pwd)
 
     def test_markdown_files(self):
         fns = self.translations.documents.find_docs()
-        checked_fns = [translations.verify_markdown_file(fn)
+        checked_fns = [utils.verify_markdown_file(fn)
                        for fn in fns]
         self.assertEqual(len(fns), checked_fns.count(True))
 
=== modified file 'internals/tests/test_links.py'
--- edit-here/tests/test_links.py	2015-03-10 17:20:47 +0000
+++ internals/tests/test_links.py	2015-03-19 17:24:01 +0000
@@ -7,15 +7,19 @@
 from unittest import TestCase
 import urllib.parse
 
+from translations.utils import use_top_level_dir
+
 
 def require_build(build):
     tempdir = tempfile.mkdtemp()
     env = {}
-    if build == 'html':
-        env = {'OUTPUTDIR': tempdir}
+    if build == 'app':
+        env = {'OUTPUTDIR_APP': tempdir}
     if build == 'web':
         env = {'OUTPUTDIR_WEB': tempdir}
+    pwd = use_top_level_dir()
     ret = subprocess.call(['make', '-es', build], env=env)
+    os.chdir(pwd)
     return (ret, tempdir)
 
 
 
=== modified file 'internals/tests/test_translations.py'
--- edit-here/tests/test_translations.py	2015-03-17 09:24:48 +0000
+++ internals/tests/test_translations.py	2015-03-19 17:24:01 +0000
@@ -1,11 +1,11 @@
 from unittest import TestCase
 
-import translations
+from translations.build import Translations
 
 
 class HelpTestCase(TestCase):
     def __init__(self, *args):
-        self.translations = translations.Translations()
+        self.translations = Translations()
         TestCase.__init__(self, *args)
 
     def test_first_line_of_docs_is_title_line(self):
 
=== added directory 'internals/translations'
=== added file 'internals/translations/__init__.py'
=== added file 'internals/translations/build.py'
--- internals/translations/build.py	1970-01-01 00:00:00 +0000
+++ internals/translations/build.py	2015-03-19 17:24:01 +0000
@@ -0,0 +1,304 @@
+import codecs
+import glob
+import os
+import re
+import shutil
+import subprocess
+
+from translations.utils import (
+    find_bcp47_code,
+    full_path,
+    normalise_path,
+    require,
+    use_top_level_dir,
+    verify_markdown_file,
+)
+
+from translations.po4a import PO4A
+
+try:
+    import polib
+except ImportError:
+    require('python3-polib')
+
+from pelicanconf import (
+    HIDE_FROM_POT,
+    META_TAGS,
+    PATH,
+    TRANSLATIONS_DIR,
+)
+
+
+class POFile(object):
+    pofile = None
+
+    def __init__(self, po_fn):
+        self.po_fn = po_fn
+        self.load()
+
+    def load(self):
+        self.pofile = polib.pofile(full_path(self.po_fn))
+
+    def merge(self, pot_file_ob):
+        self.pofile.merge(pot_file_ob)
+
+    def save(self):
+        self.pofile.save(full_path(self.po_fn))
+
+    def find_in_msgid(self, find_str, translated=True, fuzzy=True,
+                      untranslated=True):
+        entries = []
+        if translated:
+            entries += self.pofile.translated_entries()
+        if fuzzy:
+            entries += self.pofile.fuzzy_entries()
+        if untranslated:
+            entries += self.pofile.untranslated_entries()
+        results = []
+        for entry in entries:
+            if find_str in entry.msgid:
+                results += [entry]
+        return results
+
+    def hide_attr_list_statements(self):
+        entries = []
+        for statement in HIDE_FROM_POT:
+            entries.extend(self.find_in_msgid(statement))
+        statements = r'|'.join(HIDE_FROM_POT)
+        for entry in entries:
+            matches = re.findall(r'(.*?)\s*?(%s)\s*?' % statements,
+                                 entry.msgid)
+            # [('How do I update my system?', '!!T')]
+            if len(matches) == 1 and len(matches[0]) == 2:
+                entry.msgid = matches[0][0]
+                entry.comment = matches[0][1]
+            if matches[0][1] in entry.msgstr:
+                entry.msgstr = entry.msgstr.replace(' %s' % matches[0][1], '')
+        self.save()
+
+    def readd_attr_list_statements(self):
+        entries = []
+        for entry_group in [self.pofile.translated_entries(),
+                            self.pofile.fuzzy_entries(),
+                            self.pofile.untranslated_entries()]:
+            for entry in entry_group:
+                for statement in HIDE_FROM_POT:
+                    if statement in entry.comment:
+                        entries += [entry]
+        for entry in entries:
+            if not entry.msgid.endswith(entry.comment):
+                entry.msgid += ' %s' % entry.comment
+            if entry.msgstr and not entry.msgstr.endswith(entry.comment):
+                entry.msgstr += ' %s' % entry.comment
+            entry.comment = ''
+        self.save()
+
+    def safeguard_meta_tags(self):
+        for tag in META_TAGS:
+            for entry in self.find_in_msgid(tag):
+                if entry.msgid == tag:
+                    entry.msgstr = entry.msgid
+        self.save()
+
+    def find_title_lines(self):
+        results = []
+        for entry in self.find_in_msgid('Title: '):
+            if entry.msgid.startswith('Title: '):
+                where = entry.occurrences[0][0]
+                first_line = codecs.open(full_path(where),
+                                         encoding='utf-8').readline().strip()
+                results += [(entry, first_line)]
+        return results
+
+    def replace_title_lines(self):
+        for entry, first_line in self.find_title_lines():
+            if entry.msgid != first_line:
+                print('Title line "%s" found, but not on the first line '
+                      'of "%s".' % (entry.msgid, entry.linenum))
+                return False
+            entry.msgid = entry.msgid.replace('Title: ', '')
+            if self.po_fn.endswith('.po'):
+                entry.msgstr = ''
+        self.save()
+        return True
+
+    def find_link_in_markdown_message(self, entry):
+        link_regex = r'\[.+?\]\(\{filename\}(.+?)\).*?'
+        link_msgid = re.findall(link_regex, entry.msgid)[0]
+        link_msgstr = list(re.findall(link_regex, entry.msgstr))
+        return (link_msgid, link_msgstr)
+
+    def rewrite_links(self, documents, bcp47):
+        for entry in self.find_in_msgid('{filename}'):
+            (link_msgid, link_msgstr) = \
+                self.find_link_in_markdown_message(entry)
+            if [doc for doc in documents.docs if doc.endswith(link_msgid)]:
+                translated_doc_fn = os.path.basename(
+                    documents.translated_doc_fn(link_msgid, bcp47))
+                if not link_msgstr:
+                    entry.msgstr = entry.msgid
+                    link_msgstr = [link_msgid]
+                entry.msgstr = entry.msgstr.replace(link_msgstr[0],
+                                                    translated_doc_fn)
+        self.save()
+
+    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
+
+
+class PO(object):
+    def __init__(self, po4a):
+        self.fake_lang_code = 'en_US'
+        self.fake_po_fn = normalise_path(
+            os.path.join(TRANSLATIONS_DIR, 
+                         '%s.po' % self.fake_lang_code))
+        self.pot_fn = normalise_path(os.path.join(TRANSLATIONS_DIR,
+                                                  'help.pot'))
+        self.pot_file_ob = POFile(self.pot_fn)
+        self.po4a = po4a
+        self.langs = {}
+        for po_fn in glob.glob(TRANSLATIONS_DIR+'/*.po'):
+            self.add_language(normalise_path(po_fn))
+
+    def add_language(self, po_fn):
+        gettext_code = os.path.basename(po_fn).split('.po')[0]
+        self.langs[po_fn] = {
+            'bcp47': find_bcp47_code(gettext_code),
+            'gettext_code': gettext_code,
+            'pofile': None,
+        }
+
+    def _remove_fake_po_file(self):
+        if os.path.exists(self.fake_po_fn):
+            os.remove(self.fake_po_fn)
+
+    def __del__(self):
+        self._remove_fake_po_file()
+
+    def load_pofile(self, po_fn):
+        if not self.langs[po_fn]['pofile']:
+            self.langs[po_fn]['pofile'] = POFile(po_fn)
+
+    def gettextize(self, documents):
+        if not self.po4a.gettextize(documents.docs, self.pot_fn):
+            return False
+        self.pot_file_ob.load()
+        return True
+
+    def generate_pot_file(self, documents):
+        if not self.gettextize(documents):
+            return False
+        if not self.pot_file_ob.replace_title_lines():
+            return False
+        self.pot_file_ob.hide_attr_list_statements()
+        for po_fn in self.langs:
+            self.load_pofile(po_fn)
+            self.langs[po_fn]['pofile'].merge(self.pot_file_ob.pofile)
+            if not self.langs[po_fn]['pofile'].replace_title_lines():
+                return False
+            self.langs[po_fn]['pofile'].hide_attr_list_statements()
+        return True
+
+    # we generate a fake translation for en-US which is going to be
+    # the default
+    def generate_fake_pofile(self):
+        pwd = use_top_level_dir()
+        self._remove_fake_po_file()
+        shutil.copy(self.pot_fn, self.fake_po_fn)
+        os.chdir(pwd)
+        self.add_language(self.fake_po_fn)
+
+    def find_translated_title_line(self, original_title, po_fn):
+        return self.langs[po_fn]['pofile'].find_translated_title_line(
+            original_title)
+
+    def rewrite_links(self, documents):
+        for po_fn in self.langs:
+            self.load_pofile(po_fn)
+            self.langs[po_fn]['pofile'].rewrite_links(
+                documents, self.langs[po_fn]['bcp47'])
+
+    def safeguard_meta_tags(self):
+        for po_fn in self.langs:
+            self.load_pofile(po_fn)
+            self.langs[po_fn]['pofile'].safeguard_meta_tags()
+
+
+class Documents(object):
+    def __init__(self):
+        self.docs = [fn for fn in self.find_docs()
+                     if verify_markdown_file(fn)]
+
+    def find_docs(self):
+        docs = []
+        for dirpath, dirnames, fns in os.walk(PATH):
+            docs += [normalise_path(os.path.join(dirpath, fn))
+                     for fn in fns
+                     if fn.endswith('.md')]
+        return docs
+
+    def translated_doc_fn(self, fn, bcp47_code):
+        match = [doc for doc in self.docs
+                 if os.path.basename(doc) == os.path.basename(fn)]
+        if not match:
+            return None
+        return '%s.%s.md' % (match[0].split('.md')[0],
+                             bcp47_code)
+
+    def _call_po4a_translate(self, doc, po_fn, po4a):
+        res = po4a.translate(doc, po_fn)
+        return codecs.decode(res.communicate()[0])
+
+    def write_translated_markdown(self, po, po4a):
+        for po_fn in po.langs:
+            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]
+                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
+                if os.path.exists(new_path):
+                    os.remove(new_path)
+                if not os.path.exists(os.path.dirname(new_path)):
+                    os.makedirs(os.path.dirname(new_path))
+                with open(new_path, 'w', encoding='utf-8') as f:
+                    f.write(text)
+            po.langs[po_fn]['pofile'].hide_attr_list_statements()
+
+
+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)
+
+    def generate_translations(self):
+        self.po.generate_fake_pofile()
+        self.po.rewrite_links(self.documents)
+        self.po.safeguard_meta_tags()
+        self.documents.write_translated_markdown(self.po, self.po4a)
 
=== added file 'internals/translations/po4a.py'
--- internals/translations/po4a.py	1970-01-01 00:00:00 +0000
+++ internals/translations/po4a.py	2015-03-19 17:24:01 +0000
@@ -0,0 +1,62 @@
+import copy
+import os
+import shutil
+import subprocess
+
+from translations.utils import (
+    require,
+    use_top_level_dir,
+)
+
+# This defines how complete we expect translations to be before we
+# generate HTML from them. Needs to be string.
+TRANSLATION_COMPLETION_PERCENTAGE = '0'
+
+
+class PO4A(object):
+    pwd = None
+
+    def __init__(self):
+        self.default_args = [
+            '-f', 'text',
+            '-o', 'markdown',
+            '-M', 'utf-8',
+            ]
+        if not shutil.which('po4a'):
+            require('po4a')
+
+    def run(self, po4a_command, additional_args, with_output=False,
+            top_level_dir=False):
+        if top_level_dir:
+            self.pwd = use_top_level_dir()
+        args = copy.copy(self.default_args)
+        args += additional_args
+        if with_output:
+            ret = subprocess.Popen([po4a_command]+args, stdout=subprocess.PIPE)
+        else:
+            ret = subprocess.call([po4a_command]+args)
+        if top_level_dir:
+            os.chdir(self.pwd)
+            self.pwd = None
+        return ret
+
+    def gettextize(self, document_fns, pot_file):
+        args = copy.copy(self.default_args)
+        for document_fn in document_fns:
+            args += ['-m', document_fn]
+        args += [
+            '-p', pot_file,
+            '-L', 'utf-8',
+            ]
+        ret = self.run('po4a-gettextize', args, top_level_dir=True)
+        return (not ret)
+
+    def translate(self, doc, po_fn):
+        args = [
+            '-k', TRANSLATION_COMPLETION_PERCENTAGE,
+            '-m', doc,
+            '-p', po_fn,
+            '-L', 'utf-8',
+            ]
+        return self.run('po4a-translate', args, with_output=True,
+                        top_level_dir=True)
 
=== renamed file 'edit-here/translations.py' => 'internals/translations/utils.py'
--- edit-here/translations.py	2015-03-17 09:24:48 +0000
+++ internals/translations/utils.py	2015-03-19 17:24:01 +0000
@@ -1,10 +1,5 @@
 import codecs
-import copy
-import glob
 import os
-import re
-import shutil
-import subprocess
 import sys
 import tempfile
 
@@ -15,11 +10,6 @@
     sys.exit(1)
 
 try:
-    import polib
-except ImportError:
-    require('python3-polib')
-
-try:
     import magic
 except:
     require('python3-magic')
@@ -29,11 +19,10 @@
 except:
     require('python3-markdown')
 
-from pelicanconf import PATH, MD_EXTENSIONS, META_TAGS, HIDE_FROM_POT
-
-# This defines how complete we expect translations to be before we
-# generate HTML from them. Needs to be string.
-TRANSLATION_COMPLETION_PERCENTAGE = '0'
+from pelicanconf import (
+    MD_EXTENSIONS,
+    TOP_LEVEL_DIR,
+)
 
 BCP47_OVERRIDES = (
     ('zh_CN', 'zh-hans'),
@@ -47,6 +36,20 @@
 ]
 
 
+def normalise_path(path):
+    return os.path.relpath(path, TOP_LEVEL_DIR)
+
+
+def full_path(path):
+    return os.path.abspath(os.path.join(TOP_LEVEL_DIR, path))
+
+
+def use_top_level_dir():
+    pwd = os.getcwd()
+    os.chdir(TOP_LEVEL_DIR)
+    return pwd
+
+
 def _temp_write_markdown(fn):
     (ret, tmp) = tempfile.mkstemp()
     length = 0
@@ -65,6 +68,7 @@
 def verify_markdown_file(fn):
     ms = magic.open(magic.MAGIC_NONE)
     ms.load()
+    fn = full_path(fn)
     if ms.file(fn) not in MD_MAGIC_FILE_TYPES:
         return False
     (ret, length) = _temp_write_markdown(fn)
@@ -78,314 +82,3 @@
         return gettext_code.lower().replace('_', '-')
     return [c[1] for c in BCP47_OVERRIDES
             if c[0] == gettext_code][0]
-
-
-class PO4A(object):
-    def __init__(self):
-        self.default_args = [
-            '-f', 'text',
-            '-o', 'markdown',
-            '-M', 'utf-8',
-            ]
-        if not shutil.which('po4a'):
-            require('po4a')
-
-    def run(self, po4a_command, additional_args, with_output=False):
-        args = copy.copy(self.default_args)
-        args += additional_args
-        if with_output:
-            ret = subprocess.Popen([po4a_command]+args, stdout=subprocess.PIPE)
-        else:
-            ret = subprocess.call([po4a_command]+args)
-        return ret
-
-    def gettextize(self, document_fns, pot_file):
-        args = copy.copy(self.default_args)
-        for document_fn in document_fns:
-            args += ['-m', document_fn]
-        args += [
-            '-p', pot_file,
-            '-L', 'utf-8',
-            ]
-        ret = self.run('po4a-gettextize', args)
-        return (not ret)
-
-    def translate(self, doc, po_fn):
-        args = [
-            '-k', TRANSLATION_COMPLETION_PERCENTAGE,
-            '-m', doc,
-            '-p', po_fn,
-            '-L', 'utf-8',
-            ]
-        return self.run('po4a-translate', args, with_output=True)
-
-
-class POFile(object):
-    def __init__(self, po_fn):
-        self.po_fn = po_fn
-        self.pofile = polib.pofile(po_fn)
-
-    def reread(self):
-        self.pofile = polib.pofile(self.po_fn)
-
-    def merge(self, pot_file_ob):
-        self.pofile.merge(pot_file_ob)
-
-    def save(self):
-        self.pofile.save(self.po_fn)
-
-    def find_in_msgid(self, find_str, translated=True, fuzzy=True,
-                      untranslated=True):
-        entries = []
-        if translated:
-            entries += self.pofile.translated_entries()
-        if fuzzy:
-            entries += self.pofile.fuzzy_entries()
-        if untranslated:
-            entries += self.pofile.untranslated_entries()
-        results = []
-        for entry in entries:
-            if find_str in entry.msgid:
-                results += [entry]
-        return results
-
-    def hide_attr_list_statements(self):
-        entries = []
-        for statement in HIDE_FROM_POT:
-            entries.extend(self.find_in_msgid(statement))
-        statements = r'|'.join(HIDE_FROM_POT)
-        for entry in entries:
-            matches = re.findall(r'(.*?)\s*?(%s)\s*?' % statements,
-                                 entry.msgid)
-            # [('How do I update my system?', '!!T')]
-            if len(matches) == 1 and len(matches[0]) == 2:
-                entry.msgid = matches[0][0]
-                entry.comment = matches[0][1]
-            if matches[0][1] in entry.msgstr:
-                entry.msgstr = entry.msgstr.replace(' %s' % matches[0][1], '')
-        self.save()
-
-    def readd_attr_list_statements(self):
-        entries = []
-        for entry_group in [self.pofile.translated_entries(),
-                            self.pofile.fuzzy_entries(),
-                            self.pofile.untranslated_entries()]:
-            for entry in entry_group:
-                for statement in HIDE_FROM_POT:
-                    if statement in entry.comment:
-                        entries += [entry]
-        for entry in entries:
-            if not entry.msgid.endswith(entry.comment):
-                entry.msgid += ' %s' % entry.comment
-            if entry.msgstr and not entry.msgstr.endswith(entry.comment):
-                entry.msgstr += ' %s' % entry.comment
-            entry.comment = ''
-        self.save()
-
-    def safeguard_meta_tags(self):
-        for tag in META_TAGS:
-            for entry in self.find_in_msgid(tag):
-                if entry.msgid == tag:
-                    entry.msgstr = entry.msgid
-        self.save()
-
-    def find_title_lines(self):
-        results = []
-        for entry in self.find_in_msgid('Title: '):
-            if entry.msgid.startswith('Title: '):
-                where = entry.occurrences[0][0]
-                first_line = codecs.open(where,
-                                         encoding='utf-8').readline().strip()
-                results += [(entry, first_line)]
-        return results
-
-    def replace_title_lines(self):
-        for entry, first_line in self.find_title_lines():
-            if entry.msgid != first_line:
-                print('Title line "%s" found, but not on the first line '
-                      'of "%s".' % (entry.msgid, entry.linenum))
-                return False
-            entry.msgid = entry.msgid.replace('Title: ', '')
-            if self.po_fn.endswith('.po'):
-                entry.msgstr = ''
-        self.save()
-        return True
-
-    def find_link_in_markdown_message(self, entry):
-        link_regex = r'\[.+?\]\(\{filename\}(.+?)\).*?'
-        link_msgid = re.findall(link_regex, entry.msgid)[0]
-        link_msgstr = list(re.findall(link_regex, entry.msgstr))
-        return (link_msgid, link_msgstr)
-
-    def rewrite_links(self, documents, bcp47):
-        for entry in self.find_in_msgid('{filename}'):
-            (link_msgid, link_msgstr) = \
-                self.find_link_in_markdown_message(entry)
-            if [doc for doc in documents.docs if doc.endswith(link_msgid)]:
-                translated_doc_fn = os.path.basename(
-                    documents.translated_doc_fn(link_msgid, bcp47))
-                if not link_msgstr:
-                    entry.msgstr = entry.msgid
-                    link_msgstr = [link_msgid]
-                entry.msgstr = entry.msgstr.replace(link_msgstr[0],
-                                                    translated_doc_fn)
-        self.save()
-
-    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
-
-
-class PO(object):
-    def __init__(self, po4a):
-        self.translations_dir = os.path.abspath(os.path.join(PATH, '../po'))
-        self.fake_lang_code = 'en_US'
-        self.fake_po_fn = os.path.join(self.translations_dir,
-                                       '%s.po' % self.fake_lang_code)
-        self.pot_fn = os.path.join(self.translations_dir, 'help.pot')
-        self.pot_file_ob = POFile(self.pot_fn)
-        self.po4a = po4a
-        self.langs = {}
-        for po_fn in glob.glob(self.translations_dir+'/*.po'):
-            self.add_language(po_fn)
-
-    def add_language(self, po_fn):
-        gettext_code = os.path.basename(po_fn).split('.po')[0]
-        self.langs[po_fn] = {
-            'bcp47': find_bcp47_code(gettext_code),
-            'gettext_code': gettext_code,
-            'pofile': None,
-        }
-
-    def _remove_fake_po_file(self):
-        if os.path.exists(self.fake_po_fn):
-            os.remove(self.fake_po_fn)
-
-    def __del__(self):
-        self._remove_fake_po_file()
-
-    def load_pofile(self, po_fn):
-        if not self.langs[po_fn]['pofile']:
-            self.langs[po_fn]['pofile'] = POFile(po_fn)
-
-    def gettextize(self, documents):
-        if not self.po4a.gettextize(documents.docs, self.pot_fn):
-            return False
-        self.pot_file_ob.reread()
-        return True
-
-    def generate_pot_file(self, documents):
-        if not self.gettextize(documents):
-            return False
-        if not self.pot_file_ob.replace_title_lines():
-            return False
-        self.pot_file_ob.hide_attr_list_statements()
-        for po_fn in self.langs:
-            self.load_pofile(po_fn)
-            self.langs[po_fn]['pofile'].merge(self.pot_file_ob.pofile)
-            if not self.langs[po_fn]['pofile'].replace_title_lines():
-                return False
-            self.langs[po_fn]['pofile'].hide_attr_list_statements()
-        return True
-
-    # we generate a fake translation for en-US which is going to be
-    # the default
-    def generate_fake_pofile(self):
-        self._remove_fake_po_file()
-        shutil.copy(self.pot_fn, self.fake_po_fn)
-        self.add_language(self.fake_po_fn)
-
-    def find_translated_title_line(self, original_title, po_fn):
-        return self.langs[po_fn]['pofile'].find_translated_title_line(
-            original_title)
-
-    def rewrite_links(self, documents):
-        for po_fn in self.langs:
-            self.load_pofile(po_fn)
-            self.langs[po_fn]['pofile'].rewrite_links(
-                documents, self.langs[po_fn]['bcp47'])
-
-    def safeguard_meta_tags(self):
-        for po_fn in self.langs:
-            self.load_pofile(po_fn)
-            self.langs[po_fn]['pofile'].safeguard_meta_tags()
-
-
-class Documents(object):
-    def __init__(self):
-        self.docs = [fn for fn in self.find_docs()
-                     if verify_markdown_file(fn)]
-
-    def find_docs(self):
-        docs = []
-        for dirpath, dirnames, fns in os.walk(PATH):
-            docs += [os.path.relpath(os.path.join(dirpath, fn),
-                                     os.path.join(PATH, '..'))
-                     for fn in fns
-                     if fn.endswith('.md')]
-        return docs
-
-    def translated_doc_fn(self, fn, bcp47_code):
-        match = [doc for doc in self.docs
-                 if os.path.basename(doc) == os.path.basename(fn)]
-        if not match:
-            return None
-        return '%s.%s.md' % (match[0].split('.md')[0],
-                             bcp47_code)
-
-    def _call_po4a_translate(self, doc, po_fn, po4a):
-        res = po4a.translate(doc, po_fn)
-        return codecs.decode(res.communicate()[0])
-
-    def write_translated_markdown(self, po, po4a):
-        for po_fn in po.langs:
-            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]
-                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 = self.translated_doc_fn(doc_fn,
-                                                  po.langs[po_fn]['bcp47'])
-                text = "Title: %s\nDate:\n\n" % (translated_title_line)
-                text += output
-                if os.path.exists(new_path):
-                    os.remove(new_path)
-                if not os.path.exists(os.path.dirname(new_path)):
-                    os.makedirs(os.path.dirname(new_path))
-                with open(new_path, 'w', encoding='utf-8') as f:
-                    f.write(text)
-            po.langs[po_fn]['pofile'].hide_attr_list_statements()
-
-
-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 = [os.path.join(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)
-
-    def generate_translations(self):
-        self.po.generate_fake_pofile()
-        self.po.rewrite_links(self.documents)
-        self.po.safeguard_meta_tags()
-        self.documents.write_translated_markdown(self.po, self.po4a)
 
=== renamed directory 'edit-here/po' => 'po'
=== modified file 'po/help.pot'
--- edit-here/po/help.pot	2015-03-19 11:16:04 +0000
+++ po/help.pot	2015-03-19 17:24:01 +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 12:15+0100\n"
+"POT-Creation-Date: 2015-03-19 15:41+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 "Security"
+msgid "Title: Security"
 msgstr ""
 
 #. type: Plain text
@@ -28,16 +28,14 @@
 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/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
+#. type: Title ###
 #: content/pages/security.md:7
 #, no-wrap
-msgid "How do I lock the phone?"
+msgid "How do I lock the phone? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -49,10 +47,10 @@
 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/security.md:10
 #, no-wrap
-msgid "How do I unlock the phone?"
+msgid "How do I unlock the phone? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -62,10 +60,10 @@
 "enabled, you might be required to enter a pin or passcode."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/security.md:13
 #, no-wrap
-msgid "How do I unlock the bootloader?"
+msgid "How do I unlock the bootloader? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -75,10 +73,10 @@
 "related tasks, see the [developer site](http://developer.ubuntu.com/)"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/security.md:16
 #, no-wrap
-msgid "How can I change my PIN/Passcode?"
+msgid "How can I change my PIN/Passcode? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -88,12 +86,12 @@
 "*Security & Privacy* to adjust the *Lock when idle* setting."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: 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)? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -103,11 +101,10 @@
 "pin/passcode is required. This is for your phone security."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: 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? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -119,10 +116,10 @@
 "settings* option."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/security.md:25
 #, no-wrap
-msgid "I forgot my password or passcode. How can I unlock the phone?"
+msgid "I forgot my password or passcode. How can I unlock the phone? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -132,7 +129,7 @@
 
 #. type: Plain text
 #: content/pages/basic.md:2
-msgid "Basic tasks"
+msgid "Title: Basic tasks"
 msgstr ""
 
 #. type: Plain text
@@ -141,37 +138,37 @@
 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/basic.md:7
 #, no-wrap
-msgid "How do I play music?"
+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."
+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
+"music."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/basic.md:10
 #, no-wrap
-msgid "How do I play videos?"
+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."
+"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
+#. type: Title ###
 #: content/pages/basic.md:13
 #, no-wrap
-msgid "How do I take photos?"
+msgid "How do I take photos? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -181,38 +178,38 @@
 "has both a front and rear camera, you can toggle which camera to use."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/basic.md:16
 #, no-wrap
-msgid "How do I take a screenshot?"
+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."
+"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
+#. type: Title ###
 #: content/pages/basic.md:19
 #, no-wrap
-msgid "How do I see pictures I’ve taken?"
+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 "
+"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
+#. type: Title ###
 #: content/pages/basic.md:22
 #, no-wrap
-msgid "How do I record videos?"
+msgid "How do I record videos? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -222,10 +219,10 @@
 "has both a front and rear camera, you can toggle which camera to use."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/basic.md:25
 #, no-wrap
-msgid "How can I send a text?"
+msgid "How can I send a text? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -235,10 +232,10 @@
 "messages."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/basic.md:28
 #, no-wrap
-msgid "How do I make a call?"
+msgid "How do I make a call? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -248,10 +245,10 @@
 "number."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/basic.md:31
 #, no-wrap
-msgid "How do I check recently made/missed calls?"
+msgid "How do I check recently made/missed calls? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -263,7 +260,7 @@
 
 #. type: Plain text
 #: content/pages/faq.md:2
-msgid "Get your questions answered."
+msgid "Title: Get your questions answered."
 msgstr ""
 
 #. type: Plain text
@@ -311,7 +308,7 @@
 
 #. type: Plain text
 #: content/pages/index.md:2
-msgid "Welcome"
+msgid "Title: Welcome"
 msgstr ""
 
 #. type: Plain text
@@ -348,7 +345,7 @@
 
 #. type: Plain text
 #: content/pages/settings.md:2
-msgid "Settings"
+msgid "Title: Settings"
 msgstr ""
 
 #. type: Plain text
@@ -357,10 +354,10 @@
 msgid "*How do I change my phone settings?*\n"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/settings.md:7
 #, no-wrap
-msgid "How do I update my system?"
+msgid "How do I update my system? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -368,14 +365,14 @@
 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."
+"and perform an update yourself. Open the *System Settings* "
+"application. Select *Update*, and then click the check for updates button."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/settings.md:10
 #, no-wrap
-msgid "How do I set the time / language?"
+msgid "How do I set the time / language? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -386,23 +383,24 @@
 "![Icon]({filename}/images/settings.gif)"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/settings.md:14
 #, no-wrap
-msgid "How can I change my wallpaper/background?"
+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."
+"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
+#. type: Title ###
 #: content/pages/settings.md:17
 #, no-wrap
-msgid "How do I keep the screen on?"
+msgid "How do I keep the screen on? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -412,26 +410,26 @@
 "option. Select the *Lock Phone* option, and then *Lock when idle*. St"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/settings.md:20
 #, no-wrap
-msgid "How do I set up my accounts?"
+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 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
+#. type: Title ###
 #: content/pages/settings.md:23
 #, no-wrap
-msgid "How do I configure my notifications?"
+msgid "How do I configure my notifications? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -443,10 +441,10 @@
 "notifications from any application on your device."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/settings.md:26
 #, no-wrap
-msgid "How do I change the ringtone for calls and texts?"
+msgid "How do I change the ringtone for calls and texts? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -460,36 +458,36 @@
 
 #. type: Plain text
 #: content/pages/ui.md:2
-msgid "User Interface"
+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"
+"*Are you wondering about the dash, scopes, swiping? You've come to the right "
+"place!*\n"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/ui.md:7
 #, no-wrap
-msgid "What is the dash?"
+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 "
+"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
+#. type: Title ###
 #: content/pages/ui.md:10
 #, no-wrap
-msgid "What is the launcher?"
+msgid "What is the launcher? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -499,10 +497,10 @@
 "the launcher at any time by swiping right from the left screen edge."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/ui.md:13
 #, no-wrap
-msgid "How can I customize the launcher?"
+msgid "How can I customize the launcher? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -515,69 +513,68 @@
 "in."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/ui.md:17
 #, no-wrap
-msgid "What are the indicators?"
+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 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
+#. type: Title ###
 #: content/pages/ui.md:20
 #, no-wrap
-msgid "How do I switch applications?"
+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."
+"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
+#. type: Title ###
 #: content/pages/ui.md:24
 #, no-wrap
-msgid "How do I close applications?"
+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."
+"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
+#. type: Title ###
 #: content/pages/ui.md:27
 #, no-wrap
-msgid "How can I copy and paste?"
+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."
+"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
+#. type: Title ###
 #: 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? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -588,10 +585,10 @@
 "numbers and accented characters. Give it a try!"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/ui.md:33
 #, no-wrap
-msgid "The keyboard behaves funny. What can I do about it?"
+msgid "The keyboard behaves funny. What can I do about it? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -603,10 +600,10 @@
 "control of the input."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/ui.md:36
 #, no-wrap
-msgid "How can I add a new keyboard language?"
+msgid "How can I add a new keyboard language? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -616,14 +613,14 @@
 "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)"
+"then tick the keyboard you want to add and then [use "
+"it](#how-can-i-switch-between-keyboard-languages)"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/ui.md:40
 #, no-wrap
-msgid "How can I switch between keyboard languages?"
+msgid "How can I switch between keyboard languages? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -636,42 +633,43 @@
 "activated it in the Settings app](#how-can-i-add-a-new-keyboard-language)."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/ui.md:44
 #, no-wrap
-msgid "How can I type Emoji icons?"
+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)."
+"[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
+#. 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?"
+"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 "
+"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 "Apps"
+msgid "Title: Apps"
 msgstr ""
 
 #. type: Plain text
@@ -688,24 +686,24 @@
 msgid "The Store"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:10
 #, no-wrap
-msgid "How do I find and install new scopes and applications?"
+msgid "How do I find and install new scopes and applications? !!T"
 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 ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:13
 #, no-wrap
-msgid "How can I browse the store from my PC?"
+msgid "How can I browse the store from my PC? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -716,19 +714,19 @@
 "store](https://appstore.bhdouglass.com/apps)."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:16
 #, no-wrap
-msgid "How do I remove scopes and applications?"
+msgid "How do I remove scopes and applications? !!T"
 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 ##
@@ -737,10 +735,10 @@
 msgid "Misc"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:21
 #, no-wrap
-msgid "Do you have Spotify?"
+msgid "Do you have Spotify? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -750,10 +748,10 @@
 "([video](https://www.youtube.com/watch?v=ea90rwK_VuI))."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:25
 #, no-wrap
-msgid "Do you have Google Authenticator?"
+msgid "Do you have Google Authenticator? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -767,27 +765,27 @@
 msgid "Music"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:30
 #, no-wrap
-msgid "How do I add music to my device?"
+msgid "How do I add music to my device? !!T"
 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 ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:33
 #, no-wrap
-msgid "What music formats are supported?"
+msgid "What music formats are supported? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -795,10 +793,10 @@
 msgid "The music app supports OGG, FLAG and MP3 formats."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:36
 #, no-wrap
-msgid "How do I listen to podcasts? !"
+msgid "How do I listen to podcasts? !!!T"
 msgstr ""
 
 #. type: Plain text
@@ -814,20 +812,20 @@
 msgid "Contacts"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:41
 #, no-wrap
-msgid "How can I sync my Google contacts to my device?"
+msgid "How can I sync my Google contacts to my device? !!T"
 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 ##
@@ -836,10 +834,10 @@
 msgid "Gallery"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:46
 #, no-wrap
-msgid "How can I share photos?"
+msgid "How can I share photos? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -851,19 +849,19 @@
 "you wish to share your photo."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:49
 #, no-wrap
-msgid "How can I share videos?"
+msgid "How can I share videos? !!T"
 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 ##
@@ -872,10 +870,10 @@
 msgid "Camera"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:54
 #, no-wrap
-msgid "How can I take a picture?"
+msgid "How can I take a picture? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -885,31 +883,31 @@
 "bottom edge of the phone for additional options. Enjoy taking your picture!"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:57
 #, no-wrap
-msgid "How can I crop / rotate a picture?"
+msgid "How can I crop / rotate a picture? !!T"
 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 ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:60
 #, no-wrap
-msgid "How can I record video?"
+msgid "How can I record video? !!T"
 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 ##
@@ -918,10 +916,10 @@
 msgid "Clock"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:65
 #, no-wrap
-msgid "How do I set an alarm?"
+msgid "How do I set an alarm? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -943,10 +941,10 @@
 msgid "HERE Maps"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:71
 #, no-wrap
-msgid "How can I get directions?"
+msgid "How can I get directions? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -956,10 +954,10 @@
 "*Directions*. Enter your destination and tap the *Get Directions* button."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:74
 #, no-wrap
-msgid "Can I navigate offline?"
+msgid "Can I navigate offline? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -967,10 +965,10 @@
 msgid "Unfortunately navigation requires an active connection."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/apps.md:77
 #, no-wrap
-msgid "Can I view the map offline?"
+msgid "Can I view the map offline? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -982,7 +980,7 @@
 
 #. type: Plain text
 #: content/pages/get-in-touch.md:2
-msgid "Get in touch"
+msgid "Title: Get in touch"
 msgstr ""
 
 #. type: Plain text
@@ -1007,7 +1005,7 @@
 
 #. type: Plain text
 #: content/pages/scopes.md:2
-msgid "Scopes"
+msgid "Title: Scopes"
 msgstr ""
 
 #. type: Plain text
@@ -1016,25 +1014,25 @@
 msgid "*Curious about scopes?*\n"
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/scopes.md:7
 #, no-wrap
-msgid "How do favorites work?"
+msgid "How do favorites work? !!T"
 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 ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/scopes.md:10
 #, no-wrap
-msgid "How do I add new scopes?"
+msgid "How do I add new scopes? !!T"
 msgstr ""
 
 #. type: Plain text
@@ -1046,10 +1044,10 @@
 "store button in the upper right to look for it in the ubuntu store."
 msgstr ""
 
-#. !!T
+#. type: Title ###
 #: content/pages/scopes.md:13
 #, no-wrap
-msgid "How do I remove a scope?"
+msgid "How do I remove a scope? !!T"
 msgstr ""
 
 #. type: Plain text
 
=== added directory 'static'
=== renamed directory 'app' => 'static/app'
=== renamed file 'edit-here/index.html' => 'static/index.html'
=== renamed directory 'edit-here/themes' => 'static/themes'
=== renamed directory 'edit-here/themes/phone' => 'static/themes/app'