Commit 47c699e0 authored by intrigeri's avatar intrigeri

Merge remote-tracking branch 'origin/master' into stable

parents 080015e4 95811271
#!/bin/bash
set -eu
set -o pipefail
NAME=$(basename "${0}")
LONGOPTS="version:,isos:,release-branch:,matching-jenkins-images-build-id:"
OPTS=$(getopt -o "" --longoptions $LONGOPTS -n "${NAME}" -- "$@")
eval set -- "$OPTS"
while [ $# -gt 0 ]; do
case $1 in
--version)
shift
VERSION="$1"
;;
--isos)
shift
ISOS="$1"
;;
--release-branch)
shift
RELEASE_BRANCH="$1"
;;
--matching-jenkins-images-build-id)
shift
MATCHING_JENKINS_IMAGES_BUILD_ID="$1"
;;
esac
shift
done
ssh misc.lizard mkdir "tails-amd64-${VERSION:?}"
scp "${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}."{apt-sources,build-manifest,buildlog,packages,iso.sig,img.sig} \
"misc.lizard:tails-amd64-${VERSION:?}"
ssh misc.lizard gpg --import < "wiki/src/tails-signing.key"
ssh misc.lizard << EOF
cd tails-amd64-${VERSION:?} && \
wget --quiet \
"https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_IMAGES_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.iso" \
"https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_IMAGES_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.img" && \
gpg --verify tails-amd64-${VERSION:?}.iso{.sig,} && \
gpg --verify tails-amd64-${VERSION:?}.img{.sig,}
EOF
ssh misc.lizard << EOF
( [ -d isos ] || git clone gitolite@puppet-git.lizard:isos.git ) && \
cd isos && \
git annex init && \
git annex sync && \
git annex import ../tails-amd64-${VERSION:?} && \
rmdir ../tails-amd64-${VERSION:?} && \
git commit -m "Add Tails ${VERSION:?}" && \
git annex sync && \
git annex copy tails-amd64-${VERSION:?} --to origin && \
git annex drop tails-amd64-${VERSION:?} && \
git annex sync
EOF
#!/bin/sh
set -eu
for dir in config/APT_snapshots.d vagrant/definitions/tails-builder/config/APT_snapshots.d; do
(
set -eu
echo "${dir:?}:"
cd "${dir:?}"
for ARCHIVE in * ; do
SERIAL="$(cat ${ARCHIVE:?}/serial)"
if [ "${SERIAL:?}" = 'latest' ]; then
EXPIRY='never'
if [ "${ARCHIVE:?}" != 'debian-security' ]; then
echo "Warning: origin '${ARCHIVE:?}' is using the 'latest' snapshot, which is unexpected" >&2
fi
else
case "${ARCHIVE:?}" in
'debian-security')
DIST='buster/updates'
;;
'torproject')
DIST='buster'
;;
*)
DIST='stable'
;;
esac
EXPIRY="$(curl --silent "https://time-based.snapshots.deb.tails.boum.org/${ARCHIVE:?}/dists/${DIST:?}/snapshots/${SERIAL:?}/Release" | sed -n 's/^Valid-Until:\s\+\(.*\)$/\1/p')"
fi
echo "* Archive '${ARCHIVE:?}' uses snapshot '${SERIAL:?}' which expires on: ${EXPIRY:?}"
done
echo ---
)
done
#!/bin/bash
set -eu
set -o pipefail
NAME=$(basename "${0}")
LONGOPTS="version:,dist:,release-branch:,matching-jenkins-images-build-id:"
OPTS=$(getopt -o "" --longoptions $LONGOPTS -n "${NAME}" -- "$@")
eval set -- "$OPTS"
while [ $# -gt 0 ]; do
case $1 in
--version)
shift
VERSION="$1"
;;
--dist)
shift
DIST="$1"
;;
--release-branch)
shift
RELEASE_BRANCH="$1"
;;
--matching-jenkins-images-build-id)
shift
MATCHING_JENKINS_IMAGES_BUILD_ID="$1"
;;
esac
shift
done
ssh rsync.lizard gpg --import < wiki/src/tails-signing.key
ssh rsync.lizard << EOF
wget --quiet \
"https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_IMAGES_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.iso" \
"https://nightly.tails.boum.org/build_Tails_ISO_${RELEASE_BRANCH:?}/builds/${MATCHING_JENKINS_IMAGES_BUILD_ID:?}/archive/build-artifacts/tails-amd64-${VERSION:?}.img" && \
gpg --verify tails-amd64-${VERSION:?}.iso{.sig,} && \
gpg --verify tails-amd64-${VERSION:?}.img{.sig,}
EOF
ssh rsync.lizard << EOF
sudo install -o root -g rsync_tails -m 0755 -d \
/srv/rsync/tails/tails/${DIST:?}/tails-amd64-${VERSION:?} && \
sudo chown root:rsync_tails tails-amd64-${VERSION:?}.{iso,img}* && \
sudo chmod u=rwX,go=rX tails-amd64-${VERSION:?}.{iso,img}* && \
sudo mv tails-amd64-${VERSION:?}.{iso,img}* \
/srv/rsync/tails/tails/${DIST:?}/tails-amd64-${VERSION:?}
EOF
......@@ -92,41 +92,6 @@ def download_iuks_from_jenkins(
destdir: str,
jenkins_iuks_base_url: str,
jenkins_build_id: int) -> None:
# This assumes same basename for hashes, locally and in Jenkins:
log.info("Downloading IUK hashes (if available) from Jenkins to %s…" % (desthost))
try:
url = "%s/%s/archive/%s" % (
jenkins_iuks_base_url,
jenkins_build_id,
Path(hashes_file).name
)
jenkins_hashes = '%(d)s/%(f)s' % {
"d": destdir,
"f": '%s.jenkins' % Path(hashes_file).name
}
our_hashes = '%(d)s/%(f)s' % {
"d": destdir,
"f": Path(hashes_file).name,
}
subprocess.run(
["ssh", desthost, "wget", "--quiet", "--no-clobber",
"-O", jenkins_hashes, url],
check=True
)
subprocess.run(
["ssh", desthost,
"sh -c \"if ! cmp -s '%(j_h)s' '%(o_h)s'; then "
"echo 'WARNING: IUK hashes seem different'; else "
"echo 'OK: IUK hashes seem similar'; fi\"" % {
"j_h": jenkins_hashes,
"o_h": our_hashes,
}],
check=True
)
except subprocess.CalledProcessError:
log.error("Unable to download/validate IUK hashes from Jenkins")
log.info("Downloading IUKs from Jenkins to %s…" % (desthost))
iuks = iuks_listed_in(hashes_file)
log.debug("IUKS: %s" % ', '.join(iuks))
......
#!/bin/sh
set -u
current_mfsa() {
local current
current="$(
torsocks --isolate curl --silent https://www.mozilla.org/en-US/security/advisories/ | \
sed --regexp-extended -n 's@.*<a href="/en-US/security/advisories/(mfsa[0-9]+-[0-9]+)/".*>@\1@p' | \
sort -n | \
tail -n 1
)"
echo "$(date --rfc-3339=s): got ${current}" >&2
echo "${current}"
}
initial="$(current_mfsa)"
while true; do
new="$(current_mfsa)"
[ -n "${new}" ] || continue
if [ "${new}" != "${initial}" ]; then
echo "${new}"
exit 0
fi
sleep 60
done
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-07-23 01:14+0000\n"
"PO-Revision-Date: 2020-10-04 21:30+0000\n"
"PO-Revision-Date: 2020-10-19 16:31+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fr\n"
......@@ -607,11 +607,13 @@ msgstr ""
#. type: Content of: <section><div><div><ul><li>
msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
msgstr "[[Relationship with upstream|contribute/relationship_with_upstream]]"
msgstr ""
"[[Relations avec les autres projets constituant Tails|contribute/"
"relationship_with_upstream]]"
#. type: Content of: <section><div><div><ul><li>
msgid "[[Contribute|contribute]]"
msgstr "[[Contribuer|contribute]]"
msgstr "[[Participer|contribute]]"
#. type: Content of: <section><div><div><ul><li>
msgid "<a href=\"https://www.torproject.org/\">The Tor Project</a>"
......
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-07-29 20:51+0000\n"
"PO-Revision-Date: 2020-10-04 21:30+0000\n"
"PO-Revision-Date: 2020-10-19 16:31+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
......@@ -482,7 +482,9 @@ msgstr "Relationship with upstream and derivatives"
#. type: Bullet: ' - '
msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
msgstr "[[Relationship with upstream|contribute/relationship_with_upstream]]"
msgstr ""
"[[Relations avec les autres projets constituant Tails|contribute/"
"relationship_with_upstream]]"
#. type: Bullet: ' - '
msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
......
......@@ -82,7 +82,6 @@
- Mention updates as "Update *Xyz* to [1.2.4]."
- Mention previous version if we skipped some "Update *Xyz* from 1.0.0 to [1.2.3]."
- Link to release notes if any, or changelog
- For Linux upgrades add "*This should improve the support for newer hardware (graphics, Wi-Fi, etc.)*"
- Order items to put the most visible, less technical, and most popular
items first while not being afraid of putting more technical items as
well down the list.
......
......@@ -20,9 +20,9 @@ vulnerabilities|security/Numerous_security_holes_in_$VERSION-1]]. You should upg
[[!toc levels=1]]
# New features
<h1 id="features">New features</h1>
# Changes and updates
<h1 id="changes">Changes and updates</h1>
<-- You can reuse the following subsections if the section gets too big:
......@@ -36,7 +36,7 @@ vulnerabilities|security/Numerous_security_holes_in_$VERSION-1]]. You should upg
- Update *Thunderbird* to [1.2.3](https://www.thunderbird.net/en-US/thunderbird/1.2.3/releasenotes/).
- Update *Linux* to 1.2.3. This should improve the support for newer
- Update (*Linux* to 1.2.3|most firmware packages). This should improve the support for newer
hardware (graphics, Wi-Fi, etc.).
## Hardware support
......@@ -46,13 +46,11 @@ Wi-Fi, etc.):
-->
# Fixed problems
<h1 id="fixes">Fixed problems</h1>
For more details, read our [[!tails_gitweb debian/changelog desc="changelog"]].
<a id="known-issues"></a>
# Known issues
<h1 id="issues">Known issues</h1>
<!--
......@@ -65,7 +63,7 @@ None specific to this release.
See the list of [[long-standing issues|support/known_issues]].
# Get Tails $VERSION
<h1 id="get">Get Tails $VERSION</h1>
## To upgrade your Tails USB stick and keep your persistent storage
......@@ -93,7 +91,7 @@ Tails $VERSION directly:
- [[For USB sticks (USB image)|install/download]]
- [[For DVDs and virtual machines (ISO image)|install/download-iso]]
# What's coming up?
<h1 id="next">What's coming up?</h1>
Tails $VERSION+1 is [[scheduled|contribute/calendar]] for $MONTH $DAY.
......
This diff is collapsed.
......@@ -59,6 +59,11 @@ In a directory with many Tails ISO and USB images:
This section can **not** be done by the RM.
0. Check that the <https://tails.boum.org/contribute/calendar/>
documents who is the _Trusted Reproducer_ for this release.
If this is not the case, ask the RM (this is the only exception
to "do not trust anything said by the RM about this process").
1. Download the ISO and USB images.
2. Clear-sign the hashes of all products using your OpenPGP key
......@@ -77,8 +82,7 @@ This section can **not** be done by the RM.
echo "$DEST_DIR/TR-bits.gz"
4. Send the aforementioned generated file as an attachment
to the _Trusted Reproducer_, whose name is on the
[release calendar](https://tails.boum.org/contribute/calendar/).
to the _Trusted Reproducer_.
5. If the _Trusted Reproducer_ is around, ask them:
......
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-10-15 20:39+0000\n"
"PO-Revision-Date: 2020-10-18 09:29+0000\n"
"PO-Revision-Date: 2020-10-19 16:31+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <https://translate.tails.boum.org/projects/tails/"
"src-donate/es/>\n"
......@@ -113,22 +113,6 @@ msgstr ""
#. For recurring donations only.
#. For one-time donation only.
#. type: Content of: <div><div><div><form>
#, fuzzy
#| msgid ""
#| "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
#| "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
#| "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
#| "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
#| "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
#| "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
#| "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
#| "thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-"
#| "url\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc"
#| "\" type=\"hidden\" value=\"US\"/> <input type=\"hidden\" name=\"a3\" "
#| "value=\"5\" id=\"a3\"/> <input type=\"hidden\" name=\"t3\" value=\"M\" id="
#| "\"t3\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <input type="
#| "\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"amount"
#| "\" value=\"5\" id=\"amount\"/>"
msgid ""
"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
......@@ -145,19 +129,20 @@ msgid ""
"type=\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name="
"\"amount\" value=\"5\" id=\"amount\"/>"
msgstr ""
"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"ES\"/> <input type="
"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\""
"cmd\"/> <input type=\"hidden\" name=\"business\" value=\""
"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" name=\""
"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type=\"hidden\" "
"name=\"item_name\" value=\"Donation to Tails\"/> <input type=\"hidden\" name="
"\"custom\" id=\"custom\"/> <input type=\"hidden\" name=\"no_note\" value=\""
"1\"/> <input type=\"hidden\" name=\"return\" value=\"https://tails.boum.org/"
"donate/thanks/\" class=\"return-url\"/> <input type=\"hidden\" name=\""
"cancel_return\" value=\"https://tails.boum.org/donate/canceled/\" class"
"=\"return-url\"/> <input type=\"hidden\" name=\"lc\" value=\"ES\"/> <input "
"type=\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" "
"name=\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type=\""
"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
#. type: Content of: <div><div><div><form><div><div>
msgid ""
......@@ -363,29 +348,6 @@ msgstr "Donación recurrente"
#. Note for translators: adapt the URLs to return to the page in your language.
#. Note for translators: adapt the value of 'lc' to your language.
#. type: Content of: <div><div><div><div><form>
#, fuzzy
#| msgid ""
#| "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> "
#| "<input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
#| "net\"/> <input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
#| "\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
#| "\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
#| "\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
#| "\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
#| "\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/"
#| "donate/canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> "
#| "<input type=\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" "
#| "name=\"p3\" value=\"1\"/> <input type=\"radio\" name=\"a3\" value=\"5\" "
#| "id=\"sub5\" checked=\"checked\"/><label for=\"sub5\">$5</label> <input "
#| "type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for="
#| "\"sub10\">$10</label> <input type=\"radio\" name=\"a3\" value=\"20\" id="
#| "\"sub20\"/><label for=\"sub20\">$20</label> <input type=\"radio\" name="
#| "\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">$50</label> <input "
#| "type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for="
#| "\"sub100\">$100</label> <input type=\"radio\" name=\"a3\" value=\"250\" "
#| "id=\"sub250\"/><label for=\"sub250\">$250</label> <input type=\"radio\" "
#| "name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">$500</"
#| "label>"
msgid ""
"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
......@@ -405,34 +367,23 @@ msgid ""
"\"a3\" value=\"50\" id=\"sub50\"/>$50</label>"
msgstr ""
"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
"value=\"1\"/> <input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" "
"checked=\"checked\"/><label for=\"sub5\">$5</label> <input type=\"radio\" "
"name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">$10</label> "
"<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for="
"\"sub20\">$20</label> <input type=\"radio\" name=\"a3\" value=\"50\" id="
"\"sub50\"/><label for=\"sub50\">$50</label> <input type=\"radio\" name="
"\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">$100</label> "
"<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for="
"\"sub250\">$250</label> <input type=\"radio\" name=\"a3\" value=\"500\" id="
"\"sub500\"/><label for=\"sub500\">$500</label>"
"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> <"
"input type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\""
"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value=\"Donation "
"to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input "
"type=\"hidden\" name=\"return\" value=\"https://tails.boum.org/donate/thanks/"
"\" class=\"return-url\"/> <input type=\"hidden\" name=\"cancel_return\" "
"value=\"https://tails.boum.org/donate/canceled/\" class=\"return-url\"/> <"
"input type=\"hidden\" name=\"lc\" value=\"ES\"/> <input type=\"hidden\" name="
"\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <"
"label for=\"sub5\"><input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" "
"checked=\"checked\"/>$5</label> <label for=\"sub10\"><input type=\"radio\" "
"name=\"a3\" value=\"10\" id=\"sub10\"/>$10</label> <label for=\"sub25\"><"
"input type=\"radio\" name=\"a3\" value=\"25\" id=\"sub25\"/>$25</label> <"
"label for=\"sub50\"><input type=\"radio\" name=\"a3\" value=\"50\" id=\""
"sub50\"/>$50</label>"
#. type: Content of: <div><div><div><div><form>
#, fuzzy
#| msgid ""
#| "<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for="
#| "\"sub100\">$100</label> <input type=\"radio\" name=\"a3\" value=\"150\" "
#| "id=\"sub150\"/><label for=\"sub150\">$150</label> <input type=\"radio\" "
#| "name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">$200</"
#| "label>"
msgid ""
"<label for=\"sub100\"><input type=\"radio\" name=\"a3\" value=\"100\" id="
"\"sub100\"/>$100</label> <label for=\"sub150\"><input type=\"radio\" name="
......@@ -440,10 +391,10 @@ msgid ""
"\"sub500\"><input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/>"
"$200</label>"
msgstr ""
"<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for="
"\"sub100\">$100</label> <input type=\"radio\" name=\"a3\" value=\"150\" id="
"\"sub150\"/><label for=\"sub150\">$150</label> <input type=\"radio\" name="
"\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">$200</label>"
"<label for=\"sub100\"><input type=\"radio\" name=\"a3\" value=\"100\" id=\""
"sub100\"/>$100</label> <label for=\"sub150\"><input type=\"radio\" name=\""
"a3\" value=\"150\" id=\"sub150\"/>$150</label> <label for=\"sub500\"><input "
"type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/>$200</label>"
#. type: Content of: <div><div><div><div><form>
msgid ""
......@@ -569,16 +520,12 @@ msgstr ""
"impuestos por la ley</strong>"
#. type: Content of: <div><div><div><div><p>
#, fuzzy
#| msgid ""
#| "If you need a donation receipt, ask <a href=\"mailto:tails-"
#| "accounting@boum.org\">tails-accounting@boum.org</a>."
msgid ""
"If you need a donation receipt, contact us at <a href=\"mailto:tails-"
"fundraising@boum.org\">tails-fundraising@boum.org</a>."
msgstr ""
"Si necesitas un recibo de donación, pregunta a <a href=\"mailto:tails-"
"accounting@boum.org\">tails-accounting@boum.org</a>."
"Si necesitas un recibo de donación, contáctanos en <a href=\"mailto:tails-"
"fundraising@boum.org\">tails-fundraising@boum.org</a>."
#. type: Content of: <div><div><div><h3>
msgid "Other ways to donate"
......@@ -658,7 +605,7 @@ msgstr ""
#, fuzzy
#| msgid "Bitcoin"
msgid "Bitcoin Cash"
msgstr "Bitcoin"
msgstr "Bitcoin Cash"
#. type: Content of: <div><div><div><div><p>
msgid "<strong>qrzav77wkhd942nyqvya34mya3fqxzx90ypjge0njh</strong>"
......
......@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-09-17 16:53+0000\n"
"PO-Revision-Date: 2020-10-18 15:31+0000\n"
"PO-Revision-Date: 2020-10-19 16:31+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"thanks/es/>\n"
......@@ -55,12 +55,17 @@ msgid ""
"Most Internet tools fund themselves by spying on their users. At Tails, we "
"do things differently and we couldn't do it without you."
msgstr ""
"La mayoría de las herramientas de internet se financian espiando a sus "
"usuarios. En Tails hacemos las cosas de manera distinta y no podríamos "
"hacerlo sin ti."
#. type: Content of: <div><div><p>
msgid ""
"If you need a donation receipt, contact us at <a href=\"mailto:tails-"
"fundraising@boum.org\">tails-fundraising@boum.org</a>."
msgstr ""
"Si necesitas un recibo de donación, contáctanos en <a href=\"mailto:tails-"
"fundraising@boum.org\">tails-fundraising@boum.org</a>."
#. type: Content of: <div><div><p>
msgid "Your donation will appear as made to Riseup Labs, our fiscal sponsor."
......
gpg:&nbsp;Signature&nbsp;made&nbsp;2020-09-21T10:45:56&nbsp;UTC<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;RSA&nbsp;key&nbsp;05469FB85EAD6589B43D41D3D21DAD38AF281C0B<br/>
gpg:&nbsp;Signature&nbsp;made&nbsp;Mon&nbsp;19&nbsp;Oct&nbsp;2020&nbsp;09:54:10&nbsp;AM&nbsp;UTC<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;EDDSA&nbsp;key&nbsp;CD4D4351AFA6933F574A9AFB90B2B4BD7AED235F<br/>
gpg:&nbsp;Good&nbsp;signature&nbsp;from&nbsp;"Tails&nbsp;developers&nbsp;(offline&nbsp;long-term&nbsp;identity&nbsp;key)&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;aka&nbsp;"Tails&nbsp;developers&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
gpg:&nbsp;Signature&nbsp;made&nbsp;2020-09-21T10:45:38&nbsp;UTC<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;RSA&nbsp;key&nbsp;05469FB85EAD6589B43D41D3D21DAD38AF281C0B<br/>
gpg:&nbsp;Signature&nbsp;made&nbsp;Mon&nbsp;19&nbsp;Oct&nbsp;2020&nbsp;09:53:57&nbsp;AM&nbsp;UTC<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;EDDSA&nbsp;key&nbsp;CD4D4351AFA6933F574A9AFB90B2B4BD7AED235F<br/>
gpg:&nbsp;Good&nbsp;signature&nbsp;from&nbsp;"Tails&nbsp;developers&nbsp;(offline&nbsp;long-term&nbsp;identity&nbsp;key)&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;aka&nbsp;"Tails&nbsp;developers&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
......@@ -7,9 +7,9 @@
{
"target-files": [
{
"sha256": "7c5f2a96ce7c2923560aee01c6c6cda00245272934be2f6316a9ad1b64860f42",
"sha256": "2a6d81c2e801c26f4b5f2590bfd384df43d67b910ac5d8230cfd5fd1fc8d23d5",
"size": 1243611136,
"url": "http://dl.amnesia.boum.org/tails/stable/tails-amd64-4.11/tails-amd64-4.11.img"
"url": "http://dl.amnesia.boum.org/tails/stable/tails-amd64-4.12/tails-amd64-4.12.img"
}
],
"type": "img"
......@@ -17,15 +17,15 @@
{
"target-files": [
{
"sha256": "e6f070d40aeaa9117d84fdbb3162637e4cc01248611a9bb3f99ae52c663abf36",
"sha256": "3a892b34b1d25278105ae5b679694aa56a47c0286ec0c02471f9e2de85888e28",
"size": 1233793024,
"url": "http://dl.amnesia.boum.org/tails/stable/tails-amd64-4.11/tails-amd64-4.11.iso"
"url": "http://dl.amnesia.boum.org/tails/stable/tails-amd64-4.12/tails-amd64-4.12.iso"
}
],
"type": "iso"
}
],
"version": "4.11"
"version": "4.12"
}