Translation Update Hotfix Release

# Checkout master and update it
git checkout maser
git fetch origin
git rebase origin/master

# Check out a new hotfix branch (e.g. hotfix/0.21.0.37)
git checkout -b hotfix/x.x.x.x

# Download the current translations
# Install transifex-client: http://docs.transifex.com/developer/client/setup
tx pull -a -f

# Convert the translations to a standard msgmerge format and commit them
# NOTE: Check the translations for XSS insertion
# IMPORTANT: there's no revision history in Transifex!
bundle exec rake gettext:clean
git add locale
git commit -m 'Update translations'

#
# Bump the ALAVETELI_VERSION constant in config/initializers/alaveteli.rb
#

# Merge the hotfix branch
git checkout master
git merge --no-ff hotfix/x.x.x.x

# Tag the release
git tag -a x.x.x.x -m 'x.x.x.x'

# Make the release
git push --tags origin master

# Update develop
git checkout develop
git fetch origin
git rebase origin/develop
git merge --no-ff hotfix/x.x.x.x
git push origin develop