Commit ee77c566 authored by intrigeri's avatar intrigeri

Merge branch 'bugfix/17783-ensure-translated-mac-spoofing-messages' into 'stable'

Ensure MAC spoofing messages are correctly translated

See merge request tails/tails!70
parents f7726cdf cbb6b631
......@@ -82,11 +82,6 @@ if [ -z "${LIVE_USERNAME}" ] ; then
log_n_exit "Username variable not found."
fi
### Physical security
log "Running /usr/local/lib/tails-unblock-network..."
/usr/local/lib/tails-unblock-network
log "tails-unblock-network has exited (status=$?)."
### Localization
# Import locale settings
......@@ -125,6 +120,11 @@ XKBVARIANT="$TAILS_XKBVARIANT"
XKBOPTIONS="$TAILS_XKBOPTIONS"
EOF
### Physical security
log "Running /usr/local/lib/tails-unblock-network..."
/usr/local/lib/tails-unblock-network
log "tails-unblock-network has exited (status=$?)."
### Password
# Import password for superuser access
......
......@@ -14,6 +14,10 @@ set -u
# Get LIVE_USERNAME
. /etc/live/config.d/username.conf
# Get LANG
. /etc/default/locale
export LANG
. /usr/bin/gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment