diff --git a/Rakefile b/Rakefile
index 8b813e29cb7434923f76925f7bce89394f0993c0..97e83ab8d7a465220968872bc5f8c2fcfc9ea470 100644
--- a/Rakefile
+++ b/Rakefile
@@ -370,7 +370,7 @@ task :setup_environment => ['validate_git_state'] do
     end
   end
 
-  ENV['BASE_BRANCH_GIT_COMMIT'] = git_helper('git_base_branch_head')
+  ENV['BASE_BRANCH_GIT_COMMIT'] ||= git_helper('git_base_branch_head')
   ['GIT_COMMIT', 'GIT_REF', 'BASE_BRANCH_GIT_COMMIT'].each do |var|
     if ENV[var].empty?
       raise "Variable '#{var}' is empty, which should not be possible: " +
diff --git a/auto/build b/auto/build
index 0c3b0f7055eb40d461f3e5ed718b2f4ad50cb52c..7b2a351c185d41cc43258d8f6a596d16e61f1519 100755
--- a/auto/build
+++ b/auto/build
@@ -11,21 +11,21 @@ set -x
 
 umask 022
 
-### functions
+### Clone all output, from this point on, to the log file
 
-syslinux_utils_upstream_version () {
-   dpkg-query -W -f='${Version}\n' syslinux-utils | \
-       # drop epoch
-       sed -e 's,.*:,,' | \
-       # drop +dfsg and everything that follows
-       sed -e 's,\+dfsg.*,,'
-}
+BUILD_LOG="${BUILD_BASENAME}.buildlog"
+exec >  >(tee -a "$BUILD_LOG")
+trap "kill -9 $! 2>/dev/null" EXIT HUP INT QUIT TERM
+exec 2> >(tee -a "$BUILD_LOG" >&2)
+trap "kill -9 $! 2>/dev/null" EXIT HUP INT QUIT TERM
+
+### functions
 
 print_iso_size () {
    local isofile="$1"
    [ -f "$isofile" ] || return 23
    size=$(stat --printf='%s' "$isofile")
-   echo "The ISO is ${size} bytes large."
+   echo "I: The ISO is ${size} bytes large."
 }
 
 ### Main
@@ -100,13 +100,9 @@ DEBOOTSTRAP_GNUPG_HOMEDIR=$(mktemp -d)
 gpg --homedir "$DEBOOTSTRAP_GNUPG_HOMEDIR" \
     --no-tty \
     --import config/chroot_sources/tails.chroot.gpg
-if [ -e "$DEBOOTSTRAP_GNUPG_HOMEDIR/pubring.gpg" ]; then
-    DEBOOTSTRAP_GNUPG_KEYRING="$DEBOOTSTRAP_GNUPG_HOMEDIR/pubring.gpg"
-elif [ -e "$DEBOOTSTRAP_GNUPG_HOMEDIR/pubring.kbx" ]; then
-    DEBOOTSTRAP_GNUPG_KEYRING="$DEBOOTSTRAP_GNUPG_HOMEDIR/pubring.kbx"
-else
-   fatal "No debootstrap GnuPG keyring was created."
-fi
+DEBOOTSTRAP_GNUPG_KEYRING="$DEBOOTSTRAP_GNUPG_HOMEDIR/pubring.kbx"
+[ -e "$DEBOOTSTRAP_GNUPG_KEYRING" ] \
+   || fatal "No debootstrap GnuPG keyring was created."
 DEBOOTSTRAP_OPTIONS="$DEBOOTSTRAP_OPTIONS --keyring=$DEBOOTSTRAP_GNUPG_KEYRING"
 
 export DEBOOTSTRAP_OPTIONS
@@ -121,36 +117,12 @@ export MKSQUASHFS_OPTIONS
 # refresh translations of our programs
 ./refresh-translations || fatal "refresh-translations failed ($?)."
 
-case "$LB_BINARY_IMAGES" in
-   iso)
-      which isohybrid >/dev/null || fatal 'Cannot find isohybrid in $PATH'
-      installed_syslinux_utils_upstream_version="$(syslinux_utils_upstream_version)"
-      if dpkg --compare-versions \
-	   "$installed_syslinux_utils_upstream_version" \
-	   'lt' \
-	   "$REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION" ; then
-	  fatal \
-	      "syslinux-utils '${installed_syslinux_utils_upstream_version}' is installed, " \
-	      "while we need at least '${REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION}'."
-      fi
-      ;;
-   *)
-      fatal "Image type ${LB_BINARY_IMAGES} is not supported."
-      ;;
-esac
 BUILD_ISO_FILENAME="${BUILD_BASENAME}.iso"
 BUILD_MANIFEST="${BUILD_BASENAME}.build-manifest"
 BUILD_APT_SOURCES="${BUILD_BASENAME}.apt-sources"
 BUILD_PACKAGES="${BUILD_BASENAME}.packages"
-BUILD_LOG="${BUILD_BASENAME}.buildlog"
 BUILD_USB_IMAGE_FILENAME="${BUILD_BASENAME}.img"
 
-# Clone all output, from this point on, to the log file
-exec >  >(tee -a "$BUILD_LOG")
-trap "kill -9 $! 2>/dev/null" EXIT HUP INT QUIT TERM
-exec 2> >(tee -a "$BUILD_LOG" >&2)
-trap "kill -9 $! 2>/dev/null" EXIT HUP INT QUIT TERM
-
 (
    echo "Mirrors:"
    apt-mirror debian
@@ -160,25 +132,25 @@ trap "kill -9 $! 2>/dev/null" EXIT HUP INT QUIT TERM
    cat config/chroot_sources/*.chroot
 ) > "$BUILD_APT_SOURCES"
 
-echo "Building ISO image ${BUILD_ISO_FILENAME}..."
+echo "I: Building ISO image ${BUILD_ISO_FILENAME}..."
 time lb build noauto ${@}
 [ -e binary.iso ] || fatal "lb build failed ($?)."
 
-echo "ISO image was successfully created"
+echo "I: ISO image was successfully created"
 print_iso_size binary.iso
 
-echo "Hybriding it..."
+echo "I: Hybriding it..."
 isohybrid $AMNESIA_ISOHYBRID_OPTS binary.iso || fatal "isohybrid failed"
 print_iso_size binary.iso
 truncate -s %2048 binary.iso
 print_iso_size binary.iso
 
-echo "Renaming generated files..."
+echo "I: Renaming generated files..."
 mv -i binary.iso "${BUILD_ISO_FILENAME}"
 mv -i binary.packages "${BUILD_PACKAGES}"
 
-echo "Generating build manifest..."
+echo "I: Generating build manifest..."
 generate-build-manifest chroot/debootstrap "${BUILD_MANIFEST}"
 
-echo "Creating USB image ${BUILD_USB_IMAGE_FILENAME}..."
+echo "I: Creating USB image ${BUILD_USB_IMAGE_FILENAME}..."
 create-usb-image-from-iso "${BUILD_ISO_FILENAME}"
diff --git a/auto/config b/auto/config
index f6aff7a8cb7d5edb0d319134e8185265b8b80a68..bb8f6e2fc25e38a9b98b802f22989fbb25aba98b 100755
--- a/auto/config
+++ b/auto/config
@@ -7,12 +7,6 @@ set -x
 
 . "$(dirname $0)/scripts/utils.sh"
 
-# we require building from git
-if ! git rev-parse --is-inside-work-tree; then
-    echo "${PWD} is not a Git tree. Exiting."
-    exit 1
-fi
-
 . config/amnesia
 if [ -e config/amnesia.local ] ; then
    . config/amnesia.local
@@ -21,12 +15,10 @@ fi
 if [ -n "${SOURCE_DATE_EPOCH}" ]; then
     CURRENT_EPOCH="$(date --utc +%s)"
     if [ "${SOURCE_DATE_EPOCH}" -gt "${CURRENT_EPOCH}" ]; then
-        echo "SOURCE_DATE_EPOCH is set before the current time. Exiting."
-        exit 1
+        fatal "SOURCE_DATE_EPOCH is set before the current time. Exiting."
     fi
 else
-    echo "SOURCE_DATE_EPOCH is not set. Exiting."
-    exit 1
+    fatal "SOURCE_DATE_EPOCH is not set. Exiting."
 fi
 
 # get git branch or tag so we can set the basename appropriately, i.e.:
@@ -53,20 +45,19 @@ GIT_BASE_BRANCH=$(base_branch) \
 
 if [ "${TAILS_MERGE_BASE_BRANCH:-}" = 1 ] && \
        ! git_on_a_tag && [ "$GIT_BRANCH" != "$GIT_BASE_BRANCH" ] ; then
-    GIT_BASE_BRANCH_COMMIT=$(git_base_branch_head)
-    [ -n "${GIT_BASE_BRANCH_COMMIT}" ] \
-        || fatal "Base branch's top commit could not be guessed."
+    [ -n "${BASE_BRANCH_GIT_COMMIT}" ] \
+        || fatal "Base branch's top commit is not set."
 
-    echo "Merging base branch origin/${GIT_BASE_BRANCH}"
-    echo "(at commit ${GIT_BASE_BRANCH_COMMIT})..."
+    echo "I: Merging base branch ${GIT_BASE_BRANCH}" \
+         "(at commit ${BASE_BRANCH_GIT_COMMIT})..."
     faketime -f "${SOURCE_DATE_FAKETIME}" \
-        git merge --no-edit "origin/${GIT_BASE_BRANCH}" \
+        git merge --no-edit "${BASE_BRANCH_GIT_COMMIT}" \
 	    || fatal "Failed to merge base branch."
     git submodule update --init
 
     # Adjust BUILD_BASENAME to embed the base branch name and its top commit
     CLEAN_GIT_BASE_BRANCH=$(echo "$GIT_BASE_BRANCH" | sed 's,/,_,g')
-    GIT_BASE_BRANCH_SHORT_ID=$(git_base_branch_head --short)
+    GIT_BASE_BRANCH_SHORT_ID=$(git rev-parse --verify --short "${BASE_BRANCH_GIT_COMMIT}")
     [ -n "${GIT_BASE_BRANCH_SHORT_ID}" ] \
         || fatal "Base branch's top commit short ID could not be guessed."
     BUILD_BASENAME="${BUILD_BASENAME}+${CLEAN_GIT_BASE_BRANCH}"
@@ -79,19 +70,16 @@ echo "BUILD_BASENAME='${BUILD_BASENAME}'" > tmp/build_environment
 
 # sanity checks
 if grep -qs -E '^Pin:\s+release\s+.*a=' config/chroot_apt/preferences ; then
-    echo "Found unsupported a= syntax in config/chroot_apt/preferences,"
-    echo "use n= instead. Exiting."
-    exit 1
+    fatal "Found unsupported a= syntax in config/chroot_apt/preferences," \
+          "use n= instead. Exiting."
 fi
 if grep -qs -E '^Pin:\s+release\s+.*o=Debian Backports' \
 	config/chroot_apt/preferences ; then
-    echo "Found unsupported 'o=Debian Backports' syntax,"
-    echo "in config/chroot_apt/preferences. Use o=Debian instead. Exiting."
-    exit 1
+    fatal "Found unsupported 'o=Debian Backports' syntax," \
+          "in config/chroot_apt/preferences. Use o=Debian instead. Exiting."
 fi
 if [ $(dpkg --print-architecture) != amd64 ] ; then
-    echo "Only amd64 build systems are supported"
-    exit 1
+    fatal "Only amd64 build systems are supported"
 fi
 
 # init variables
@@ -102,7 +90,7 @@ $RUN_LB_CONFIG --distribution stretch ${@}
 
 # set up everything for time-based snapshots:
 if [ -n "${APT_SNAPSHOTS_SERIALS:-}" ]; then
-    echo "Fixing 'latest' APT snapshots serials to: '${APT_SNAPSHOTS_SERIALS}'."
+    echo "I: Fixing 'latest' APT snapshots serials to: '${APT_SNAPSHOTS_SERIALS}'."
     apt-snapshots-serials prepare-build "${APT_SNAPSHOTS_SERIALS}"
 else
     apt-snapshots-serials prepare-build
@@ -119,16 +107,16 @@ DEBIAN_MIRROR="$(apt-mirror debian)"
 DEBIAN_SECURITY_MIRROR="$(apt-mirror debian-security)"
 TORPROJECT_MIRROR="$(apt-mirror torproject)"
 
-[ -n "$DEBIAN_MIRROR" ]          || exit 1
-[ -n "$DEBIAN_SECURITY_MIRROR" ] || exit 1
-[ -n "$TORPROJECT_MIRROR" ]      || exit 1
+[ -n "$DEBIAN_MIRROR" ]          || fatal "\$DEBIAN_MIRROR is empty"
+[ -n "$DEBIAN_SECURITY_MIRROR" ] || fatal "\$DEBIAN_SECURITY_MIRROR is empty"
+[ -n "$TORPROJECT_MIRROR" ]      || fatal "\$TORPROJECT_MIRROR is empty"
 
 perl -pi \
      -E \
        "s|^(deb(?:-src)?\s+)https?://ftp[.]us[.]debian[.]org/debian/?(\s+)|\$1$DEBIAN_MIRROR\$2| ; \
         s|^(deb(?:-src)?\s+)https?://deb[.]torproject[.]org/torproject[.]org/?(\s+)|\$1$TORPROJECT_MIRROR\$2|" \
     config/chroot_sources/*.chroot \
-    || exit 1
+    || fatal "APT mirror substitution failed with exit code $?"
 
 # set Amnesia's general options
 $RUN_LB_CONFIG \
@@ -171,7 +159,8 @@ install -d config/chroot_local-includes/etc/amnesia/
 
 # environment
 TAILS_WIKI_SUPPORTED_LANGUAGES="$(ikiwiki-supported-languages ikiwiki.setup)"
-[ -n "$TAILS_WIKI_SUPPORTED_LANGUAGES" ] || exit 16
+[ -n "$TAILS_WIKI_SUPPORTED_LANGUAGES" ] \
+   || fatal "\$TAILS_WIKI_SUPPORTED_LANGUAGES is empty"
 echo "TAILS_WIKI_SUPPORTED_LANGUAGES='${TAILS_WIKI_SUPPORTED_LANGUAGES}'" \
    >> config/chroot_local-includes/etc/amnesia/environment
 
@@ -186,6 +175,7 @@ echo "live-build: `dpkg-query -W -f='${Version}\n' live-build`" \
 cat >> config/chroot_local-includes/etc/os-release <<EOF
 TAILS_PRODUCT_NAME="Tails"
 TAILS_VERSION_ID="$AMNESIA_VERSION"
+TAILS_DISTRIBUTION="$TAILS_DISTRIBUTION"
 EOF
 if echo "$AMNESIA_VERSION" | grep -qs -E '~(alpha|beta|rc)[0-9]*$' ; then
     echo 'TAILS_CHANNEL="alpha"' >> config/chroot_local-includes/etc/os-release
diff --git a/auto/scripts/create-usb-image-from-iso b/auto/scripts/create-usb-image-from-iso
index 70055717ce3b47c7285833311877d4f69cc0c8e3..ebc78bf4d50042dd15ecdf134ad3e0888a2b98db 100755
--- a/auto/scripts/create-usb-image-from-iso
+++ b/auto/scripts/create-usb-image-from-iso
@@ -39,8 +39,12 @@ GET_UDISKS_OBJECT_TIMEOUT = 2
 # the partition table, reserved sectors, and filesystem metadata.
 SYSTEM_PARTITION_ADDITIONAL_SIZE = 10
 
-SYSLINUX_COM32MODULES_DIR = '/usr/lib/syslinux/modules/bios'
-
+# We use the syslinux from the chroot here, because it's the same one
+# that will be available to Tails Installer in the running Tails. Using
+# the same syslinux version here and in Tails Installer is important to
+# prevent issues when upgrading a Tails device via Tails Installer.
+CHROOT_SYSLINUX_COM32MODULES_DIR = 'chroot/usr/lib/syslinux/modules/bios'
+CHROOT_SYSLINUX_BIN='chroot/usr/bin/syslinux'
 
 class ImageCreationError(Exception):
     pass
@@ -252,7 +256,7 @@ class ImageCreator(object):
         com32modules = [f for f in os.listdir(syslinux_dir) if f.endswith('.c32')]
 
         for module in sorted(com32modules):
-            src_path = os.path.join(SYSLINUX_COM32MODULES_DIR, module)
+            src_path = os.path.join(CHROOT_SYSLINUX_COM32MODULES_DIR, module)
             if not os.path.isfile(src_path):
                 raise ImageCreationError("Could not find the '%s' COM32 module" % module)
 
@@ -269,7 +273,7 @@ class ImageCreator(object):
         # device would cause this issue:
         # https://bugs.chromium.org/p/chromium/issues/detail?id=508713#c8
         execute([
-            'syslinux',
+            CHROOT_SYSLINUX_BIN,
             '--offset', str(self.partition.props.partition.props.offset),
             '--directory', '/syslinux/',
             '--install', self.image
diff --git a/auto/scripts/utils.sh b/auto/scripts/utils.sh
index 80a32b1432ace1d44a7ea7b06069c368eb67e3e1..1e7286a017645b5872766e1dcf6de836c13af777 100755
--- a/auto/scripts/utils.sh
+++ b/auto/scripts/utils.sh
@@ -97,7 +97,7 @@ branch_name_to_suite() {
 }
 
 fatal() {
-	echo "$*" >&2
+	echo "E: $*" >&2
 	exit 1
 }
 
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index 04edac80e5fc45197e2386b6f49bfedeb1361ade..17f525aceb0240a65fce25e1113c7b799663d266 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2019051601
+2019061901
diff --git a/config/APT_snapshots.d/torproject/serial b/config/APT_snapshots.d/torproject/serial
index 536c7ede13683404c9d9fc24f0c0dd99deeed47f..462eb2fd192ad1fdf54782419b49b866fe922c43 100644
--- a/config/APT_snapshots.d/torproject/serial
+++ b/config/APT_snapshots.d/torproject/serial
@@ -1 +1 @@
-2019031301
+2019060802
diff --git a/config/amnesia b/config/amnesia
index 7ddc6ee66867f006150cd4a743be6e133232342e..03023eb98c2fabfca6cef3d6c098603552c793aa 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -22,9 +22,6 @@ AMNESIA_APPEND="live-media=removable nopersistence noprompt timezone=Etc/UTC blo
 # Options passed to isohybrid
 AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
 
-# Minimal upstream version of syslinux-utils we need
-REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
-
 # Kernel version
 KERNEL_VERSION='4.19.0-5'
 KERNEL_SOURCE_VERSION=$(
@@ -49,3 +46,6 @@ AMNESIA_FULL_VERSION="${AMNESIA_VERSION} - ${SOURCE_DATE_YYYYMMDD}"
 AMNESIA_DEV_FULLNAME='Tails developers'
 AMNESIA_DEV_EMAIL="tails@boum.org"
 AMNESIA_DEV_KEYID="A490 D0F4 D311 A415 3E2B  B7CA DBB8 02B2 58AC D84F"
+
+# Used to set a custom home page if the distribution is UNRELEASED
+TAILS_DISTRIBUTION="`dpkg-parsechangelog -SDistribution`"
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 1128442d6ceda29c99b0767f1fff5468bc159f0b..2bd6dcce149ddb872c3182700694f6a76398af6f 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -130,6 +130,10 @@ Package: tails-installer
 Pin: origin deb.tails.boum.org
 Pin-Priority: 999
 
+Package: tor tor-geoipdb
+Pin: release o=TorProject,n=tor-experimental-0.4.0.x-stretch
+Pin-Priority: 999
+
 Package: virtualbox*
 Pin: release o=Debian,n=stretch-backports
 Pin-Priority: 999
diff --git a/config/chroot_local-hooks/04-change-gids-and-uids b/config/chroot_local-hooks/04-change-gids-and-uids
index 7320916a201090ff9c2432e3b4aa94c58ea5972a..417b1fadc4c789d445aee7d077c4a3a2f6c515aa 100755
--- a/config/chroot_local-hooks/04-change-gids-and-uids
+++ b/config/chroot_local-hooks/04-change-gids-and-uids
@@ -119,6 +119,7 @@ Change_gid pulse-access 1200
 Change_gid Debian-gdm   1210
 Change_gid kvm          1500
 Change_gid render       1510
+Change_gid Debian-exim  1520
 
 # Finally, give these users and groups the desired UID/GID
 Change_uid debian-tor   107
@@ -143,3 +144,4 @@ Change_gid pulse-access 120
 Change_gid Debian-gdm   121
 Change_gid kvm          150
 Change_gid render       151
+Change_gid Debian-exim  152
diff --git a/config/chroot_local-hooks/11-localize_browser b/config/chroot_local-hooks/11-localize_browser
index 55097fb7d5ea3c049703d3546b199a59ae264078..52c5161bb206f6b895363d4ac810148e668afff5 100755
--- a/config/chroot_local-hooks/11-localize_browser
+++ b/config/chroot_local-hooks/11-localize_browser
@@ -81,6 +81,11 @@ while IFS=: read MOZILLA_LOCALE LOCATION; do
                           "\"${SPELLCHECKER_LOCALE}\"" \
                            "user_pref"
     HOMEPAGE="https://tails.boum.org/home/"
+    . /etc/os-release # get $TAILS_CHANNEL and $TAILS_DISTRIBUTION
+    if [ "${TAILS_DISTRIBUTION}" = UNRELEASED ] \
+          || [ "${TAILS_CHANNEL:-stable}" != stable ]; then
+       HOMEPAGE="${HOMEPAGE}testing/"
+    fi
     if echo "${TAILS_WIKI_SUPPORTED_LANGUAGES}" | grep -qw "${LANG_CODE}"; then
         HOMEPAGE="${HOMEPAGE}index.${LANG_CODE}.html"
     fi
diff --git a/config/chroot_local-includes/etc/sysctl.d/disable_ipv6.conf b/config/chroot_local-includes/etc/sysctl.d/disable_ipv6.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e1d78834f6f1cfa3d390ce7f5e713a9c65c0b3df
--- /dev/null
+++ b/config/chroot_local-includes/etc/sysctl.d/disable_ipv6.conf
@@ -0,0 +1,5 @@
+net.ipv6.conf.default.disable_ipv6 = 1
+net.ipv6.conf.all.disable_ipv6 = 1
+
+# Some programs expect the loopback interface to have IPv6 enabled
+net.ipv6.conf.lo.disable_ipv6 = 0
diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/partitioning b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/partitioning
index 1f64cd885b101c07c48ff3042653d9dce54c8a0b..3cb8ace7c348e19a78b7636935b4a37c33a7931a 100755
--- a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/partitioning
+++ b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/partitioning
@@ -102,7 +102,7 @@ sgdisk \
 log_end_msg
 
 # Tell the kernel to reload the partition table
-partprobe
+partprobe "${PARENT_DEVICE}"
 
 # fatresize overwrites the VBR, so we have to back it up to be able to
 # restore the boot code later
@@ -139,4 +139,4 @@ sgdisk \
 	"${PARENT_DEVICE}"
 
 # Tell the kernel to reload the partition table
-partprobe
+partprobe "${PARENT_DEVICE}"
diff --git a/config/chroot_local-includes/usr/share/tails/build/group b/config/chroot_local-includes/usr/share/tails/build/group
index b7b283c18a8634aac9e1d7c8f9fd070689933f31..2c79c20b2f070d11c323ceb007573711c01bafbc 100644
--- a/config/chroot_local-includes/usr/share/tails/build/group
+++ b/config/chroot_local-includes/usr/share/tails/build/group
@@ -46,6 +46,7 @@ crontab:x:107:
 netdev:x:108:
 kvm:x:150:
 render:x:151:
+Debian-exim:x:152:
 messagebus:x:105:
 ssh:x:109:
 memlockd:x:110:
diff --git a/config/chroot_local-includes/usr/share/tails/build/passwd b/config/chroot_local-includes/usr/share/tails/build/passwd
index 3dc63f799d73e85abc4618d81f1c059ac9b9a374..79bd76b87eaca4804fbbadfc3ede24ad25ec72cc 100644
--- a/config/chroot_local-includes/usr/share/tails/build/passwd
+++ b/config/chroot_local-includes/usr/share/tails/build/passwd
@@ -20,8 +20,9 @@ systemd-timesync:x:100:102:systemd Time Synchronization,,,:/run/systemd:/bin/fal
 systemd-network:x:101:103:systemd Network Management,,,:/run/systemd/netif:/bin/false
 systemd-resolve:x:102:104:systemd Resolver,,,:/run/systemd/resolve:/bin/false
 _apt:x:104:65534::/nonexistent:/bin/false
-messagebus:x:103:105::/var/run/dbus:/bin/false
-memlockd:x:105:110:memlockd system account,,,:/usr/lib/memlockd:/bin/false
+Debian-exim:x:103:152::/var/spool/exim4:/bin/false
+messagebus:x:105:105::/var/run/dbus:/bin/false
+memlockd:x:106:110:memlockd system account,,,:/usr/lib/memlockd:/bin/false
 debian-tor:x:107:114::/var/lib/tor:/bin/false
 speech-dispatcher:x:108:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/false
 colord:x:109:117:colord colour management daemon,,,:/var/lib/colord:/bin/false
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
index 9542eb12faf5a2a48d9c155ff6110e0fb565af98..02fdd72f4f1f2459072415967226be9604b8a091 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
@@ -1 +1 @@
-http://torbrowser-archive.tails.boum.org/8.5-build2/
+http://torbrowser-archive.tails.boum.org/8.5.2-build1/
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
index 43aebdea6c2512fd66cd7599fd9ba8914ed985be..70bb87ebb3ec7e9077eb4906da0cef2eda6c0707 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
@@ -1,30 +1,30 @@
-03efbeaca2a77f9e929b3c6b0074e206b8329fba0b9b231ad7966850c1953d22  tor-browser-linux64-8.5_ar.tar.xz
-72910c38b3f262b00390bfb6771a3527c726b35d3d2d174d0c548ee1ad3f5698  tor-browser-linux64-8.5_ca.tar.xz
-faae1c7023fe7b8915880cc00e5dd5fcdc7d576267aca63a65b882d2197df23c  tor-browser-linux64-8.5_cs.tar.xz
-f1dc34a9a0237b2a5cad4b624cecfee4163c5f1214cfd8320540e4cc1a13910f  tor-browser-linux64-8.5_da.tar.xz
-7feb208188ffd622f498496e00b894e3cbe105ca1abb3991d34fd8852edf6e70  tor-browser-linux64-8.5_de.tar.xz
-b9998ee9f01cae8492e42be5881ae37bda3876d6b555010d40b299d1d78b116c  tor-browser-linux64-8.5_el.tar.xz
-5d3c80a8a24adc03a2ba9daacbb7f9d4b9648c1d55d5a7862b8e0562096e3d26  tor-browser-linux64-8.5_en-US.tar.xz
-1aaf72e0ced8e407a88143a9b4c2d2cb480219cfa817f0d5a8bfd86fcc2a82e7  tor-browser-linux64-8.5_es-AR.tar.xz
-3e83baad892d554b2defbf524484dc282116efb879d7ae192b7115618a1cd2f8  tor-browser-linux64-8.5_es-ES.tar.xz
-b028401830ca38b620c85e5422e40d95819d4eae498a2230c2222a955fc6353c  tor-browser-linux64-8.5_fa.tar.xz
-778739f566b7faf55864ddf9737ede0643706fbd1a9f6c26f60df483bd8b431d  tor-browser-linux64-8.5_fr.tar.xz
-641e8435a12e0514805dc19c1acbb4193c952f538f2d9911eee4820d7c0ad94d  tor-browser-linux64-8.5_ga-IE.tar.xz
-a6fff7d903269699d127407ca85e946d77256402c89bbc6be3d679c6b34ac13b  tor-browser-linux64-8.5_he.tar.xz
-f00242a2ac94923c36f5c00495a7640e702fc23796231adc1a0663be5602943e  tor-browser-linux64-8.5_hu.tar.xz
-50f5d9c059386364a24daa1bc1805c8067c0da61115979f47d5df3ee5d059362  tor-browser-linux64-8.5_id.tar.xz
-a1de497c415d42d3734154b05dd6495ac7f8c1513ab74b94401e829071b31e89  tor-browser-linux64-8.5_is.tar.xz
-311cb255ba1251c9bc91f67c5fe75d4c7f6bc1a3d10463dea3555fcb7c564285  tor-browser-linux64-8.5_it.tar.xz
-77d245fc1c76ee7cbca4f0eaa2dc72b7aa81e3f266cfba6b017731f8c3d0c52b  tor-browser-linux64-8.5_ja.tar.xz
-478e1900a6c45b82d81ba0a55f662582e37f53dfa5fb67de519b596a9d6e51b7  tor-browser-linux64-8.5_ka.tar.xz
-97a8a3f46db86d715cf2d8e6fb9eadb2445ecc5f7879eecbe95d0144ce5b643e  tor-browser-linux64-8.5_ko.tar.xz
-80f303c602f76cd6aa79b0ca708f990b2f27ba4bebdbad5181ebe8f59811badc  tor-browser-linux64-8.5_nb-NO.tar.xz
-ddcd80ebbfd87fc52f04375d124cff6e209b1410a6de8feef7cb2809e714d598  tor-browser-linux64-8.5_nl.tar.xz
-a961df29242a75cb2c01f7889840212a2d30b4b46f524f042f784736fcb40298  tor-browser-linux64-8.5_pl.tar.xz
-092df86c46313d6b6e5c0e268cae83e711ee915668d17820061524e37ec98fe6  tor-browser-linux64-8.5_pt-BR.tar.xz
-3813e2e39d43df46e876fe92670c2117aaf08c6181b0cd288240b7bf275dbba6  tor-browser-linux64-8.5_ru.tar.xz
-f9ad375a3339914b513ca78a4a0769e4d71dca15103370cc3362fec22851cde1  tor-browser-linux64-8.5_sv-SE.tar.xz
-9cbc4c693f939bf4a2cdcb5a20b1d2e9b0908b4e737add3711d9b8912c84daa4  tor-browser-linux64-8.5_tr.tar.xz
-4ad7f7533e6e18fee8515856e405df8711295d198786e67cab8467464b8639c8  tor-browser-linux64-8.5_vi.tar.xz
-aebc74b309c8b506ec2b378f023747e67c3259f6551f9fec9ee350c52eb8ab37  tor-browser-linux64-8.5_zh-CN.tar.xz
-f87dd72b801e9b33b528e5132188b5e41daca2dd6c859d53e1c6466de165ed34  tor-browser-linux64-8.5_zh-TW.tar.xz
+888c6020af840de81dbb9e91fbcd386c2c45962c5a924d720d08db4aa86773f4  tor-browser-linux64-8.5.2_ar.tar.xz
+c6c44a139923bdcab0c8ef273b35e8b020cdc930581a34b4837e2bb9f3589c88  tor-browser-linux64-8.5.2_ca.tar.xz
+f680de7cc8a5ca74f910700291e7ac0075d5bf335924722b2d45c0197a605bf6  tor-browser-linux64-8.5.2_cs.tar.xz
+cea843936e017cb2e700f75193c27935c75e5d49f1e14d83c2af39c82b73b502  tor-browser-linux64-8.5.2_da.tar.xz
+410e40d616675971e4a84820f0af24cebd6af1f38fd130889db6d56b6bdfc1f5  tor-browser-linux64-8.5.2_de.tar.xz
+8e15ee6340bae02e9ea6260458855e567380573d61a16a9e30b6b128b3af268b  tor-browser-linux64-8.5.2_el.tar.xz
+7676b9fab921626b1b2e7fd3eb43854094c76ff9d93c8e727330020d842aa162  tor-browser-linux64-8.5.2_en-US.tar.xz
+e1043b1a638f4d29a6ba27ede910caed82b4edf651d3f76eedefbc12888cf844  tor-browser-linux64-8.5.2_es-AR.tar.xz
+3fbe93d3497b5fc9308bb403e1baeedefc2c6db9a2e284b848f1d824a9b36e5b  tor-browser-linux64-8.5.2_es-ES.tar.xz
+d4161a476579203dc51755d37313a99d11dbcb0545019ae343bb3947fc3571a4  tor-browser-linux64-8.5.2_fa.tar.xz
+bb963423fd385bab56b7d0467c9b55a3be149e54dbcfbf72443bfc371385f17d  tor-browser-linux64-8.5.2_fr.tar.xz
+9fcbba32ad9323c8ac03262d0ad0ca08b066fff481ff61f102bb3963b3e855f0  tor-browser-linux64-8.5.2_ga-IE.tar.xz
+4ec97e09e8ea156b7d07ca999707ae5ab0d447dfd6e5fa2b033770e828e534de  tor-browser-linux64-8.5.2_he.tar.xz
+aa7019094af35fb773c06694b0058a6204de82ac7897f8cbce690144ba30c9e4  tor-browser-linux64-8.5.2_hu.tar.xz
+495a2fca48f09fc206c252957f528ff33cd3db303fa8d8e127fb680f6b6a522b  tor-browser-linux64-8.5.2_id.tar.xz
+26e23bd2e87896712a1c2ec2d64f7aefde5dbe10f70412e032a979ef272279f3  tor-browser-linux64-8.5.2_is.tar.xz
+3eb4f5afcf32cfcbfdf18e10e1bbb064bf1bcb8e28f800fb1b76ab5fdccb2600  tor-browser-linux64-8.5.2_it.tar.xz
+88d1991626d07ac5260524ef890bf2391bfdc298c6b2ad013a8b933173e6a1aa  tor-browser-linux64-8.5.2_ja.tar.xz
+efaf0aa9e282ec311a5e0a981a25dd2e77d86e348395fed1bbbc0062f30b8431  tor-browser-linux64-8.5.2_ka.tar.xz
+d89456f18df06db1b691ed945956bfd218ee9963ae928c3c3a7fe51f2b5959ce  tor-browser-linux64-8.5.2_ko.tar.xz
+5f0c8b01844ae2cb86fd5d6b01bb7159e25fe6daaa8c447fb7dc62f4b3865f75  tor-browser-linux64-8.5.2_nb-NO.tar.xz
+c511ef0654630cdaf014610c6b6115749fac74b321d98691d63d899168c5b61a  tor-browser-linux64-8.5.2_nl.tar.xz
+036e344c1d19c825ab9284d7cad845fc1289521583905486e6a4ce26dc865906  tor-browser-linux64-8.5.2_pl.tar.xz
+53dfadad13888caf1ae70a50e8b015b7e11446ad3fb9cff10dcdad5d8896744f  tor-browser-linux64-8.5.2_pt-BR.tar.xz
+f11f0d274c0ade924828395f04d661c6e33605add6d4073c25fdf393a4b62e50  tor-browser-linux64-8.5.2_ru.tar.xz
+f9dc70e7fcfe4c38226f5a78d6bff7a82164fd0f595a9bbf5b0754b67c4bc350  tor-browser-linux64-8.5.2_sv-SE.tar.xz
+51d96572fe849ff11fc8ac701c4278100f7cd047d5a7440be35e532fd020efc3  tor-browser-linux64-8.5.2_tr.tar.xz
+cedd93fc4abd720b1239a5f1d77fc2b311caed0995a0af55d2d6b3910070ef3d  tor-browser-linux64-8.5.2_vi.tar.xz
+80437d0915aa3cdd12f09457a1ba41b03623ea6dff191a540f06c20f4dd5cfc6  tor-browser-linux64-8.5.2_zh-CN.tar.xz
+c8a138a83d67a8f728bf1364e6fa908de9c461741f680ad24dc3fd626d5d2e03  tor-browser-linux64-8.5.2_zh-TW.tar.xz
diff --git a/config/chroot_sources/torproject.chroot b/config/chroot_sources/torproject.chroot
index 952381d920124fc1e330872b2dc63d04fea0a0c2..3102a49732a1c1fb98d67af3ffa01289a619793d 100644
--- a/config/chroot_sources/torproject.chroot
+++ b/config/chroot_sources/torproject.chroot
@@ -1 +1,2 @@
 deb http://deb.torproject.org/torproject.org stretch main
+deb http://deb.torproject.org/torproject.org tor-experimental-0.4.0.x-stretch main
diff --git a/debian/changelog b/debian/changelog
index 08d0681ed532f45ea433d09a4b4cd06ce2c00e94..0f5e937185a3de9518e6fa9f5eb0a00a367bb9c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,81 @@
+tails (3.14.1) unstable; urgency=medium
+
+  * Security fixes
+    - Upgrade Tor Browser to 8.5.2-build1 (Closes: #16824).
+    - Upgrade Thunderbird to 60.7.0 (Closes: #16742).
+    - Upgraded Linux to 4.19.37-4 (Closes: #16823).
+
+  * Bugfixes
+    - Only probe for partitions on the boot device when setting up
+      TailsData. Without arguments partprobe will scan all devices,
+      and if it encounters a device it doesn't support (e.g. fake
+      raid-0 arrays) it will return non-zero, thus aborting Tails'
+      partitioning script, resulting in an unbootable install
+      (Closes: #16389).
+
+  * Minor improvements and updates
+    - Upgrade tor to 0.4.0.5-1~d90.stretch+1, the first stable
+      candidate in the 0.4.0.x series (Closes: #16687).
+    - Completely disable IPv6 except for the loopback interface. We
+      attempt to completely block it on the netfilter level but we
+      have seen ICMPv6 "leaks" any way (related to Router
+      Solicitation, see: #16148) so let's just disable it. We keep
+      enabled on the loopback interface since some services depends on
+      ::1 being up.
+    - create-usb-image-from-iso: Use syslinux from chroot. We used the
+      syslinux from the vagrant box before, which caused issues with
+      when building Tails/Buster with a Stretch vagrant box and then
+      cloning the image via Tails Installer with syslinux from Buster
+      (Closes: #16748).
+    - Set Tor Browser's homepage to https://tails.boum.org/home/testing/
+      if building anything but a stable release. This page explains the
+      dangers of using a non-stable release. (Closes: #12003)
+
+  * Build system
+    - auto/{build,config}:
+      * consistently use fatal() to error out, and prefix its message
+        with "E: " to help distinguish them from the noise produced by
+        tools we call etc.
+      * Similarly, also prefix informational message with "I: ".
+      * drop support for GnuPG 1.x.
+      * clone more build output to the log file.
+      * Drop obsolete check for syslinux version. This version
+        requirement is satisfied by Jessie and it is doubtful Tails
+        would build in anything older.
+      * auto/build: drop a few checks for conditions that are already
+        satisfied in the supported build environments.
+    - Revert "Build system: try to be smart again by fetching only the
+      refs we need." This optimization overrides the trick we have on
+      Jenkins (set_origin_base_branch_head in
+      https://git.tails.boum.org/jenkins-jobs/tree/macros/builders.yaml),
+      that ensures that a reproducibly_build_Tails_ISO_* job builds
+      from the commit used by the first build. (Closes: #16730)
+
+  * Test suite
+    - Fix mistake with execute() vs spawn() when starting the upgrader.
+    - Don't filter during pcap capture, instead let's just apply the
+      same filtering when we are inspecting the pcap files. This way
+      any pcap file saved on failure will include the full capture,
+      and not just the packets sent by the system under testing, which
+      sometimes makes it hard to understand what is going on.
+    - Also include the content of /var/log/tor/log in $scenario.tor
+      when tor failed to bootstrap (refs: #16793)
+    - Don't flood the debug logger with tor@default's journal
+      contents.
+    - Power off system under testing after scenario. Until now we have
+      relied on either one of the generated "snapshot restore" steps
+      or the "[Given] a computer" step to implicitly stop the old VM
+      when we move on to a new scenario. That meant the old VM was
+      still running during the new scenarios @Before@ hooks. If the
+      new scenario is tagged @check_tor_leaks that means we start its
+      sniffer while the old VM is still running, possibly sending
+      packets that then affect the new scenario. That would explain
+      some myserious "Unexpected connections were made" failures we
+      have seen (Closes: #11521).
+    - Only accept IP(v6)/ARP during DHCP check.
+
+ -- Tails developers <tails@boum.org>  Wed, 19 Jun 2019 15:29:07 +0200
+
 tails (3.14) unstable; urgency=medium
 
   * Security fixes
diff --git a/features/additional_software_packages.feature b/features/additional_software_packages.feature
index 28054c045858c046a418d9fdb8a75539b09da5d8..80db623b86e616e2b39e45f499dc692789a72c6a 100644
--- a/features/additional_software_packages.feature
+++ b/features/additional_software_packages.feature
@@ -64,7 +64,7 @@ Feature: Additional software
     And I refuse adding "cowsay" to Additional Software
     Then "cowsay" is not in the list of Additional Software
 
-  # Depends on scenario: Packages I remove from Additional Software through the GUI are not in the Additional Software list anymore
+  # Depends on scenario: My Additional Software list is configurable through a GUI or through notifications when I install or remove packages with APT or Synaptic
   # See https://tails.boum.org/blueprint/additional_software_packages/offline_mode/#incomplete-online-upgrade for high level logic
   Scenario: Recovering in offline mode after Additional Software previously failed to upgrade and then succeed to upgrade when online
     Given a computer
diff --git a/features/step_definitions/dhcp.rb b/features/step_definitions/dhcp.rb
index ba3e7b004f292b2c840e4602461558deeefdbf4a..ac2203d29bb477683afa06781b5fc3d80f87fde1 100644
--- a/features/step_definitions/dhcp.rb
+++ b/features/step_definitions/dhcp.rb
@@ -2,16 +2,11 @@ Then /^the hostname should not have been leaked on the network$/ do
   begin
     hostnames = ["amnesia", $vm.execute("hostname").stdout.chomp]
     packets = PacketFu::PcapFile.new.file_to_array(filename: @sniffer.pcap_file)
-    packets.each do |p|
-      # if PacketFu::TCPPacket.can_parse?(p)
-      #   ipv4_tcp_packets << PacketFu::TCPPacket.parse(p)
-      if PacketFu::IPPacket.can_parse?(p)
-        payload = PacketFu::IPPacket.parse(p).payload
-      elsif PacketFu::IPv6Packet.can_parse?(p)
-        payload = PacketFu::IPv6Packet.parse(p).payload
-      else
-        raise "Found something in the pcap file that either is non-IP, or cannot be parsed"
-      end
+    expected_types = [PacketFu::IPv6Packet,  PacketFu::IPPacket, PacketFu::ARPPacket]
+    packets.each do |packet|
+      type = expected_types.find { |t| t.can_parse?(packet) }
+      assert_not_nil(type, "Found non-IP(v6)/ARP packet")
+      payload = type.parse(packet).payload
       hostnames.each do |hostname|
         if payload.match(hostname)
           raise "Hostname leak detected: #{hostname}"
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index 7a8306dce417b968ff99e7b1b9d428d0932b8a32..90725790f25542379170107bb84e300cb4fdb458 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -97,8 +97,7 @@ def recover_from_upgrader_failure
   $vm.execute('pkill --full tails-upgrade-frontend-wrapper')
   $vm.execute('killall tails-upgrade-frontend zenity')
   # Do not sleep when retrying
-  $vm.execute_successfully('/usr/local/bin/tails-upgrade-frontend-wrapper --no-wait')
-  $vm.spawn('tails-upgrade-frontend-wrapper', user: LIVE_USER)
+  $vm.spawn('tails-upgrade-frontend-wrapper --no-wait', user: LIVE_USER)
 end
 
 Given /^I clone USB drive "([^"]+)" to a (new|temporary) USB drive "([^"]+)"$/ do |from, mode, to|
diff --git a/features/support/helpers/firewall_helper.rb b/features/support/helpers/firewall_helper.rb
index f88091de6c07846d0bfb2ce339262626962a1fef..dc62edd62e1660fe51ba91e99fe482378d9a26d7 100644
--- a/features/support/helpers/firewall_helper.rb
+++ b/features/support/helpers/firewall_helper.rb
@@ -10,13 +10,17 @@ end
 # address/port) in the graph of all network flows.
 def pcap_connections_helper(pcap_file, opts = {})
   opts[:ignore_dhcp] = true unless opts.has_key?(:ignore_dhcp)
+  opts[:ignore_arp] = true unless opts.has_key?(:ignore_arp)
+  opts[:ignore_sources] ||= [$vm.vmnet.bridge_mac]
   connections = Array.new
   packets = PacketFu::PcapFile.new.file_to_array(:filename => pcap_file)
   packets.each do |p|
     if PacketFu::EthPacket.can_parse?(p)
       eth_packet = PacketFu::EthPacket.parse(p)
     else
-      raise 'Found something that is not an ethernet packet'
+      raise FirewallAssertionFailedError.new(
+              'Found something that is not an ethernet packet'
+            )
     end
     sport = nil
     dport = nil
@@ -39,13 +43,20 @@ def pcap_connections_helper(pcap_file, opts = {})
     elsif PacketFu::IPPacket.can_parse?(p)
       ip_packet = PacketFu::IPPacket.parse(p)
       protocol = 'ip'
+    elsif PacketFu::ARPPacket.can_parse?(p)
+      ip_packet = PacketFu::ARPPacket.parse(p)
+      protocol = 'arp'
     else
-      raise "Found something that cannot be parsed"
+      raise FirewallAssertionFailedError.new(
+              "Found something that cannot be parsed"
+            )
     end
 
     next if opts[:ignore_dhcp] &&
             looks_like_dhcp_packet?(eth_packet, protocol,
                                     sport, dport, ip_packet)
+    next if opts[:ignore_arp] && protocol == "arp"
+    next if opts[:ignore_sources].include?(eth_packet.eth_saddr)
 
     packet_info = {
       mac_saddr: eth_packet.eth_saddr,
diff --git a/features/support/helpers/misc_helpers.rb b/features/support/helpers/misc_helpers.rb
index b156978b19385ee6a9f5db63a76786c191c45b03..e9e730959d6e9341d853afa4ae0b5074351690b8 100644
--- a/features/support/helpers/misc_helpers.rb
+++ b/features/support/helpers/misc_helpers.rb
@@ -164,8 +164,10 @@ def wait_until_tor_is_working
   try_for(270) { $vm.execute('/usr/local/sbin/tor-has-bootstrapped').success? }
 rescue Timeout::Error
   # Save Tor logs before erroring out
-    File.open("#{$config["TMPDIR"]}/log.tor", 'w') { |file|
-    file.write("#{$vm.execute('journalctl --no-pager -u tor@default.service').stdout}")
+  File.open("#{$config["TMPDIR"]}/log.tor", 'w') { |file|
+    $vm.execute('journalctl --no-pager -u tor@default.service > /tmp/tor.journal')
+    file.write($vm.file_content('/tmp/tor.journal'))
+    file.write($vm.file_content('/var/log/tor/log'))
   }
   raise TorBootstrapFailure.new('Tor failed to bootstrap')
 end
diff --git a/features/support/helpers/sniffing_helper.rb b/features/support/helpers/sniffing_helper.rb
index ca9fa276e0325948218775122ec3c05e29ce63d8..7ac763edc662dc7ee11dde42ebf8590378b1367e 100644
--- a/features/support/helpers/sniffing_helper.rb
+++ b/features/support/helpers/sniffing_helper.rb
@@ -21,7 +21,7 @@ class Sniffer
     @pcap_file = "#{$config["TMPDIR"]}/#{pcap_name}"
   end
 
-  def capture(filter="not ether src host #{@vmnet.bridge_mac} and not ether proto \\arp and not ether proto \\rarp")
+  def capture
     job = IO.popen(
       [
         "/usr/sbin/tcpdump",
@@ -30,7 +30,6 @@ class Sniffer
         "--immediate-mode",
         "-i", @vmnet.bridge_name,
         "-w", @pcap_file,
-        filter,
         :err => ["/dev/null", "w"]
       ]
     )
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 43c84f3ccaec7c04d6dbcd55eac4b6e615b3708b..d60c04f8aae2620deafc3006c0c3c28354074d35 100644
--- a/features/support/hooks.rb
+++ b/features/support/hooks.rb
@@ -315,6 +315,11 @@ After('@product') do |scenario|
       FileUtils.rm(@video_path)
     end
   end
+  # If we don't shut down the system under testing it will continue to
+  # run during the next scenario's Before hooks, which we have seen
+  # causing trouble (for instance, packets from the previous scenario
+  # have failed scenarios tagged @check_tor_leaks).
+  $vm.power_off if $vm
 end
 
 Before('@product', '@check_tor_leaks') do |scenario|
diff --git a/po/ca.po b/po/ca.po
index 28c95a4d5d593b21710f4cdc770ad9eede07fdc8..6c44492a395ce5faf9a29a4c9f288247668c207b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -16,14 +16,15 @@
 # josep constantí mata <iceberg.jcm@gmail.com>, 2019
 # laia_, 2014-2016
 # Miquel Bosch, 2018
+# Sandra Monferrer <smonferrer@gmail.com>, 2019
 # Vte A.F <viarfer3@inf.upv.es>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-02-03 21:28+0000\n"
-"Last-Translator: josep constantí mata <iceberg.jcm@gmail.com>\n"
+"PO-Revision-Date: 2019-05-23 08:02+0000\n"
+"Last-Translator: Sandra Monferrer <smonferrer@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
 "ca/)\n"
 "Language: ca\n"
@@ -174,7 +175,7 @@ msgstr "Bloca la pantalla"
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79
 msgid "Suspend"
-msgstr ""
+msgstr "Suspèn"
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83
 msgid "Restart"
@@ -806,14 +807,14 @@ msgid "Failed to add container"
 msgstr "No s'ha pogut afegir el contenidor"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"No s'ha pogut afegir el contenidor del fitxer%s: El temps d'espera s'ha "
-"esgotat mentre s'espera la configuració del bucle. Siusplau intenteu "
-"utilitzar l'aplicació <i>Disks</i> al seu lloc."
+"No s'ha pogut afegir el contenidor de fitxers %s: s'ha excedit el temps "
+"mentre s'esperava la configuració de bucle.\n"
+"Torneu a provar-ho fent servir l'aplicació <i>Discs</i>."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -914,7 +915,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Obre"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -922,7 +923,7 @@ msgstr "Bloqueja aquest volum"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Desbloqueja"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/en_GB.po b/po/en_GB.po
index 68265a13dc3506f3527c64b740affe1fbf98d38c..a332b7c65639c21193be659af5fb73ef33322782 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-01-16 23:26+0000\n"
+"PO-Revision-Date: 2019-06-02 00:43+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/"
 "torproject/language/en_GB/)\n"
@@ -153,7 +153,7 @@ msgstr "Keep current name"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "su is disabled. Please use sudo instead."
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
 msgid "Lock screen"
@@ -161,7 +161,7 @@ msgstr "Lock screen"
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79
 msgid "Suspend"
-msgstr ""
+msgstr "Suspend"
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83
 msgid "Restart"
@@ -783,13 +783,13 @@ msgid "Failed to add container"
 msgstr "Failed to add container"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"Could not add file container %s: Timeout while waiting for loop setup.Please "
-"try using the <i>Disks</i> application instead."
+"Could not add file container %s: Timeout while waiting for loop setup.\n"
+"Please try using the <i>Disks</i> application instead."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -890,7 +890,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Open"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -898,7 +898,7 @@ msgstr "Lock this volume"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Unlock"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/fa.po b/po/fa.po
new file mode 100644
index 0000000000000000000000000000000000000000..7330caeba64aae694768c105a3b447078159ec74
--- /dev/null
+++ b/po/fa.po
@@ -0,0 +1,937 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# adriano <eb.ae@aol.com>, 2013
+# signal89, 2014
+# Ali Mirjamali <ali.mirjamali@gmail.com>, 2019
+# Ali, 2015
+# Amir Moezzi <amirreza.mz@yahoo.com>, 2017
+# Atash G <Ali_hosseine@yahoo.com>, 2019
+# Danial Keshani <dani@daanial.com>, 2013
+# Mohammad Hossein <desmati@gmail.com>, 2014
+# Ehsan Ab <a.ehsan70@gmail.com>, 2015
+# Emma Peel, 2019
+# Farshad Gh <farshad73@gmail.com>, 2015
+# NoProfile, 2014-2016
+# Goudarz Jafari <goudarz.jafari@gmail.com>, 2017,2019
+# Hoot 4nConfidential <hootan-m@live.com>, 2018-2019
+# johnholzer <johnholtzer123@gmail.com>, 2014
+# jonothan hipkey <j.hipkey4502@gmail.com>, 2014
+# Mehrad Rousta <mehrad77@gmail.com>, 2019
+# Mehrzad, 2017
+# M. Heydar Elahi <m.heydar.elahi@gmail.com>, 2014
+# Mohammad Hadi K <mhkaramzadeh7@gmail.com>, 2018
+# Mohammad Hossein <desmati@gmail.com>, 2014
+# Sina Eghbal <s.eghbal@gmail.com>, 2016
+# Vox, 2019
+# Vox, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-18 19:31+0200\n"
+"PO-Revision-Date: 2019-05-28 08:35+0000\n"
+"Last-Translator: Reza Ghasemi\n"
+"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/"
+"fa/)\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
+msgid "Tor is ready"
+msgstr "تور آماده است"
+
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
+msgid "You can now access the Internet."
+msgstr "هم اکنون می توانید به اینترنت دسترسی داشته باشید."
+
+#: config/chroot_local-includes/etc/whisperback/config.py:69
+#, python-format
+msgid ""
+"<h1>Help us fix your bug!</h1>\n"
+"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
+"<p><strong>Do not include more personal information than\n"
+"needed!</strong></p>\n"
+"<h2>About giving us an email address</h2>\n"
+"<p>\n"
+"Giving us an email address allows us to contact you to clarify the problem. "
+"This\n"
+"is needed for the vast majority of the reports we receive as most reports\n"
+"without any contact information are useless. On the other hand it also "
+"provides\n"
+"an opportunity for eavesdroppers, like your email or Internet provider, to\n"
+"confirm that you are using Tails.\n"
+"</p>\n"
+msgstr ""
+"<h1>برای رفع ایراد نرم‌افزاری به ما کمک کنید!</h1>\n"
+"\n"
+"<p><a href=\"%s\">راهنمای گزارش ایرادهای نرم‌افزاری ما</a> را بخوانید</p>\n"
+"\n"
+"<p><strong>Do not include more personal information than\n"
+"\n"
+"needed!</strong></p>\n"
+"\n"
+"<h2>درباره‌ی ارائه‌ی یک آدرس رایانامه (ایمیل) به ما</h2>\n"
+"\n"
+"<p>\n"
+"\n"
+"Giving us an email address allows us to contact you to clarify the problem. "
+"This\n"
+"\n"
+"is needed for the vast majority of the reports we receive as most reports\n"
+"\n"
+"without any contact information are useless. On the other hand it also "
+"provides\n"
+"\n"
+"an opportunity for eavesdroppers, like your email or Internet provider, to\n"
+"\n"
+"confirm that you are using Tails.\n"
+"\n"
+"</p>\n"
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr ""
+"هنگام شروع تیلز می توانید نرم افزار جانبی را از ذخیره سازی مداوم خود نصب "
+"کنید."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr ""
+"پس از شروع تیلز، نرم افزار زیر به طور خودکار از حافظه مداوم شما نصب می شود."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:173
+msgid ""
+"To add more, install some software using <a href=\"synaptic.desktop"
+"\">Synaptic Package Manager</a> or <a href=\"org.gnome.Terminal.desktop"
+"\">APT on the command line</a>."
+msgstr ""
+"برای افزودن بیشتر، برخی از نرم افزار ها را با استفاده از <a href=\"synaptic."
+"desktop\">مدیر بسته </a>synaptic یا APT<a href=\"org.gnome.Terminal.desktop"
+"\"> بر روی خط فرمان</a> نصب کنید."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
+msgid "_Create persistent storage"
+msgstr "_ ایجاد ذخیره سازی مداوم"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:57
+msgid "Persistence is disabled for Electrum"
+msgstr "اصرار است برای غیرفعال بودن Electrum"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:59
+msgid ""
+"When you reboot Tails, all of Electrum's data will be lost, including your "
+"Bitcoin wallet. It is strongly recommended to only run Electrum when its "
+"persistence feature is activated."
+msgstr ""
+"هنگامی که شما راه اندازی مجدد Tails، همه داده های Electrum از دست خواهد رفت، "
+"از جمله کیف پول بیتکوین خود را. این است که به شدت توصیه می شود به تنهایی "
+"اجرا شود Electrum هنگامی که ویژگی تداوم آن فعال می شود."
+
+#: config/chroot_local-includes/usr/local/bin/electrum:60
+msgid "Do you want to start Electrum anyway?"
+msgstr "آیا شما می خواهید برای شروع های Electrum به هر حال؟"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:63
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
+msgid "_Launch"
+msgstr "اجرا"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:64
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
+msgid "_Exit"
+msgstr "خروج"
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:17
+#, sh-format
+msgid ""
+"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
+"\n"
+"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
+"\n"
+"<i>${filename}</i>\n"
+"\n"
+"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
+"automatically in the future."
+msgstr ""
+"<b><big>آیا می‌خواهید نام پایگاه‌داده <i>KeePassX</i> خود را تغییر دهید؟</"
+"big></b>\n"
+"\n"
+"شما یک پایگاه‌داده <i>KeePassX</i> در پوشه <i>مداوم</i> خود دارید:\n"
+"\n"
+"<i>${filename}</i>\n"
+"\n"
+"تغییر نام آن به <i>keepassx.kdbx</i> اجازه می‌دهد که <i>KeePassX</i> به طور "
+"خودکار آن را در آینده باز کند."
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:25
+msgid "Rename"
+msgstr "تغییر نام"
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:26
+msgid "Keep current name"
+msgstr "نام کنونی را نگه دار"
+
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "su غیرفعال است. لطفا از sudo استفاده کنید."
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
+msgid "Lock screen"
+msgstr "صفحه قفل"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79
+msgid "Suspend"
+msgstr "معلق کردن"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83
+msgid "Restart"
+msgstr "شروع دوباره"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:87
+msgid "Power Off"
+msgstr "خاموش کردن رایانه"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:22
+#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
+msgid "Tails"
+msgstr "Tails"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:25
+#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
+msgid "About Tails"
+msgstr "درباره Tails"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:35
+msgid "The Amnesic Incognito Live System"
+msgstr "سیستم‌عامل ناشناخته مبتلا به فراموشی"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:36
+#, python-format
+msgid ""
+"Build information:\n"
+"%s"
+msgstr ""
+"اطلاعات ساخت:\n"
+" %s"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:54
+msgid "not available"
+msgstr "امکان‌پذیر نیست"
+
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:150
+#, python-brace-format
+msgid ""
+"{details} Please check your list of additional software or read the system "
+"log to understand the problem."
+msgstr ""
+"{details} لطفا لیست نرم افزار های جانبی را بررسی کنید یا گزارش های سیستم را "
+"بخوانید تا مشکل را درک کنید."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:155
+msgid ""
+"Please check your list of additional software or read the system log to "
+"understand the problem."
+msgstr ""
+"لطفا لیست نرم افزار های جانبی را بررسی کنید یا گزارش های سیستم را بخوانید تا "
+"مشکل را درک کنید."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159
+msgid "Show Log"
+msgstr "نمایش گزارش"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159
+msgid "Configure"
+msgstr "پیکربندی"
+
+#. Translators: Don't translate {beginning} or {last}, they are
+#. placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:225
+#, python-brace-format
+msgid "{beginning} and {last}"
+msgstr "{beginning} و {last}"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:226
+msgid ", "
+msgstr "،"
+
+#. Translators: Don't translate {packages}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322
+#, python-brace-format
+msgid "Add {packages} to your additional software?"
+msgstr "{packages} را به نرم افزار های جانبی اضافه کنم؟"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+msgid ""
+"To install it automatically from your persistent storage when starting Tails."
+msgstr "برای نصب آن به طور خودکار از ذخیره سازی مداوم خود هنگام شروع تیلز."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:296
+msgid "Install Every Time"
+msgstr "هر بار نصب کن"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:297
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:328
+msgid "Install Only Once"
+msgstr "فقط یک بار نصب کن"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:303
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:374
+msgid "The configuration of your additional software failed."
+msgstr "پیکربندی نرم افزار جانبی با شکست رو به رو شد."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:324
+msgid ""
+"To install it automatically when starting Tails, you can create a persistent "
+"storage and activate the <b>Additional Software</b> feature."
+msgstr ""
+"برای نصب خودکار آن در هنگام شروع تیلز، می‌توانید یک ذخیره سازی مداوم ایجاد "
+"کرده و ویژگی <b>نرم افزار اضافی</b> را فعال کنید."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:327
+msgid "Create Persistent Storage"
+msgstr "ایجاد ذخیره سازی مداوم"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:335
+msgid "Creating your persistent storage failed."
+msgstr "ایجاد ذخیره سازی مداوم شما موفق نبود."
+
+#. Translators: Don't translate {packages}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344
+#, python-brace-format
+msgid "You could install {packages} automatically when starting Tails"
+msgstr "شما می‌توانید {packages} را به طور خودکار در هنگام شروع تیلز نصب کنید"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:347
+msgid ""
+"To do so, you need to run Tails from a USB stick installed using <i>Tails "
+"Installer</i>."
+msgstr ""
+"برای انجام این کار، باید تیلز را از یک حافظه USB که با استفاده از <i>نصب "
+"کننده تیلز</i> نصب می‌شود ، اجرا کنید ."
+
+#. Translators: Don't translate {packages}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:362
+#, python-brace-format
+msgid "Remove {packages} from your additional software?"
+msgstr "حذف {packages} از نرم افزار های جانبی شما؟"
+
+#. Translators: Don't translate {packages}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
+#, python-brace-format
+msgid "This will stop installing {packages} automatically."
+msgstr "این به طور خودکار نصب {packages} را متوقف خواهد کرد."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:368
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:156
+msgid "Remove"
+msgstr "حذف"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:369
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "لغو"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:547
+msgid "Installing your additional software from persistent storage..."
+msgstr "نصب نرم افزار اضافی شما از ذخیره سازی مداوم..."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:549
+msgid "This can take several minutes."
+msgstr "این ممکن چندین دقیقه طول بکشه..."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:562
+msgid "The installation of your additional software failed"
+msgstr "نصب نرم افزار جانبی با شکست رو به رو شد."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:577
+msgid "Additional software installed successfully"
+msgstr "نرم افزار جانبی با موفقیت نصب شد."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:597
+msgid "The check for upgrades of your additional software failed"
+msgstr "بررسی به روز رسانی نرم افزار جانبی با شکست رو به رو شد."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:599
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:607
+msgid ""
+"Please check your network connection, restart Tails, or read the system log "
+"to understand the problem."
+msgstr ""
+"لطفا اتصال شبکه خود را بررسی کنید، تیلز را دوباره راه‌اندازی کنید ، یا گزارش "
+"های سیستم را بخوانید تا مشکل را درک کنید."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:606
+msgid "The upgrade of your additional software failed"
+msgstr "به روز رسانی نرم افزار جانبی با شکست رو به رو شد."
+
+#: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:39
+msgid "Documentation"
+msgstr "مستندات"
+
+#. Translators: Don't translate {package}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:96
+#, python-brace-format
+msgid ""
+"Remove {package} from your additional software? This will stop installing "
+"the package automatically."
+msgstr ""
+"حذف {package} از نرم افزار های جانبی شما؟ این کار نصب خودکار بسته را متوقف "
+"می‌کند."
+
+#. Translators: Don't translate {pkg}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:107
+#, python-brace-format
+msgid "Failed to remove {pkg}"
+msgstr "پاک کردن {pkg} با شکست روبرو شد."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:124
+msgid "Failed to read additional software configuration"
+msgstr "خواندن تنظیمات نرم افزار جانبی با شکست مواجه شد."
+
+#. Translators: Don't translate {package}, it's a placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
+#, python-brace-format
+msgid "Stop installing {package} automatically"
+msgstr "متوقف کردن نصب خودکار {package}"
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:180
+msgid ""
+"To do so, install some software using <a href=\"synaptic.desktop\">Synaptic "
+"Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the "
+"command line</a>."
+msgstr ""
+"برای انجام این کار، برخی از نرم افزار ها را با استفاده از <a href=\"synaptic."
+"desktop\">مدیر بسته synaptic</a> یا <a href=\"org.gnome.Terminal.desktop"
+"\">APT بر روی خط فرمان</a> نصب کنید."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:189
+msgid ""
+"To do so, unlock your persistent storage when starting Tails and install "
+"some software using <a href=\"synaptic.desktop\">Synaptic Package Manager</"
+"a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr ""
+"برای انجام این کار، زمانی که تیلز شروع می‌شود، ذخیره مداوم خود را باز کنید و "
+"برخی از نرم افزار ها را با استفاده از <a href=\"synaptic.desktop\">مدیر بسته "
+"synaptic</a> یا <a href=\"org.gnome.Terminal.desktop\">APT بر روی خط فرمان</"
+"a> نصب کنید."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:199
+msgid ""
+"To do so, create a persistent storage and install some software using <a "
+"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a href=\"org."
+"gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr ""
+"برای انجام این کار, یک ذخیره مداوم ایجاد کنید و برخی از نرم افزار ها را با "
+"استفاده از <a href=\"synaptic.desktop\">مدیر بسته synaptic</a> یا <a href="
+"\"org.gnome.Terminal.desktop\">APT بر روی خط فرمان</a> نصب کنید."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:207
+msgid ""
+"To do so, install Tails on a USB stick using <a href=\"tails-installer."
+"desktop\">Tails Installer</a> and create a persistent storage."
+msgstr ""
+"برای انجام این کار، تیلز را روی یک حافظه USB با استفاده از <a href=\"tails-"
+"installer.desktop\">نصب کننده تیلز</a> نصب کنید و یک ذخیره سازی مداوم ایجاد "
+"کنید."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:254
+msgid "[package not available]"
+msgstr "بسته در دسترس نیست"
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
+msgid "Synchronizing the system's clock"
+msgstr "در حال هم‌زمان کردن ساعت سیستم"
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53
+msgid ""
+"Tor needs an accurate clock to work properly, especially for Hidden "
+"Services. Please wait..."
+msgstr ""
+"تور برای درست کار کاردن، مخصوصا برای خدمات مخفی به یک ساعت دقیق احتیاج دارد، "
+"لطفا صبر کنید..."
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
+msgid "Failed to synchronize the clock!"
+msgstr "هم‌زمان‌سازی ساعت موفقیت‌آمیز نبود!"
+
+#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
+msgid "This version of Tails has known security issues:"
+msgstr "این نسخه از Tails این مشکلات امنیت شناخته شده را دارد:"
+
+#: config/chroot_local-includes/usr/local/bin/tails-security-check:134
+msgid "Known security issues"
+msgstr "مسائل امنیتی شناخته شده"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#, sh-format
+msgid "Network card ${nic} disabled"
+msgstr "کارت شبکهٔ ${nic} غیرفعال است"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
+#, sh-format
+msgid ""
+"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
+"temporarily disabled.\n"
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr ""
+"تغییر آدرس MAC برای کارت شبکه ${nic_name}(${nic}) ناموفق بود و  به همین خاطر "
+"موقتا این سرویس غیرفعال شده است. شما می توانید Tails را بسته و مجددا اجرا "
+"کنید و یا MAC Spoofing یا همان حقه زدن MAC را غیرفعال کنید."
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
+msgid "All networking disabled"
+msgstr "شبکه غیرفعال شده است"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63
+#, sh-format
+msgid ""
+"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
+"recovery also failed so all networking is disabled.\n"
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr ""
+"تغییر آدرس MAC برای کارت شبکه ${nic_name} (${nic}) ناموفق بود. همچنین ترمیم "
+"این خطا نیز موفقیت آمیز نبود و همه شبکه به همین خاطر غیرفعال شد.\n"
+"شما می توانید Tails را دوباره راه اندازی کنید و یا MAC Spoofing یا همان حقه "
+"زدن MAC را غیر فعال کنید."
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
+msgid "Lock Screen"
+msgstr "قفل صفحه"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
+msgid "Screen Locker"
+msgstr "قفل‌کننده‌ی صفحه"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
+msgid "Set up a password to unlock the screen."
+msgstr "برای باز کردن صفحه یک گذرواژه تعیین کنید."
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
+msgid "Password"
+msgstr "رمز عبور"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
+msgid "Confirm"
+msgstr "تایید "
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
+msgid ""
+"\"<b>Not enough memory available to check for upgrades.</b>\n"
+"\n"
+"Make sure this system satisfies the requirements for running Tails.\n"
+"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n"
+"\n"
+"Try to restart Tails to check for upgrades again.\n"
+"\n"
+"Or do a manual upgrade.\n"
+"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
+msgstr ""
+"<b>حافظه رم خالی جهت بررسی برای به روز رسانی موجود نیست.</b>\n"
+"\n"
+"مطمئن شوید این سیستم حداقل پیش نیازهای لازم برای تیلز را پشتیبانی می کند.\n"
+"این فایل را ببینید:  file:///usr/share/doc/tails/website/doc/about/"
+"requirements.en.html\n"
+"\n"
+"تیلز را راه اندازی مجدد کنید و دوباره برای به روز رسانی اقدام کنید.\n"
+"\n"
+"و یا به صورت دستی به روز رسانی کنید.\n"
+"این فایل را ببینید: https://tails.boum.org/doc/first_steps/upgrade#manual"
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
+msgid "error:"
+msgstr "خطا :"
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
+msgid "Error"
+msgstr "خطا"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
+msgid "Warning: virtual machine detected!"
+msgstr "هشدار: ماشین مجازی کشف شد!"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
+msgid "Warning: non-free virtual machine detected!"
+msgstr "هشدار: ماشین مجازی غیر آزاد شناسایی شد!"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:77
+msgid ""
+"Both the host operating system and the virtualization software are able to "
+"monitor what you are doing in Tails. Only free software can be considered "
+"trustworthy, for both the host operating system and the virtualization "
+"software."
+msgstr ""
+"سیستم عامل میزبان و نرم افزار مجازی ساز می توانند آنچه شما در Tails انجام می "
+"دهید را مشاهده کنند. تنها نرم افزارهای آزاد می توانند برای سیستم عامل میزبان "
+"و نرم افزار مجازی ساز قابل اعتماد باشند."
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81
+msgid "Learn more"
+msgstr "بیشتر بدانید"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
+msgid "Tor is not ready"
+msgstr "تور آماده نیست"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
+msgid "Tor is not ready. Start Tor Browser anyway?"
+msgstr "تور آماده نیست. مرورگر تور به هر حال اجرا شود؟"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:45
+msgid "Start Tor Browser"
+msgstr "اجرای مرورگر تور"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:40
+msgid "Tor"
+msgstr "Tor"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:55
+msgid "Open Onion Circuits"
+msgstr "یک مدار پیازی باز کن"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+msgid "Do you really want to launch the Unsafe Browser?"
+msgstr "آیا واقعا قصد دارید که مرورگر نا امن را اجرا کنید؟"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
+msgid ""
+"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
+"use the Unsafe Browser if necessary, for example\\nif you have to login or "
+"register to activate your Internet connection."
+msgstr ""
+"فعالیت های شبکه داخل مرورگر ناامن <b>قابل رهگیری</b> هستند.\\n تنها در صورت "
+"نیاز از مرورگر ناامن استفاده کنید، برای مثال\\nاگر باید برای اتصال به "
+"اینترنت وارد شوید یا ثبت نام کنید."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
+msgid "Starting the Unsafe Browser..."
+msgstr "در حال اجرای مرورگر نا امن"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
+msgid "This may take a while, so please be patient."
+msgstr "این ممکن است مدتی طول بکشد, بنابراین لطفا شکیبا باشید."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
+msgid "Shutting down the Unsafe Browser..."
+msgstr "در حال بستن مرورگر نا امن"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
+msgid ""
+"This may take a while, and you may not restart the Unsafe Browser until it "
+"is properly shut down."
+msgstr ""
+"ممکن است مدتی طول بکشد. تا زمانی که به درستی خاموش شود لطفا مرورگر ناامن را "
+"ری استارت نکنید"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
+msgid "Failed to restart Tor."
+msgstr "عدم موفقیت در ری استارت کردن تور"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+msgid "Unsafe Browser"
+msgstr "مرورگر ناامن"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91
+msgid ""
+"Another Unsafe Browser is currently running, or being cleaned up. Please "
+"retry in a while."
+msgstr ""
+"یک مرورگر نا امن دیگر درحال اجرا, یا در حال پاکسازی است. لطفا کمی دیرتر "
+"دوباره امتحان کنید."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99
+msgid "Failed to setup chroot."
+msgstr "عدم موفقیت در راه اندازی Chroot"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104
+msgid "Failed to configure browser."
+msgstr "پیکربندی مرورگر ناموفق بود."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110
+msgid ""
+"No DNS server was obtained through DHCP or manually configured in "
+"NetworkManager."
+msgstr "هیچ سرور DNS از طریق DHCP یا تنظیم دستی در NetworkManager بدست نیامد."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121
+msgid "Failed to run browser."
+msgstr "اجرای مرورگر ناموفق بود."
+
+#. Translators: Don't translate {volume_label} or {volume_size},
+#. they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#, python-brace-format
+msgid "{volume_label} ({volume_size})"
+msgstr "{volume_label} ({volume_size})"
+
+#. Translators: Don't translate {partition_name} or {partition_size},
+#. they are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#, python-brace-format
+msgid "{partition_name} ({partition_size})"
+msgstr "{partition_name} ({partition_size})"
+
+#. Translators: Don't translate {volume_size}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#, python-brace-format
+msgid "{volume_size} Volume"
+msgstr "حجم {volume_size}"
+
+#. Translators: Don't translate {volume_name}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#, python-brace-format
+msgid "{volume_name} (Read-Only)"
+msgstr "{volume_name} (فقط-خواندنی)"
+
+#. Translators: Don't translate {partition_name} and {container_path}, they
+#. are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#, python-brace-format
+msgid "{partition_name} in {container_path}"
+msgstr "{partition_name} در {container_path}"
+
+#. Translators: Don't translate {volume_name} and {path_to_file_container},
+#. they are placeholders and will be replaced. You should only have to translate
+#. this string if it makes sense to reverse the order of the placeholders.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#, python-brace-format
+msgid "{volume_name} – {path_to_file_container}"
+msgstr "{volume_name} - {path_to_file_container}"
+
+#. Translators: Don't translate {partition_name} and {drive_name}, they
+#. are placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#, python-brace-format
+msgid "{partition_name} on {drive_name}"
+msgstr "{partition_name} بر روی {drive_name}"
+
+#. Translators: Don't translate {volume_name} and {drive_name},
+#. they are placeholders and will be replaced. You should only have to translate
+#. this string if it makes sense to reverse the order of the placeholders.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#, python-brace-format
+msgid "{volume_name} – {drive_name}"
+msgstr "{volume_name} - {drive_name}"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+msgid "Wrong passphrase or parameters"
+msgstr "کلمه عبور یا پارامتر غلط"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+msgid "Error unlocking volume"
+msgstr "خطا در باز کردن حجم"
+
+#. Translators: Don't translate {volume_name} or {error_message},
+#. they are placeholder and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#, python-brace-format
+msgid ""
+"Couldn't unlock volume {volume_name}:\n"
+"{error_message}"
+msgstr ""
+"قادر به باز کردن حجم {volume_name} نبودیم:\n"
+"{error_message}"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
+msgid "No file containers added"
+msgstr "هیچ مخزنی افزوده نشد"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
+msgid "No VeraCrypt devices detected"
+msgstr "دستگاه VeraCrypt تشخیص داده نشد"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:40
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
+msgid "Unlock VeraCrypt Volumes"
+msgstr "باز کردن حجم‌های VeraCrypt"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
+msgid "Container already added"
+msgstr "مخزن افزوده‌شده است."
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
+#, python-format
+msgid "The file container %s should already be listed."
+msgstr "مخزن فایل %s باید لیست شده باشد."
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
+msgid "Container opened read-only"
+msgstr "محفظه باز شد (فقط خواندنی)"
+
+#. Translators: Don't translate {path}, it's a placeholder  and will be replaced.
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:133
+#, python-brace-format
+msgid ""
+"The file container {path} could not be opened with write access. It was "
+"opened read-only instead. You will not be able to modify the content of the "
+"container.\n"
+"{error_message}"
+msgstr ""
+"مخزن پرونده {path} را نمی‌توان با دسترسی نوشتن باز کرد.اگر بجای آن دسترسی فقط-"
+"خواندنی بود. شما نمی توانستید محتوای مخزن را اصلاح کنید.\n"
+"\n"
+"{error_message}"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138
+msgid "Error opening file"
+msgstr "خطا در باز کردن فایل"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
+msgid "Not a VeraCrypt container"
+msgstr "مخزن VeraCrypt نیست"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161
+#, python-format
+msgid "The file %s does not seem to be a VeraCrypt container."
+msgstr "فایل %s مخزن VeraCrypt به نظر نمی‌رسد."
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
+msgid "Failed to add container"
+msgstr "خطا در افزودن مخزن"
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
+#, python-format
+msgid ""
+"Could not add file container %s: Timeout while waiting for loop setup.\n"
+"Please try using the <i>Disks</i> application instead."
+msgstr ""
+"افزودن کانتینر فایل %s ممکن نشد: انتظار برای نصب لوپ بسیار طول کشید.\n"
+"لطفا به جای آن از برنامه‌ی <i>دیسک</i> استفاده کنید."
+
+#: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
+msgid "Choose File Container"
+msgstr "انتخاب مخزن فایل"
+
+#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid "Report an error"
+msgstr "گزارش یک خطا"
+
+#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1
+msgid "Tails documentation"
+msgstr "مستندات Tails"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2
+msgid "Learn how to use Tails"
+msgstr "آموزش نحوهٔ استفاده از Tails"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
+msgid "Learn more about Tails"
+msgstr "اطلاعات بیشتر در مورد Tails را یاد بگیرید"
+
+#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
+msgid "Tor Browser"
+msgstr "مرورگر تور"
+
+#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
+msgid "Anonymous Web Browser"
+msgstr "مرورگر ناشناس"
+
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
+msgid "Browse the World Wide Web without anonymity"
+msgstr "شبکه جهانی وب (اینترنت) را بدون ناشناس بودن مرور کنید"
+
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3
+msgid "Unsafe Web Browser"
+msgstr "مرورگر وب ناامن"
+
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
+msgid "Mount VeraCrypt encrypted file containers and devices"
+msgstr "کانتینرهای پرونده و دستگاه‌های رمزگذاری شده با VeraCrypt را بارگیری کن"
+
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
+msgid "Additional Software"
+msgstr "نرم افزار اضافی"
+
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
+msgid ""
+"Configure the additional software installed from your persistent storage "
+"when starting Tails"
+msgstr ""
+"پیکربندی نرم افزار جانبی نصب‌شده از ذخیره سازی مداوم خود هنگام شروع تیلز"
+
+#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
+msgid "Tails specific tools"
+msgstr "ابزارهای بارز Tails"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
+msgid "To start a Root Terminal, you need to authenticate."
+msgstr "برای اجرای ترمینال روت, باید وارد سیستم شوید."
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1
+msgid "Remove an additional software package"
+msgstr "حذف بسته‌ی نرم افزار اضافی"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2
+msgid ""
+"Authentication is required to remove a package from your additional software "
+"($(command_line))"
+msgstr ""
+"حذف بسته از نرم افزار اضافی شما نیازمند احراز هویت است ($(command_line))"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
+msgid "File Containers"
+msgstr "مخزن فایل"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:80
+msgid "_Add"
+msgstr "_افزودن"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:86
+msgid "Add a file container"
+msgstr "افزودن مخزن فایل"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:103
+msgid "Partitions and Drives"
+msgstr "پارتیشن‌ها و درایوها"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:121
+msgid ""
+"This application is not affiliated with or endorsed by the VeraCrypt project "
+"or IDRIX."
+msgstr ""
+"این نرم افزار وابسته و یا تائید شده توسط پروژه‌ی VeraCrypt یا IDRIX نیست."
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
+msgid "_Open"
+msgstr "_باز کردن"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
+msgid "Lock this volume"
+msgstr "فقل کردن این حجم"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
+msgid "_Unlock"
+msgstr "_باز کردن"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
+msgid "Detach this volume"
+msgstr "جدا کردن این حجم"
+
+#: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
+msgid "TrueCrypt/VeraCrypt container"
+msgstr "مخزن TrueCrypt/VeraCrypt"
diff --git a/po/he.po b/po/he.po
index 6017390c48ffa08b5aef2249afc0f0c339af0f55..e513855454abd79a2da6531926288bac159a22ba 100644
--- a/po/he.po
+++ b/po/he.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-04-12 19:17+0000\n"
+"PO-Revision-Date: 2019-05-20 19:11+0000\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/"
 "he/)\n"
@@ -116,7 +116,7 @@ msgstr "_הפעל"
 #: config/chroot_local-includes/usr/local/bin/electrum:64
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
-msgstr "_יציאה"
+msgstr "_צא"
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:17
 #, sh-format
@@ -141,7 +141,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:25
 msgid "Rename"
-msgstr "שינוי שם"
+msgstr "שנה שם"
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:26
 msgid "Keep current name"
@@ -161,7 +161,7 @@ msgstr "השעה"
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83
 msgid "Restart"
-msgstr "הפעלה מחדש"
+msgstr "הפעל מחדש"
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:87
 msgid "Power Off"
@@ -215,7 +215,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159
 msgid "Show Log"
-msgstr "הצג יומן"
+msgstr "הראה יומן"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:159
 msgid "Configure"
@@ -314,7 +314,7 @@ msgstr "הסר"
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
-msgstr "ביטול"
+msgstr "בטל"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:547
 msgid "Installing your additional software from persistent storage..."
@@ -770,7 +770,7 @@ msgid "Failed to add container"
 msgstr "נכשל בהוספת מֵכַל"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
@@ -793,7 +793,7 @@ msgstr "תיעוד Tails"
 
 #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2
 msgid "Learn how to use Tails"
-msgstr "למד איך להשתמש ב-Tails"
+msgstr "למד איך להשתמש ב־Tails"
 
 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
 msgid "Learn more about Tails"
@@ -871,7 +871,7 @@ msgstr "יישום זה אינו מסונף עם או מאושר ע\"י מיזם
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_פתח"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -879,7 +879,7 @@ msgstr "נעל כרך זה"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_בטל נעילה"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/is.po b/po/is.po
index 03b710886f28a605101280f34f18d61a0ef16fda..23aa9d500d49fd864ad2bc15316d4e9944c74f65 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-04-06 17:00+0000\n"
+"PO-Revision-Date: 2019-05-23 08:01+0000\n"
 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/"
 "is/)\n"
@@ -785,13 +785,14 @@ msgid "Failed to add container"
 msgstr "Tókst ekki að bæta við skráagámi"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
 "Gat ekki bætt við skráagámnum %s: Rann út á tíma meðan beðið var eftir "
-"uppsetningu á hringbeiningu. Notaðu frekar <i>Diskar</i> forritið."
+"uppsetningu á hringbeiningu.\n"
+"Notaðu frekar <i>Diskar</i> forritið."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -891,7 +892,7 @@ msgstr "Þetta forrit tengist hvorki VeraCrypt verkefninu né IDRIX."
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Opna"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -899,7 +900,7 @@ msgstr "Læsa þessari gagnageymslu"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Aflæsa"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/it.po b/po/it.po
index def9de03102f920e670b93c7c45175b4852bebc4..d7a4cb21e5362f78be6c88ca4679876a90506a1b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -32,8 +32,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-04-14 08:53+0000\n"
-"Last-Translator: Giandomenico Lombardi <transifex.com@l1t.it>\n"
+"PO-Revision-Date: 2019-05-20 10:21+0000\n"
+"Last-Translator: Random_R\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/"
 "it/)\n"
 "Language: it\n"
@@ -807,13 +807,14 @@ msgid "Failed to add container"
 msgstr "Errore nell'aggiunta del container"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"Impossibile aggiungere il contenitore di file %s: tempo scaduto configurando "
-"il loop. Riprova usando l'applicazione <i>Dischi</i>."
+"Impossibile aggiungere contenitore file %s: tempo scaduto in attesa del loop "
+"setup.\n"
+"Prova piuttosto ad usare l'applicazione <i>Dischi</i>."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -914,7 +915,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Apri"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -922,7 +923,7 @@ msgstr "Blocca questo volume"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Sblocca"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/ka.po b/po/ka.po
index 2b4224baeff7405272ef4abc5b8fe22aa9c46943..88319e0c1bba8d30e53b3829f74b26ea8486b1f8 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-04-28 15:36+0000\n"
+"PO-Revision-Date: 2019-05-20 14:14+0000\n"
 "Last-Translator: Georgianization\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/"
 "ka/)\n"
@@ -784,13 +784,13 @@ msgid "Failed to add container"
 msgstr "სათავსის დამატება ვერ მოხერხდა"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"ვერ ხერხდება ფაილის სათავსის %s დამატება: დაყოვნება დაყენებამდე მოცდისთვის. "
-"გთხოვთ, სცადოთ <i>დისკების</i> პროგრამის გამოყენება."
+"ვერ ემატება ფაილის სათავსი %s: დაყოვნება, განმეორებით დაყენებამდე. \n"
+"გთხოვთ, სანაცვლოდ გამოიყენოთ <i>დისკების</i> პროგრამა."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -891,7 +891,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_გახსნა"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -899,7 +899,7 @@ msgstr "დანაყოფის ჩაკეტვა"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_გაღება"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/ms_MY.po b/po/ms_MY.po
index ab05e5c1df04f6c8aa601506d23dfe81feedfc2c..d16a02a13ff854d02fd00cee206b4d3378bfeaa7 100644
--- a/po/ms_MY.po
+++ b/po/ms_MY.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-05 03:53+0000\n"
+"PO-Revision-Date: 2019-05-21 06:02+0000\n"
 "Last-Translator: abuyop <abuyop@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/"
 "language/ms_MY/)\n"
@@ -786,13 +786,13 @@ msgid "Failed to add container"
 msgstr "Gagal menambah bekas"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"Tidak dapat menambah bekas fail%s: Had masa tamat ketika menunggu persediaan "
-"gelung. Cuba gunakan aplikasi <i>Cakera</i> sebagai ganti."
+"Tidak dapat menambah bekas fail%s: Had masa tamat ketika menunggu \n"
+"persediaan gelung. Cuba gunakan aplikasi <i>Cakera</i> sebagai ganti."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -893,7 +893,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Buka"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -901,7 +901,7 @@ msgstr "Kunci volum ini"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Buka"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/pl.po b/po/pl.po
index 3d13aef1b33a6164c208f4939805303ac2c94ad4..d7bbb4380c76b4a99d430c4efe22c2c6f2d2adf2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-04-16 18:39+0000\n"
+"PO-Revision-Date: 2019-05-24 19:57+0000\n"
 "Last-Translator: Waldemar Stoczkowski\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/"
 "pl/)\n"
@@ -804,14 +804,14 @@ msgid "Failed to add container"
 msgstr "Nie udało się dodać konteneru"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"Nie można dodać konteneru plików %s: Upłynął limit czasu oczekiwania na "
-"pętlę konfiguracyjną. Proszę spróbować używając zamiast tego aplikację "
-"<i>Dyski</i>."
+"Nie można dodać kontenera plików %s: Limit czasu podczas oczekiwania na "
+"konfigurację pętli.\n"
+"Spróbuj zamiast tego użyć aplikacji <i>Dyski</i>."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -912,7 +912,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Otwarte"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -920,7 +920,7 @@ msgstr "Zablokuj ten wolumin"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Odblokowanie"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 67c3f3f36933869a3d007d0ff85f37f0898c61c1..83a0085847caa67f713ab3716f06915112e68664 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,8 @@
 # Alexei Gonçalves de Oliveira <alexis@gessicahellmann.com>, 2018
 # Communia <ameaneantie@riseup.net>, 2013-2018
 # carlo giusepe tadei valente sasaki <carlo.gt.valente@gmail.com>, 2014
-# Chacal Exodius, 2019
+# Chacal E., 2019
+# Chacal E., 2019
 # Danton Medrado, 2015
 # Eduardo Addad de Oliveira <eduardoaddad@hotmail.com>, 2018-2019
 # Eduardo Bonsi, 2013-2014
@@ -30,8 +31,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-04-07 18:59+0000\n"
-"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad@hotmail.com>\n"
+"PO-Revision-Date: 2019-06-17 04:51+0000\n"
+"Last-Translator: Chacal E.\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/"
 "language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -806,14 +807,14 @@ msgid "Failed to add container"
 msgstr "Falhou ao adcionar container"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"Não foi possível adicionar o volume de armazenagem de arquivos %s: Tempo de "
-"espera esgotado ao aguardar o loop de configuração. Por favor, experimente "
-"usar, em vez disso, o aplicativo <i>Discos</i>."
+"Não foi possível adicionar o contêiner de arquivos %s: Tempo limite enquanto "
+"aguarda o loop de configuração.\n"
+"Por favor, tente usar o aplicativo <i>Disks</i>."
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -914,7 +915,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Abrir"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -922,7 +923,7 @@ msgstr "Bloquear este volume"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Desbloquear"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 7e38fb4ec63b51c5130bf1b5302d849cb24d8e01..f22d908a04bea60ae68c322cb50ebb2a06884b5f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -4,15 +4,16 @@
 #
 # Translators:
 # Hugo9191 <hugoncosta@gmail.com>, 2019
-# Manuela Silva, 2018
+# Manuela Silva <manuelarodsilva@gmail.com>, 2019
+# Manuela Silva <manuelarodsilva@gmail.com>, 2018
 # Rui <xymarior@yandex.com>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-18 20:10+0000\n"
-"Last-Translator: Hugo9191 <hugoncosta@gmail.com>\n"
+"PO-Revision-Date: 2019-06-03 13:49+0000\n"
+"Last-Translator: Manuela Silva <manuelarodsilva@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/"
 "torproject/language/pt_PT/)\n"
 "Language: pt_PT\n"
@@ -539,7 +540,7 @@ msgstr "Erro"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
 msgid "Warning: virtual machine detected!"
-msgstr "Atenção: detetada máquina virtual!"
+msgstr "Aviso: detetada máquina virtual!"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
 msgid "Warning: non-free virtual machine detected!"
@@ -582,7 +583,7 @@ msgstr "Abrir Circuitos Onion"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
 msgid "Do you really want to launch the Unsafe Browser?"
-msgstr "Quer mesmo iniciar o Navegador Inseguro?"
+msgstr "Deseja iniciar o Navegador Inseguro?"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
 msgid ""
@@ -600,7 +601,7 @@ msgstr "A iniciar o Navegador Inseguro..."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "This may take a while, so please be patient."
-msgstr "Isto pode demorar algum tempo, por favor, seja paciente."
+msgstr "Isto poderá demorar algum tempo, por favor, seja paciente."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid "Shutting down the Unsafe Browser..."
@@ -810,7 +811,7 @@ msgstr "Documentação do Tails"
 
 #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2
 msgid "Learn how to use Tails"
-msgstr "Aprenda a utilizar o Tails"
+msgstr "Saiba como utilizar o Tails"
 
 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
 msgid "Learn more about Tails"
@@ -830,7 +831,7 @@ msgstr "Explore a World Wide Web sem anonimato"
 
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3
 msgid "Unsafe Web Browser"
-msgstr "Navegador Web Inseguro"
+msgstr "Navegador da Web Inseguro"
 
 #: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
 msgid "Mount VeraCrypt encrypted file containers and devices"
@@ -894,7 +895,7 @@ msgstr ""
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Abrir"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -902,7 +903,7 @@ msgstr "Bloquear este volume"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Desbloquear"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/ru.po b/po/ru.po
index c4c23b0d1b3827b0dda7df2d52ad70468f08da00..4d704b112ce86fe6751b79f710a3b2e64ac77c8c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,6 +9,7 @@
 # Andrey, 2017
 # Антон Толмачев <a.tolmachev@richart-consalt.ru>, 2016
 # Denis Denis <stereodenis@gmail.com>, 2014
+# Dmitry Schneider <adamred280@live.ru>, 2019
 # Emma Peel, 2018
 # Eugene, 2013
 # Иван Лапенков, 2015
@@ -36,8 +37,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-18 20:57+0000\n"
-"Last-Translator: Viktor Kutcevich <architector4@tilde.team>\n"
+"PO-Revision-Date: 2019-05-22 13:14+0000\n"
+"Last-Translator: Dmitry Schneider <adamred280@live.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/"
 "ru/)\n"
 "Language: ru\n"
@@ -927,7 +928,7 @@ msgstr "Это приложение не связано / не одобрено
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "_Открыть"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -935,7 +936,7 @@ msgstr "Заблокировать этот том"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "_Разблокировать"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b78c70ab67d19393561a369be8a8b2e08f838f9f..19e773edf3e014796ccb3afe7ff9868e0221bf1e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,15 +19,16 @@
 # Xiaolan <xiaolan@protonmail.ch>, 2014
 # YFdyh000 <yfdyh000@gmail.com>, 2016
 # YFdyh000 <yfdyh000@gmail.com>, 2013-2016
-# Zhui Shen <12231252@bjtu.edu.cn>, 2019
+# Yikai Yang <ff98sha@gmail.com>, 2019
+# shenzhui007 <12231252@bjtu.edu.cn>, 2019
 # ヨイツの賢狼ホロ, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-05-13 04:17+0000\n"
-"Last-Translator: Dianyu Liu <liudianyu5@gmail.com>\n"
+"PO-Revision-Date: 2019-05-29 02:00+0000\n"
+"Last-Translator: Yikai Yang <ff98sha@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/"
 "language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -42,7 +43,7 @@ msgstr "Tor 已就绪"
 
 #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "你现在可以访问因特网了。"
+msgstr "你现在可以访问互联网了。"
 
 #: config/chroot_local-includes/etc/whisperback/config.py:69
 #, python-format
@@ -96,7 +97,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
 msgid "_Create persistent storage"
-msgstr "_创建持久存储"
+msgstr "创建持久存储(_C)"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
@@ -283,13 +284,13 @@ msgstr "创建持久存储失败"
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:344
 #, python-brace-format
 msgid "You could install {packages} automatically when starting Tails"
-msgstr "当开始运行Tails时，你将自动安装 {packages}。"
+msgstr "当开始运行 Tails 时，你将自动安装 {packages}。"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:347
 msgid ""
 "To do so, you need to run Tails from a USB stick installed using <i>Tails "
 "Installer</i>."
-msgstr "要实现以上操作，你需要通过USB来运行<i>Tails Installer</i>。"
+msgstr "要实现以上操作，你需要在 USB 中运行 <i>Tails 安装器</i>。"
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.
@@ -341,7 +342,7 @@ msgstr "附加软件更新检查失败。"
 msgid ""
 "Please check your network connection, restart Tails, or read the system log "
 "to understand the problem."
-msgstr "请检查您的网络连接，重启Tails或者阅读系统日志以了解问题所在。"
+msgstr "请检查您的网络连接，重启 Tails 或者阅读系统日志以了解问题所在。"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:606
 msgid "The upgrade of your additional software failed"
@@ -409,8 +410,8 @@ msgid ""
 "To do so, install Tails on a USB stick using <a href=\"tails-installer."
 "desktop\">Tails Installer</a> and create a persistent storage."
 msgstr ""
-"为实现以上操作，在USB存储器上安装Tails时请使用<a href=\"tails-installer."
-"desktop\">Tails安装程序</a>并创建一个持久存储。"
+"为实现以上操作，在 USB 上安装 Tails 时请使用 <a href=\"tails-installer."
+"desktop\">Tails 安装程序</a>并创建一个持久存储。"
 
 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:254
 msgid "[package not available]"
@@ -418,17 +419,17 @@ msgstr "[无法使用此原件包]"
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
 msgid "Synchronizing the system's clock"
-msgstr "同步系统时钟"
+msgstr "同步系统时间"
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53
 msgid ""
 "Tor needs an accurate clock to work properly, especially for Hidden "
 "Services. Please wait..."
-msgstr "为了正常运行，尤其隐匿服务，Tor 需要准确的时钟。请稍等..."
+msgstr "为了正常运行，尤其是隐匿服务，Tor 需要精确的时间。请稍等..."
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
 msgid "Failed to synchronize the clock!"
-msgstr "同步时钟失败！"
+msgstr "同步时间失败！"
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
@@ -450,8 +451,8 @@ msgid ""
 "temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr ""
-"MAC 欺骗失败，网卡 ${nic_name} (${nic}) 已暂时禁用。\n"
-"您可能宁愿重启 Tails 并禁用 MAC 欺骗。"
+"MAC 伪装失败，网卡 ${nic_name} (${nic}) 已暂时禁用。\n"
+"您可能会选择重启 Tails 并禁用 MAC 伪装。"
 
 #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
 msgid "All networking disabled"
@@ -464,9 +465,9 @@ msgid ""
 "recovery also failed so all networking is disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr ""
-"MAC 欺骗对 ${nic_name} (${nic}) 失败。错误恢复也一同失败，所以所有网络已被禁"
+"MAC 伪装对 ${nic_name} (${nic}) 失败。错误恢复也一同失败，所以所有网络已被禁"
 "用。\n"
-"您可能宁愿重启 Tails 并禁用 MAC 欺骗。"
+"您可能会选择重启 Tails 并禁用 MAC 伪装。"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
 msgid "Lock Screen"
@@ -548,11 +549,11 @@ msgstr "Tor 未就绪"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Tor is not ready. Start Tor Browser anyway?"
-msgstr "Tor 未就绪。确定启动 Tor Browser？"
+msgstr "Tor 未就绪。确定启动 Tor 浏览器？"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:45
 msgid "Start Tor Browser"
-msgstr "启动 Tor Browser"
+msgstr "启动 Tor 浏览器"
 
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:40
 msgid "Tor"
@@ -759,12 +760,13 @@ msgid "Failed to add container"
 msgstr "无法添加容器。"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"无法添加容器 %s：等待回环设备时超时。请使用 <i>磁盘</i>应用程序再试一次。"
+"无法添加文件容器 %s：等待回环设备时超时。\n"
+"请使用 <i>磁盘</i>应用程序再试一次。"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -789,7 +791,7 @@ msgstr "更深入了解 Tails"
 
 #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
 msgid "Tor Browser"
-msgstr "Tor Browser"
+msgstr "Tor 浏览器"
 
 #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
 msgid "Anonymous Web Browser"
@@ -841,7 +843,7 @@ msgstr "文件容器"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:80
 msgid "_Add"
-msgstr "_添加"
+msgstr "添加(_A)"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:86
 msgid "Add a file container"
@@ -859,7 +861,7 @@ msgstr "本程序和 VeraCrypt 和 IDRIX 均无关联。"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "开启(_O)"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -867,7 +869,7 @@ msgstr "锁定此卷"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "解锁(_U)"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fa2ca2274fa0f28315cfd082ab458a7c8339aeb3..7782d7771d085886a2bb83a58cb6027aafff1701 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-18 19:31+0200\n"
-"PO-Revision-Date: 2019-04-26 12:06+0000\n"
+"PO-Revision-Date: 2019-05-23 13:25+0000\n"
 "Last-Translator: Hsiu-Ming Chang <cges30901@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/"
 "language/zh_TW/)\n"
@@ -759,12 +759,13 @@ msgid "Failed to add container"
 msgstr "無法加入容器"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.\n"
 "Please try using the <i>Disks</i> application instead."
 msgstr ""
-"無法加入檔案容器 %s：等待 loop 設定時逾時。請試著改用<i>磁碟</i>應用程式。"
+"無法加入檔案容器 %s：等待 loop 設定時逾時。\n"
+"請試著改用<i>磁碟</i>應用程式。"
 
 #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
 msgid "Choose File Container"
@@ -859,7 +860,7 @@ msgstr "本應用程式與 VeraCrypt 項目或 IDRIX 無關聯或認可。"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
 msgid "_Open"
-msgstr ""
+msgstr "開啟(_O)"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
 msgid "Lock this volume"
@@ -867,7 +868,7 @@ msgstr "鎖定此加密區"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
 msgid "_Unlock"
-msgstr ""
+msgstr "解鎖(_U)"
 
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
 msgid "Detach this volume"
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index 1a0d08307c2a5f26a62c9771287ba90a77aba444..baef54d1ec4f3ac3bd2ff1c80d02dc8d2e0be51e 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -59,27 +59,28 @@ fi
 
 TAILS_GIT_DIR="/home/vagrant/amnesia"
 if [ ! -d "${TAILS_GIT_DIR}" ]; then
-    # We use --shared as an time/space optimization, and it is safe
-    # since our build process doesn't modify any objects (which would
-    # fail since the host's .git directory is shared read-only).
-    git clone --shared --local /amnesia.git/.git "${TAILS_GIT_DIR}"
-    # When we locally Git clone the main repo over the filesystem
-    # above, it will use the host's local repo as origin, but the
-    # submodules will continue to use their remote repos. A problem
-    # with this, beside unnecessary fetching of the network, is that
-    # any unpublished commits in the host's submodule are
-    # inaccessible, so if we want to build we first have to push those
-    # commits to the submodules remote repo. To avoid this, and in
-    # general try to make sure that the Git state in the builder is
-    # the same as on the host, we just clone the submodules in the
-    # same way we do the main repo.
-    (
-        cd "${TAILS_GIT_DIR}/submodules"
-        for submodule in $(ls -1); do
-            rm -rf "${submodule}"
-            git clone --shared "/amnesia.git/.git/modules/submodules/${submodule}"
-        done
-    )
+	# We use --shared as an time/space optimization, and it is safe
+	# since our build process doesn't modify any objects (which would
+	# fail since the host's .git directory is shared read-only).
+	git clone --shared --local /amnesia.git/.git "${TAILS_GIT_DIR}"
+	# When we locally Git clone the main repo over the filesystem
+	# above, it will use the host's local repo as origin, but the
+	# submodules will continue to use their remote repos. A problem
+	# with this, beside unnecessary fetching of the network, is that
+	# any unpublished commits in the host's submodule are
+	# inaccessible, so if we want to build we first have to push those
+	# commits to the submodules remote repo. To avoid this, and in
+	# general try to make sure that the Git state in the builder is
+	# the same as on the host, we just clone the submodules in the
+	# same way we do the main repo.
+	(
+		cd "${TAILS_GIT_DIR}/submodules"
+		for submodule in $(ls -1); do
+			rm -rf "${submodule}"
+			git clone --shared \
+			    "/amnesia.git/.git/modules/submodules/${submodule}"
+		done
+	)
 fi
 
 cd "${TAILS_GIT_DIR}"
@@ -87,27 +88,15 @@ cd "${TAILS_GIT_DIR}"
 # they were on our own "origin" remote, (i.e. under the origin/$REF
 # name), even if it's untrue (our own "origin" is amnesia.git and has
 # only one local ref, which is the branch we work on and that it has
-# checked out as a local tracking branch). We need this for the base
-# branch merge we do (if the 'mergebasebranch'/TAILS_MERGE_BASE_BRANCH
-# option is set) later in auto/build.
+# checked out as a local tracking branch). This allows
+# git_base_branch_head(), that's used by Rakefile to set
+# $BASE_BRANCH_GIT_COMMIT, to do its job: without this, it would not
+# have access to the state of the base branch because it would not
+# have any ref for it.
 git config remote.origin.fetch +refs/remotes/origin/*:refs/remotes/origin/*
 
-# Ensure we have the Git refs we need:
-git fetch origin "${GIT_REF}"
-# The repo we cloned above (the host's repo) will expose *its* local
-# checkouts of branches. We know that the GIT_REF ref will be
-# up-to-date since it is what is checked out on the host, so we could
-# just fetch it above, but for any other ref (read: branch) the local
-# checkout could be very out-of-date, or worse: it may not even exist,
-# making any attempt at merging the base branch below fail. We work
-# around this by fetching the ref from the host's origin (most likely
-# the official Tails repo) where the base branch refs must exist and
-# be as up-to-date as possible (i.e. since the host's last fetch).
-if [ "${TAILS_MERGE_BASE_BRANCH}" = 1 ]; then
-    git fetch origin "origin/$(cat config/base_branch)"
-fi
-
-# Ensure we have the same Git state as on the host:
+# Ensure we have the same Git state as on the host
+git fetch --tags
 git checkout --force "${GIT_REF}"
 git reset --hard "${GIT_COMMIT}"
 git submodule update --init
@@ -134,16 +123,16 @@ if [ -n "$TAILS_DATE_OFFSET" ]; then
 fi
 
 if [ "${TAILS_PROXY_TYPE}" = "vmproxy" ]; then
-    # The apt-cacher-ng cache disk is 15G, so let's ensure at most 10G
-    # of it is used there is 5G before each build, which should be
-    # enough for any build, even if we have to download a complete set
-    # of new packages for a new Debian release.
-    as_root_do /usr/lib/apt-cacher-ng/acngtool shrink 10G -f || \
-        echo "The clean-up of apt-cacher-ng's cache failed: this is" \
-             "not fatal and most likely just means that some disk" \
-             "space could not be reclaimed -- in order to fix that" \
-             "situation you need to manually investigate " \
-             "/var/cache/apt-cacher-ng/apt-cacher-ng-log/main_*.html" >&2
+	# The apt-cacher-ng cache disk is 15G, so let's ensure at most 10G
+	# of it is used there is 5G before each build, which should be
+	# enough for any build, even if we have to download a complete set
+	# of new packages for a new Debian release.
+	as_root_do /usr/lib/apt-cacher-ng/acngtool shrink 10G -f || \
+	echo "The clean-up of apt-cacher-ng's cache failed: this is" \
+	     "not fatal and most likely just means that some disk" \
+	     "space could not be reclaimed -- in order to fix that" \
+	     "situation you need to manually investigate " \
+	     "/var/cache/apt-cacher-ng/apt-cacher-ng-log/main_*.html" >&2
 fi
 
 BUILD_DIR=$(mktemp -d /tmp/tails-build.XXXXXXXX)
diff --git a/wiki/src/inc/stable_amd64_date.html b/wiki/src/inc/stable_amd64_date.html
index 7c80f0977131c052cbf5bb9efa14d80383b30393..6f5ec6758ad99540fb3d7f11e2b17dabd249fc77 100644
--- a/wiki/src/inc/stable_amd64_date.html
+++ b/wiki/src/inc/stable_amd64_date.html
@@ -1 +1 @@
-2019-05-21
\ No newline at end of file
+2019-06-20
\ No newline at end of file
diff --git a/wiki/src/inc/stable_amd64_img_gpg_verify.html b/wiki/src/inc/stable_amd64_img_gpg_verify.html
index c0f7ffda4b3a5764d8d50994a57a25d32c474be7..e6a1937914b197b5450c52bd062d7ae67a4ece15 100644
--- a/wiki/src/inc/stable_amd64_img_gpg_verify.html
+++ b/wiki/src/inc/stable_amd64_img_gpg_verify.html
@@ -1 +1 @@
-TZ=UTC gpg --no-options --keyid-format long --verify tails-amd64-3.14.img.sig tails-amd64-3.14.img
+TZ=UTC gpg --no-options --keyid-format long --verify tails-amd64-3.14.1.img.sig tails-amd64-3.14.1.img
diff --git a/wiki/src/inc/stable_amd64_img_sig_url.html b/wiki/src/inc/stable_amd64_img_sig_url.html
index d2493a6fff7f54652d35841849671cf241ff18d9..fbc17b58efced8f2a201a7625fc7373eb751ae40 100644
--- a/wiki/src/inc/stable_amd64_img_sig_url.html
+++ b/wiki/src/inc/stable_amd64_img_sig_url.html
@@ -1 +1 @@
-https://tails.boum.org/torrents/files/tails-amd64-3.14.img.sig
+https://tails.boum.org/torrents/files/tails-amd64-3.14.1.img.sig
diff --git a/wiki/src/inc/stable_amd64_img_torrent_url.html b/wiki/src/inc/stable_amd64_img_torrent_url.html
index bf214c6a5b1b25ad8e4ab01559591a1b686d9c24..630a9a8c4bc4552096c51239e33f823166c0a84f 100644
--- a/wiki/src/inc/stable_amd64_img_torrent_url.html
+++ b/wiki/src/inc/stable_amd64_img_torrent_url.html
@@ -1 +1 @@
-https://tails.boum.org/torrents/files/tails-amd64-3.14.img.torrent
+https://tails.boum.org/torrents/files/tails-amd64-3.14.1.img.torrent
diff --git a/wiki/src/inc/stable_amd64_img_url.html b/wiki/src/inc/stable_amd64_img_url.html
index b2a7d86e66420b71f9ed8baf202466e5d32e15f9..5ff4343aa0add6832a49f6c2e66abb7b22486127 100644
--- a/wiki/src/inc/stable_amd64_img_url.html
+++ b/wiki/src/inc/stable_amd64_img_url.html
@@ -1 +1 @@
-http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.14/tails-amd64-3.14.img
+http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.14.1/tails-amd64-3.14.1.img
diff --git a/wiki/src/inc/stable_amd64_iso_gpg_verify.html b/wiki/src/inc/stable_amd64_iso_gpg_verify.html
index b5f02b29e2593230ed545a35fd54f3ae024e7450..49b19cb076cc0c7ab72a2314f5beef5bb11e52c8 100644
--- a/wiki/src/inc/stable_amd64_iso_gpg_verify.html
+++ b/wiki/src/inc/stable_amd64_iso_gpg_verify.html
@@ -1 +1 @@
-TZ=UTC gpg --no-options --keyid-format long --verify tails-amd64-3.14.iso.sig tails-amd64-3.14.iso
+TZ=UTC gpg --no-options --keyid-format long --verify tails-amd64-3.14.1.iso.sig tails-amd64-3.14.1.iso
diff --git a/wiki/src/inc/stable_amd64_iso_sig_url.html b/wiki/src/inc/stable_amd64_iso_sig_url.html
index d4714e67cd063d358b9755896ddf9bed79f90904..014f1be814fb0e6fe418f1765c3a9bb801639b00 100644
--- a/wiki/src/inc/stable_amd64_iso_sig_url.html
+++ b/wiki/src/inc/stable_amd64_iso_sig_url.html
@@ -1 +1 @@
-https://tails.boum.org/torrents/files/tails-amd64-3.14.iso.sig
+https://tails.boum.org/torrents/files/tails-amd64-3.14.1.iso.sig
diff --git a/wiki/src/inc/stable_amd64_iso_torrent_url.html b/wiki/src/inc/stable_amd64_iso_torrent_url.html
index e3cb826fbe27a37adac28a8dd312fc88be50e3e3..d1213679ef905aba9b86a669807ac214c51ceaeb 100644
--- a/wiki/src/inc/stable_amd64_iso_torrent_url.html
+++ b/wiki/src/inc/stable_amd64_iso_torrent_url.html
@@ -1 +1 @@
-https://tails.boum.org/torrents/files/tails-amd64-3.14.iso.torrent
+https://tails.boum.org/torrents/files/tails-amd64-3.14.1.iso.torrent
diff --git a/wiki/src/inc/stable_amd64_iso_url.html b/wiki/src/inc/stable_amd64_iso_url.html
index 2eaace41ff64af410470aae891802be456f7dba0..3f30b05ff959158968e2f07ea65ec13fb161744e 100644
--- a/wiki/src/inc/stable_amd64_iso_url.html
+++ b/wiki/src/inc/stable_amd64_iso_url.html
@@ -1 +1 @@
-http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.14/tails-amd64-3.14.iso
+http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.14.1/tails-amd64-3.14.1.iso
diff --git a/wiki/src/inc/stable_amd64_version.html b/wiki/src/inc/stable_amd64_version.html
index 6324d401a069f4020efcf0ff07442724b52f47c2..49547fdca4fcf38dd0f0807c3bc9e25d27b50544 100644
--- a/wiki/src/inc/stable_amd64_version.html
+++ b/wiki/src/inc/stable_amd64_version.html
@@ -1 +1 @@
-3.14
+3.14.1
diff --git a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/3.13.3/amd64/alpha/upgrades.yml
deleted file mode 100644
index 9bd818b3d24a3d1c3d7fe1741ae4f6b2a2fd49b3..0000000000000000000000000000000000000000
--- a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/alpha/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: amd64
-channel: alpha
-product-name: Tails
-product-version: 3.13.3
diff --git a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/3.13.3/amd64/alpha/upgrades.yml.pgp
deleted file mode 100644
index 3ba9dc20671cef8685c2fb99889e3c1ea4403040..0000000000000000000000000000000000000000
--- a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/alpha/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE/gKctKrUeI4deCjoqLD05FsbUOIFAlzPmsQACgkQqLD05Fsb
-UOJE5A//aByWqDeyg0VY2iN3W/F8o7KoLNcGtoDAWzE6Wwv2XKZNoG3O4URswnC1
-CwOut19XZ8Nm6mqRTEe89K5+nhA+33pUUfJJa1jrQqhZ34faQ525v9sU38jS4zK1
-Medct1OmmYHxrFd5a3s89tm5v6Ua8IFPdL19usqRSYTVUh8PRCqdkXCSf/imk8wR
-u7RSTEo6iIhj2Mpgf7x7AXLnaFhQ6RVQrTWUARYi2PRPNiqy1FmxWYBqvF0L1uLY
-tFjBTov0x/OpD00cdPF6c98IHnBUQKaFDLMIa38vHjvTKXNsajAKd1Q/5PT//1Q+
-n6D6mBZBQTkNg4xkXRhSY1xdP/jlEO98Leeh2gUzoGUH69kwIoXJ0A4ceIaiGVjg
-o3KUZ3FYDZ6lzFbOr8ICcdAlK39hEd+b7Vlkgaye2VVH4pPDcqkjm0dWrDsrLs/F
-qlCgyEVyFCnwf7SLbJRgwvfkNhspgiBdVRf0y2L8wtobbRgwNjU4vdViHGdCGyQs
-KDsSaJid3ctDIjIRKRf1XT1EvCqFG2GefdqNu7GGm9XhaaDdTpmkOw5OZfxLGRe/
-007G7d5C7ZFEGaEmOu/BqUTHEu4+8kQSgaaHiQdQ35Ix3mRSPy74/+qswekZueRR
-wTawNuI8e5mebdrZ4S5nne9oB+X5b6jdiiYsJ9v5K7Hk7PMwrE8=
-=encC
------END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/3.13.3/amd64/stable/upgrades.yml
deleted file mode 100644
index 89fd4242fb717b483d2c82e573fa040f167077c7..0000000000000000000000000000000000000000
--- a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/stable/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: amd64
-channel: stable
-product-name: Tails
-product-version: 3.13.3
diff --git a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/3.13.3/amd64/stable/upgrades.yml.pgp
deleted file mode 100644
index 77173d4e29169d1830d62bb3bdee71aef28325ae..0000000000000000000000000000000000000000
--- a/wiki/src/upgrade/v1/Tails/3.13.3/amd64/stable/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE/gKctKrUeI4deCjoqLD05FsbUOIFAlzPmssACgkQqLD05Fsb
-UOKiKA/9Gdf6/zkdQ8bPx6HB6/zgXMj+z9PeL/a5yOG1Z+ZCucj5+8/0ySlOhcQf
-xbiMyg6Xut9sAqZu0hMWX6LfupGgXBjjLds7T54wsoaueLALIKrrw0Yyr+F/l19W
-rYZ7A33qWjM+3PZvAn+o/E3SOB3wc2ofQ1QYBlIcaGPGT+LXxDkJ0qaF2F065rBE
-IPzZHkJx2Hr8wK7aGMHPcx4mpFn0gCrvqEDGB0b00rN8PNIRQgTluyL4ZJIdvo3o
-ZvIOph5vwM+OafPrCyu+ws7IbcEtwFP1wWdhvM4cKlkhxVWKX3ogWT7NYWVN22jE
-oXGG8C0Z3WK9bkr/BewDsxTbxzV4/yaBLFeltpNFBYnxW0lXGZbAEn4g15jghED0
-QWUZb8zeer3FRltWje898xqfKF1H74HBYwB2Ubi93U0yPfZWxHa89oIIL+WU/4IB
-B5wKAXpgNpe6WKMb5xuPI05qZpdp4R+8o5qoonRag715PFEpCP7Cffyi+KEl/AQV
-m+VH94af+FpD4oyeVa7xnTzXt3sY1oVPap2kiGdKYfhbrNd7Urs7wqjU76bD4qo7
-JAGvtWOEutToAgG7nZmglR8B6YfTe+tVx1PBYlw2rJJV2gNjZ6dy7ppQs6Ekr9Eo
-UjDLrt4SAadQUgk5eMKn+24hVU5h9ALMEB+gwxBlB4p3pRUz+Jo=
-=gifO
------END PGP SIGNATURE-----