Merging translations:
---------------------

Get latest updates from Transifex:

  $ tx pull
  $ a2po import

Export latest local changes (let local gettext do the merge instead of Transifex):

  $ a2po export

Push new template to transifex:

  $ tx push -st --skip


Releasing a new version
-----------------------

   $ git flow release start X
   - Update changelog
   - Update version number in AndroidManifest.xml
   $ ./cli/build.sh
   - Test the result on a device
   $ git flow release finish X
   $ git checkout X
   $ ./cli/deploy.sh
   - Manually publish & save all builds.
   $ git checkout master
   $ git push --all --tags
