diff --git a/scripts/extract-l10n.sh b/scripts/extract-l10n.sh
new file mode 100755
index 0000000000..ce051a7249
--- /dev/null
+++ b/scripts/extract-l10n.sh
@@ -0,0 +1,159 @@
+#! /bin/bash
+#
+# This script will do the following:
+#   - checkout and update git master branch
+#   - create a new branch (name should look like l10n-extract-<date>-<rev>)
+#   - Extract new strings and update the .po/.pot files
+#   - Commit that extraction to the branch
+#
+# If you provide a GITHUB_TOKEN variable to the environment then this script
+# can also automatically push to a remote branch and create a pull request for
+# you through addons-robot. Ask @diox or @muffinresearch for this token.
+
+# Exit immediately when a command fails.
+set -e
+
+# Make sure exit code are respected in a pipeline.
+set -o pipefail
+
+# Treat unset variables as an error an exit immediately.
+set -u
+
+INITIAL_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+GIT_CHANGES=$(git status --porcelain)
+GIT_REMOTE="https://github.com/mozilla/addons-server.git"  # Upstream.
+REV=""
+MESSAGE=""
+BRANCH_NAME=""
+ROBOT_EMAIL="addons-dev-automation+github@mozilla.com"
+ROBOT_NAME="Mozilla Add-ons Robot"
+
+# gettext flags
+CLEAN_FLAGS="--no-obsolete --width=200 --no-location"
+MERGE_FLAGS="--update --width=200 --backup=none"
+UNIQ_FLAGS="--width=200"
+
+info() {
+  local message="$1"
+
+  echo ""
+  echo "INFO: $message"
+  echo ""
+}
+
+error() {
+  local message="$1"
+
+  echo "ERROR: $message"
+  exit 1
+}
+
+function init_environment {
+    # Detect local (uncommitted) changes.
+    if [[ ! -z "$GIT_CHANGES" ]]; then
+      error "You have local changes, therefore this script cannot continue."
+    fi
+
+    # Switch to the `master` branch if we are not on it already.
+    if [[ "$INITIAL_GIT_BRANCH" != "master" ]]; then
+      git checkout master
+    fi
+
+    # Make sure the 'master' branch is up-to-date.
+    git pull "$GIT_REMOTE" master
+
+    REV=$(git rev-parse --short HEAD)
+    MESSAGE="Extracted l10n messages from $(date -u --iso-8601=date) at $REV"
+    BRANCH_NAME="l10n-extract-$(date -u --iso-8601=date)-$REV"
+
+    # Ensure the branch to extract the locales is clean.
+    if [[ $(git branch --list "$BRANCH_NAME") ]]; then
+      info "Deleting branch '$BRANCH_NAME' because it already exists"
+      git branch -D "$BRANCH_NAME"
+    fi
+
+    info "Creating and switching to branch '$BRANCH_NAME'"
+    git checkout -b "$BRANCH_NAME"
+
+    make -f Makefile-docker install_python_dev_dependencies
+    make -f Makefile-docker install_node_js
+}
+
+function run_l10n_extraction {
+    python3 manage.py extract_content_strings
+    python3 manage.py extract
+
+    pushd locale > /dev/null
+
+    info "Merging any new keys..."
+    for i in `find . -name "django.po" | grep -v "en_US"`; do
+        msguniq $UNIQ_FLAGS -o "$i" "$i"
+        msgmerge $MERGE_FLAGS "$i" "templates/LC_MESSAGES/django.pot"
+    done
+    msgen templates/LC_MESSAGES/django.pot | msgmerge $MERGE_FLAGS en_US/LC_MESSAGES/django.po -
+
+    info "Merging any new javascript keys..."
+    for i in `find . -name "djangojs.po" | grep -v "en_US"`; do
+        msguniq $UNIQ_FLAGS -o "$i" "$i"
+        msgmerge $MERGE_FLAGS "$i" "templates/LC_MESSAGES/djangojs.pot"
+    done
+    msgen templates/LC_MESSAGES/djangojs.pot | msgmerge $MERGE_FLAGS en_US/LC_MESSAGES/djangojs.po -
+
+    info "Cleaning out obsolete messages..."
+    for i in `find . -name "django.po"`; do
+        msgattrib $CLEAN_FLAGS --output-file=$i $i
+    done
+    for i in `find . -name "djangojs.po"`; do
+        msgattrib $CLEAN_FLAGS --output-file=$i $i
+    done
+
+    msgfilter -i sr/LC_MESSAGES/django.po -o sr_Latn/LC_MESSAGES/django.po recode-sr-latin
+
+    popd > /dev/null
+
+    info "Done extracting."
+}
+
+function commit {
+    info "Committing..."
+    git -c user.name="$ROBOT_NAME" -c user.email="$ROBOT_EMAIL" commit -m "$MESSAGE" --author "$ROBOT_NAME <$ROBOT_EMAIL>" --no-gpg-sign locale/*/LC_MESSAGES/*.po locale/templates/
+    info "Committed locales extraction to local branch."
+}
+
+
+function generate_post_data()
+{
+  cat <<EOF
+{
+    "title": "$MESSAGE",
+    "head": "$BRANCH_NAME",
+    "base":"master"
+}
+EOF
+}
+
+
+function create_pull_request {
+    info "Pushing the branch..."
+    git push -q "https://addons-robot:$GITHUB_TOKEN@github.com/mozilla/addons-server/"
+    info "Creating the auto merge pull request for $BRANCH_NAME ..."
+    curl --verbose -H "Authorization: token $GITHUB_TOKEN" --data "$(generate_post_data)" "https://api.github.com/repos/mozilla/addons-server/pulls"
+    info "Pull request created."
+}
+
+init_environment
+
+run_l10n_extraction
+
+commit
+
+# This script is meant to be run inside a virtualenv or inside our docker
+# container. If it's the latter, it doesn't necessarily have access to the ssh
+# config, therefore we can't reliably push and create a pull request without a
+# GitHub API token.
+if [[ -z "${GITHUB_TOKEN-}" ]]
+then
+    info "No github token present. You should now go back to your normal environment to push this branch and create the pull request."
+else
+    create_pull_request
+fi
diff --git a/scripts/travis-extract-l10n.sh b/scripts/travis-extract-l10n.sh
deleted file mode 100755
index 0da29d71eb..0000000000
--- a/scripts/travis-extract-l10n.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#! /bin/bash
-# This script is supposed to be running automatically via travis cronjobs.
-# It's also possible to be run manually if necessary.
-#
-# This script will do the following:
-#   - prepare git credentials for pull request push
-#   - create a new branch (l10n-extract-2017-08-24-0b3bcaf2ca)
-#   - Update your code
-#   - Extract new strings and push to the .po files
-#
-# If you're running the script manually please make sure to expose
-# the following variables to the environment:
-#   - GITHUB_TOKEN (to the github token of addons-robot,
-#                   talk to tofumatt or cgrebs)
-#   - TRAVIS_REPO_SLUG="mozilla/addons-server"
-#   - TRAVIS_BRANCH="master"
-
-set -o errexit -o nounset
-
-REV=$(git rev-parse --short HEAD)
-MESSAGE="Extracted l10n messages from $(date -u --iso-8601=date) at $REV"
-BRANCH_NAME="l10n-extract-$(date -u --iso-8601=date)-$REV"
-ROBOT_EMAIL="addons-dev-automation+github@mozilla.com"
-ROBOT_NAME="Mozilla Add-ons Robot"
-
-# gettext flags
-CLEAN_FLAGS="--no-obsolete --width=200 --no-location"
-MERGE_FLAGS="--update --width=200 --backup=none"
-UNIQ_FLAGS="--width=200"
-
-function init_environment {
-    git checkout master
-    git checkout -b "$BRANCH_NAME"
-
-    make -f Makefile-docker install_python_test_dependencies
-    make -f Makefile-docker install_node_js
-}
-
-
-function extract_locales {
-    python manage.py extract_content_strings
-    python manage.py extract
-
-    pushd locale > /dev/null
-
-    echo "Merging any new keys..."
-    for i in `find . -name "django.po" | grep -v "en_US"`; do
-        msguniq $UNIQ_FLAGS -o "$i" "$i"
-        msgmerge $MERGE_FLAGS "$i" "templates/LC_MESSAGES/django.pot"
-    done
-    msgen templates/LC_MESSAGES/django.pot | msgmerge $MERGE_FLAGS en_US/LC_MESSAGES/django.po -
-
-    echo "Merging any new javascript keys..."
-    for i in `find . -name "djangojs.po" | grep -v "en_US"`; do
-        msguniq $UNIQ_FLAGS -o "$i" "$i"
-        msgmerge $MERGE_FLAGS "$i" "templates/LC_MESSAGES/djangojs.pot"
-    done
-    msgen templates/LC_MESSAGES/djangojs.pot | msgmerge $MERGE_FLAGS en_US/LC_MESSAGES/djangojs.po -
-
-    echo "Cleaning out obsolete messages.  See bug 623634 for details."
-    for i in `find . -name "django.po"`; do
-        msgattrib $CLEAN_FLAGS --output-file=$i $i
-    done
-    for i in `find . -name "djangojs.po"`; do
-        msgattrib $CLEAN_FLAGS --output-file=$i $i
-    done
-
-    msgfilter -i sr/LC_MESSAGES/django.po -o sr_Latn/LC_MESSAGES/django.po recode-sr-latin
-
-    popd > /dev/null
-
-    echo "done."
-}
-
-
-function commit_and_push {
-    git commit -m "$MESSAGE" --author "$ROBOT_NAME <$ROBOT_EMAIL>" --no-gpg-sign locale/*/LC_MESSAGES/*.po locale/templates/
-    git push -q "https://addons-robot:$GITHUB_TOKEN@github.com/$TRAVIS_REPO_SLUG/"
-}
-
-
-function generate_post_data()
-{
-  cat <<EOF
-{
-    "title": "$MESSAGE",
-    "head": "$BRANCH_NAME",
-    "base":"master"
-}
-EOF
-}
-
-
-function create_auto_pull_request {
-    CREATE_PULL_REQUEST_URL="https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls"
-    echo "Creating the auto merge pull request for $BRANCH_NAME ..."
-    curl --verbose -H "Authorization: token $GITHUB_TOKEN" --data "$(generate_post_data)" $CREATE_PULL_REQUEST_URL
-    echo "auto merge pull request is created ..."
-}
-
-if [ "$TRAVIS_BRANCH" != "master" ]; then
-  echo "This commit was made against the $TRAVIS_BRANCH and not the master! No extract!"
-  exit 0
-fi
-
-if [ "GITHUB_TOKEN" == "" ]
-then
-    echo "Must provide github token"
-    exit 0
-fi
-
-init_environment
-
-extract_locales
-
-commit_and_push
-
-create_auto_pull_request