summaryrefslogtreecommitdiffstats
path: root/wiki/src
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-10-20 09:22:31 +0000
committerintrigeri <intrigeri@boum.org>2018-10-20 09:22:31 +0000
commitc65a06774ea2581c618987b903014ce1a819d505 (patch)
tree539cf810c03f270986cded5835f9bdf879546744 /wiki/src
parentead8d7bf04e26c038d32da28836811b2e11411f5 (diff)
parent6874492ebafb53ac7e78626eaa5be2438c659574 (diff)
Merge branch 'master' into stable
Diffstat (limited to 'wiki/src')
-rw-r--r--wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn27
-rw-r--r--wiki/src/contribute/calendar.mdwn12
-rw-r--r--wiki/src/contribute/design/installation.mdwn8
-rw-r--r--wiki/src/contribute/git.mdwn4
-rw-r--r--wiki/src/contribute/release_process.mdwn11
-rw-r--r--wiki/src/contribute/release_process/tails-installer.mdwn3
-rw-r--r--wiki/src/contribute/release_process/test.mdwn19
-rw-r--r--wiki/src/contribute/release_process/test/reproducibility.mdwn242
-rw-r--r--wiki/src/contribute/release_process/test/reproducibility/verification.mdwn243
-rw-r--r--wiki/src/contribute/roadmap.mdwn81
-rw-r--r--wiki/src/contribute/working_together/roles/foundations_team.mdwn26
-rw-r--r--wiki/src/contribute/working_together/roles/release_manager.mdwn8
-rw-r--r--wiki/src/doc/first_steps/additional_software.de.po58
-rw-r--r--wiki/src/doc/first_steps/additional_software.es.po27
-rw-r--r--wiki/src/doc/first_steps/additional_software.fa.po42
-rw-r--r--wiki/src/doc/first_steps/additional_software.fr.po58
-rw-r--r--wiki/src/doc/first_steps/additional_software.it.po22
-rw-r--r--wiki/src/doc/first_steps/additional_software.mdwn2
-rw-r--r--wiki/src/doc/first_steps/additional_software.pt.po25
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.de.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.fr.po2
-rw-r--r--wiki/src/doc/first_steps/startup_options/administration_password.it.po2
-rw-r--r--wiki/src/donate.de.po6
-rwxr-xr-xwiki/src/donate.es.po63
-rw-r--r--wiki/src/donate.fr.po79
-rw-r--r--wiki/src/local-donate.css (renamed from wiki/src/local.css)0
-rw-r--r--wiki/src/news/2018-fundraiser.fr.po71
-rw-r--r--wiki/src/news/test_3.9-rc1.mdwn2
-rw-r--r--wiki/src/templates/news.tmpl2
-rw-r--r--wiki/src/templates/page.tmpl2
30 files changed, 669 insertions, 480 deletions
diff --git a/wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn b/wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn
index 76df7b8..72b513b 100644
--- a/wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn
+++ b/wiki/src/blueprint/usb_install_and_upgrade/usb_bootable_disk_image.mdwn
@@ -36,6 +36,33 @@ Open questions:
- What about DVD support? Can we stop distributing an ISO image
some day?
+## Growing system partition during boot
+
+Corresponding ticket: [[!tails_ticket 15319]]
+
+The plan is to do this in a _partitioning_ script in the initramfs. There are different stages in the initramfs, which are explained in the (pretty useful) [man page for _initramfs-tools_](http://manpages.ubuntu.com/manpages/xenial/man8/initramfs-tools.8.html).
+
+The initramfs in Tails is customized by [_live-boot_](http://manpages.ubuntu.com/manpages/xenial/man7/live-boot.7.html), which is poorly documented.
+
+### Some notes about the initramfs/live-boot process
+
+This is how the scripts in `/scripts/live-realpremount` are executed:
+
+ initramfs-tools calls mountroot ()
+ /scripts/live line 12 in mountroot ()
+ 9990-main.sh line 124 in Live ()
+ 9990-overlay.sh line 85 in setup_unionfs ()
+
+This is how `/dev/sda1` is mounted:
+
+ 9990-main.sh line 72 in Live ()
+ 9990-misc-helpers.sh` line 268 in find_livefs ()
+ 9990-misc-helpers.sh` line 128 in check_dev ()
+
+`/dev/sda1` is mounted before the scripts in `/scripts/live-realpremount` are executed.
+
+The last stage executed before `/dev/sda1` is mounted is `init-premount`.
+
## Distributing
XXX: impact on mirrors' storage space?
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 38ecf3d..02fed01 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -24,10 +24,14 @@ All times are referenced to Berlin and Paris time.
* 2018-11-05: 10:00: USB Image meeting
+* 2018-11-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
* 2018-11-06, 19:00: [[Contributors meeting|contribute/meetings]]
* 2018-11-20: 10:00: USB Image meeting
+* 2018-12-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
* 2018-12-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2018-12-04: 10:00: USB Image meeting
@@ -36,8 +40,16 @@ All times are referenced to Berlin and Paris time.
## 2019Q1
+* 2019-01-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
+* 2019-01-03, 19:00: [[Contributors meeting|contribute/meetings]]
+
* 2019-01-29: **Release 3.12** (Firefox 60.5, major release)
+* 2019-02-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
+
+* 2019-02-06, 19:00: [[Contributors meeting|contribute/meetings]]
+
* 2019-03-19: **Release 3.13** (Firefox 60.6)
* 2019-05-14: **Release 3.14** (Firefox 60.7)
diff --git a/wiki/src/contribute/design/installation.mdwn b/wiki/src/contribute/design/installation.mdwn
index 2d0cead..5e5bb3f 100644
--- a/wiki/src/contribute/design/installation.mdwn
+++ b/wiki/src/contribute/design/installation.mdwn
@@ -79,14 +79,6 @@ The storage device is partitioned using [GPT](https://en.wikipedia.org/wiki/GUID
* Partitions can be labeled. The [[design/persistence]] setup tools can
easily detect the right partitions without blind tries.
-The system partition (holding Tails) has a size of 2.5 GB, with the
-following estimates:
-
- * Tails ISO: 1GB
- * 3 [[incremental upgrade kits|contribute/design/incremental_upgrades]], 200 MB each: 600MB
- * free space needed to install an incremental upgrade kit: 2 * 200 MB
- = 600 MB
-
The Tails system partition uses a FAT32 filesystem, mainly because it is the
one supported by SYSLINUX we may easily create, in a programmatic manner, from
Windows systems. This choice has consequences that are barely related to the
diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn
index eaa07e1..a2c680a 100644
--- a/wiki/src/contribute/git.mdwn
+++ b/wiki/src/contribute/git.mdwn
@@ -128,11 +128,11 @@ The `stable` branch is intended to contain:
- the state of the code tagged for the last stable release
- fixes for security or important bugs.
-Its purpose is to prepare minor releases.
+Its purpose is to prepare bugfix releases.
#### testing
-The `testing` branch is used to prepare an imminent release: at some
+The `testing` branch is used to prepare an imminent major release: at some
point of the development process, the `devel` branch code is merged
into `testing`, frozen, and endures careful testing and bug-fixing
until this branch is considered good enough to become a stable
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 9465f6b4..40492dc 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -608,7 +608,7 @@ suite should be ready, so it is time to:
- If you cannot rule out that the difference is harmful: let's take
a step back; we might be compromised, so we are in no position to
- release. Halt the release, involve the rest of `tails@`, and then
+ release. Halt the release, involve the rest of <tails@boum.org>, and then
try to re-establish trust in all build machines and infra
involved, etc. Have fun!
@@ -900,10 +900,8 @@ Done with OpenPGP signing
By now you are done with Tails signing key, so please make sure it is
not usable by your system any more.
-<div class="note">
-
-Beware! If your have to plug your OpenPGP smart card or reassemble the
-key again after this point it invalidates <i>everything</i> done for
+**Beware!** If your have to plug your OpenPGP smart card or reassemble the
+key again after this point it invalidates *everything* done for
the [[reproduction of this release|test#reproducibility-final-check]]
so it has to be started from the beginning:
@@ -914,8 +912,6 @@ so it has to be started from the beginning:
So please try to avoid this!
-</div>
-
Upload images
=============
@@ -1078,7 +1074,6 @@ Testing
1. Email <tails@boum.org> and potential contributors (see
`manual_testers.mdwn` in the internal Git repository) that tests
may start:
- - make sure the Trusted Verifier is in the list of recipients
- point them to the up-to-date mirror you've found previously
- make it clear what's the deadline
- make it clear where and how you expect to get feedback
diff --git a/wiki/src/contribute/release_process/tails-installer.mdwn b/wiki/src/contribute/release_process/tails-installer.mdwn
index 50792b7..5a37dda 100644
--- a/wiki/src/contribute/release_process/tails-installer.mdwn
+++ b/wiki/src/contribute/release_process/tails-installer.mdwn
@@ -226,7 +226,8 @@ If you are a member of the Debian pkg-privacy team
Add the remote:
- git remote add debian git@salsa.debian.org:pkg-privacy-team/tails-installer.git
+ git remote | grep -qs -x debian || \
+ git remote add debian git@salsa.debian.org:pkg-privacy-team/tails-installer.git
Then push:
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index 5f975f1..8091820 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -58,19 +58,20 @@ In a directory with many Tails ISO images:
# Reproducibility
-This section can only be done by the RM.
+This section can **not** be done by the RM.
-Clear-sign the hashes of all products using *your personal* OpenPGP
-key:
+1. Download the ISO and all the
+ [IUKs](https://mirrors.wikimedia.org/tails/stable/iuk/) that
+ upgrade to the version you are testing.
+
+2. Clear-sign the hashes of all products using your OpenPGP key:
- ( \
- cd "${ISOS:?}" && \
sha512sum tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso \
- Tails_amd64_*_to_${VERSION:?}.iuk \
- | gpg --clear-sign \
- )
+ | gpg --clear-sign
-and leave the output in this section.
+3. Send the output of the previous command to the _Trusted Reproducer_,
+ whose name is on the
+ [release calendar](https://tails.boum.org/contribute/calendar/).
# Automated test suite
diff --git a/wiki/src/contribute/release_process/test/reproducibility.mdwn b/wiki/src/contribute/release_process/test/reproducibility.mdwn
new file mode 100644
index 0000000..5b7c73e
--- /dev/null
+++ b/wiki/src/contribute/release_process/test/reproducibility.mdwn
@@ -0,0 +1,242 @@
+[[!meta title="Verification of Tails reproducibility"]]
+
+<div class="note">
+
+After accepting to be the <i>Trusted Reproducer</i> you should have been
+instructed to go here immediately and read the "Preparation"
+section. For a planned release you should be doing this weeks before
+the release you are about to reproduce; for emergency releases you
+likely only have days or even hours. If you were not, file a
+ticket about this, since an important part of process must have been
+missed by the RM.
+
+</div>
+
+[[!toc levels=3]]
+
+<a id="preparation"></a>
+
+# Preparation (when accepting to be the Trusted Reproducer)
+
+Use whatever scheduling tool you prefer to make sure you will, on your
+own initiative, return to this document and follow it within 72 hours
+from the start of the manual testing session. In particular, do not
+trust anything said by the RM about this process: we assume their
+system may be compromised and could be used by an adversary to
+mislead you.
+
+# Gather input data
+
+## Inputs from the release process
+
+Look at the "Environment" section at the beginning of [[the release
+process instructions|contribute/release_process]] and set the
+following variables as instructed:
+
+* `ARTIFACTS`
+* `DIST`
+* `ISOS`
+* `RELEASE_BRANCH`
+* `VERSION`
+<!-- * `IUK_CHECKOUT` -->
+<!-- * `PERL5LIB_CHECKOUT` -->
+
+<!-- Now for the only tricky part, setting `IUK_SOURCE_VERSIONS`. It should -->
+<!-- simply list the old Tails versions that will get an automatic upgrade -->
+<!-- to the current release, and should be set correctly by this command -->
+<!-- most of the time: -->
+
+<!-- IUK_SOURCE_VERSIONS="$( -->
+<!-- curl "http://dl.amnesia.boum.org/tails/${DIST:?}/iuk/" \ -->
+<!-- | grep --extended-regexp --only-matching \ -->
+<!-- "Tails_amd64_[^_]+_to_${VERSION:?}.iuk" \ -->
+<!-- | sort -u \ -->
+<!-- | tr '_' ' ' \ -->
+<!-- | cut -d' ' -f3 -->
+<!-- )" -->
+<!-- echo -e "Got these IUK source versions:\n${IUK_SOURCE_VERSIONS}" -->
+
+<!-- Now sanity check the contents of `IUK_SOURCE_VERSIONS`: -->
+
+<!-- * If empty, the RM has probably not uploaded them yet so you may have -->
+<!-- to wait. -->
+<!-- * Make sure each listed version actually has been released! :) -->
+<!-- * [[Figure out the rules for how to set this -->
+<!-- variable|contribute/release_process#prepare-iuk]] and double-check -->
+<!-- that it makes sense! Note that exceptions happen (e.g. there could -->
+<!-- be a bug in some old versions upgrader so we skip it). -->
+<!-- * If the release notes have already been written (generally there is a -->
+<!-- ticket about it) it should list which versions have automatic upgrades. -->
+
+## Inputs from manual testers
+
+A manual tester should have sent you
+clear-signed hashes for all products of this release. Verify that the
+signature is valid and made by one of our usual manual testers, and
+put the hashes (excluding the OpenPGP signature data) into a file
+called `SHA512SUMS.txt`.
+
+## Your inputs
+
+Set these environment variables accordingly:
+
+* `ISOS_CHECKOUT`: path to your Tails ISO history repo checout.
+<!-- * `PACKAGES_FILE="${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso.packages"` -->
+* `PUBLISHED_ARTIFACTS`: some _new_ directory where you can download
+ gigabytes of data to.
+* `SHA512SUMS`: the path of the `SHA512SUMS.txt` file from above.
+* `TAILS_CHECKOUT`: path to your Tails Git repo checkout.
+
+
+## Derived environment variables
+
+ cd "${TAILS_CHECKOUT:?}" && \
+ TAG="$(echo $VERSION | tr '~' '-')" && \
+ TAG_COMMIT="$(git rev-parse --verify ${TAG:?})" && \
+ git fetch && \
+ git checkout "${RELEASE_BRANCH:?}" && \
+ git merge "origin/${RELEASE_BRANCH:?}" && \
+
+# Build your own products
+
+## Build your own ISO image
+
+1. Fetch and verify the Git tag:
+
+ cd "${TAILS_CHECKOUT:?}" && \
+ git fetch origin "${TAG}" && \
+ git tag -v "${TAG}"
+
+ If the last output is a "Good signature" for the expected tag, made by
+ Tails signing key, then we are good.
+ Otherwise, if you see _anything_ else, we're _not_ good; immediately
+ contact the RM and <tails@boum.org>! Proceeding with the rest of the steps
+ are pointless in this case, so await instruction.
+
+2. Build an ISO image:
+
+ cd "${TAILS_CHECKOUT:?}" && \
+ git checkout "${TAG:?}" && \
+ git submodule update --init && \
+ export SOURCE_DATE_EPOCH=$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" '+%s') && \
+ rake build && \
+ mkdir "${ISOS:?}/tails-amd64-${VERSION:?}" && \
+ mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso*" \
+ "${ISOS:?}/tails-amd64-${VERSION:?}/"
+
+<!-- ## Build your own IUKs -->
+
+<!-- 1. Obtain needed old Tails releases: -->
+
+<!-- cd "${ISOS_CHECKOUT:?}" && \ -->
+<!-- git annex sync && \ -->
+<!-- for old_version in ${IUK_SOURCE_VERSIONS:?}; do -->
+<!-- tails_dir="tails-amd64-${old_version}" && \ -->
+<!-- git annex get "${tails_dir}" && \ -->
+<!-- cp --dereference --recursive "${tails_dir}" "${ISOS:?}" -->
+<!-- done -->
+
+<!-- 2. Set your `iuk` and `perl5lib` Git checkouts to the desired state: -->
+
+<!-- PERL5LIB_VERSION="$(awk '/^tails-perl5lib\s/ { print $2 }' "${PACKAGES_FILE:?}")" && \ -->
+<!-- if [ -z "${PERL5LIB_VERSION}" ]; then -->
+<!-- echo 'Failed to determine PERL5LIB_VERSION, aborting' && \ -->
+<!-- false -->
+<!-- fi && \ -->
+<!-- PERL5LIB_CHECKOUT_TAG="debian/${PERL5LIB_VERSION}" && \ -->
+<!-- IUK_VERSION="$(awk '/^tails-iuk\s/ { print $2 }' "${PACKAGES_FILE:?}")" && \ -->
+<!-- if [ -z "${IUK_VERSION}" ]; then -->
+<!-- echo 'Failed to determine IUK_VERSION, aborting' && \ -->
+<!-- false -->
+<!-- fi && \ -->
+<!-- IUK_CHECKOUT_TAG="debian/${IUK_VERSION}" -->
+<!-- cd "${PERL5LIB_CHECKOUT:?}" && \ -->
+<!-- git fetch && \ -->
+<!-- git checkout "${PERL5LIB_CHECKOUT_TAG:?}" && \ -->
+<!-- cd "${IUK_CHECKOUT:?}" && \ -->
+<!-- git fetch && \ -->
+<!-- git checkout "${IUK_CHECKOUT_TAG:?}" -->
+
+<!-- 3. Follow the [[Build the Incremental Upgrade -->
+<!-- Kits|contribute/release_process#prepare-iuk]] instructions. Note that -->
+<!-- the value of `SOURCE_DATE_EPOCH` set above is needed! -->
+
+# Verification
+
+If there is *any* type of mismatch at some point below, let the RM and
+<tails@boum.org> know *immediately*! But still proceed and do everything below,
+potentially reporting multiple different issues.
+
+## Verify that your products match what was tested
+
+ cd "${ISOS:?}" && \
+ sha512sum -c "${SHA512SUMS:?}"
+
+## Wait for the release to be published
+
+In order to get the guarantees we're looking for here,
+the following steps have to be done only after the release has been made public.
+
+## Download published products
+
+ mkdir -p "${PUBLISHED_ARTIFACTS:?}" && \
+ cd "${PUBLISHED_ARTIFACTS:?}" && \
+ mkdir tails-amd64-${VERSION:?} && \
+ cd tails-amd64-${VERSION:?} && \
+ wget http://dl.amnesia.boum.org/tails/${DIST:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso && \
+
+## Verify that your products match what was published
+
+### ISO
+
+ cd "${PUBLISHED_ARTIFACTS:?}" && \
+ sha512sum -c "${SHA512SUMS:?}"
+
+### IDF
+
+Examine the IDF by running:
+
+ curl https://tails.boum.org/install/v1/Tails/amd64/${DIST:?}/latest.yml
+
+and checking that it matches the output of the following command:
+
+ cat <<-EOF
+ sha256: $(sha256sum "${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso" | cut -f 1 -d ' ' | tr -d '\n')
+ size: $(du --bytes "${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso" | cut -f1)
+ url: http://dl.amnesia.boum.org/tails/${DIST:?}/tails-amd64-$VERSION/tails-amd64-$VERSION.iso
+ EOF
+
+Keep this output, you will need it below!
+
+<!-- ### UDFs -->
+
+<!-- Examine each UDF by running: -->
+
+<!-- for old_version in ${IUK_SOURCE_VERSIONS}; do -->
+<!-- url=https://tails.boum.org/upgrade/v1/Tails/${old_version}/amd64/${DIST:?}/upgrades.yml -->
+<!-- ( -->
+<!-- echo "Looking at '${url}':" -->
+<!-- echo -->
+<!-- curl --silent --show-error ${url} -->
+<!-- ) | less -->
+<!-- done -->
+
+<!-- and checking that there are either two `target-files` entries: -->
+
+<!-- * one of `type: full`, i.e. a full upgrade (so it refers to the ISO image) -->
+<!-- and must have the same values as for the IDF (you were asked to save -->
+<!-- the output above), so verify that it matches! -->
+
+<!-- * one of `type: incremental`, i.e. an incremental upgrade (so it refers to a -->
+<!-- IUK) and should match the output of: -->
+
+<!-- for old_version in ${IUK_SOURCE_VERSIONS}; do -->
+<!-- cat <<EOF -->
+<!-- Expected values for https://tails.boum.org/upgrade/v1/Tails/${old_version}/amd64/${DIST:?}/upgrades.yml: -->
+
+<!-- sha256: $(sha256sum "${ISOS:?}/Tails_amd64_${old_version}_to_${VERSION:?}.iuk" | cut -f 1 -d ' ' | tr -d '\n') -->
+<!-- size: $(du --bytes "${ISOS:?}/Tails_amd64_${old_version}_to_${VERSION:?}.iuk" | cut -f1) -->
+<!-- url: http://dl.amnesia.boum.org/tails/${DIST:?}/iuk/Tails_amd64_${old_version}_to_${VERSION:?}.iuk -->
+
+<!-- EOF -->
+<!-- done -->
diff --git a/wiki/src/contribute/release_process/test/reproducibility/verification.mdwn b/wiki/src/contribute/release_process/test/reproducibility/verification.mdwn
deleted file mode 100644
index 82d021e..0000000
--- a/wiki/src/contribute/release_process/test/reproducibility/verification.mdwn
+++ /dev/null
@@ -1,243 +0,0 @@
-[[!meta title="Verification of Tails reproducibility"]]
-
-<div class="note">
-
-After accepting to be the Trusted Verifier you should have been
-instructed to go here immediately and read the "Preparation"
-section. For a planned release you should be doing this weeks before
-the release you are about to reproduce; for emergency releases you
-likely only have days or even hours. If you were not, please file a
-ticket about this, since an important part of process must have been
-missed by the RM.
-
-</div>
-
-[[!toc levels=2]]
-
-<a id="preparation"></a>
-
-# Preparation (when accepting to be the Trusted Verifier)
-
-Use whatever scheduling tool you prefer to make sure you will, on your
-own initiative, return to this document and follow it within 72 hours
-from the start of the manual testing session. In particular, do not
-trust anything said by the RM about this process.
-
-# Inputs
-
-## Inputs from the release process
-
-Look at the "Environment" section at the beginning of [[the release
-process instructions|contribute/release_process]] and set the
-following variables as instructed:
-
-* `ARTIFACTS`
-* `DIST`
-* `ISOS`
-* `IUK_CHECKOUT`
-* `PERL5LIB_CHECKOUT`
-* `RELEASE_BRANCH`
-* `VERSION`
-
-Now for the only tricky part, setting `IUK_SOURCE_VERSIONS`. It should
-simply list the old Tails versions that will get an automatic upgrade
-to the current release, and should be set correctly by this command
-most of the time:
-
- IUK_SOURCE_VERSIONS="$(
- curl "http://dl.amnesia.boum.org/tails/${DIST:?}/iuk/" \
- | grep --extended-regexp --only-matching \
- "Tails_amd64_[^_]+_to_${VERSION:?}.iuk" \
- | sort -u \
- | tr '_' ' ' \
- | cut -d' ' -f3
- )"
- echo -e "Got these IUK source versions:\n${IUK_SOURCE_VERSIONS}"
-
-Now sanity check the contents of `IUK_SOURCE_VERSIONS`:
-
-* If empty, the RM has probably not uploaded them yet so you may have
- to wait.
-* make sure each listed version actually has been released! :)
-* [[Figure out the rules for how to set this
- variable|contribute/release_process/#prepare-iuk]] and double-check
- that it makes sense! Note that exceptions happen (e.g. there could
- be a bug in some old versions upgrader so we skip it).
-* If the release notes have already been written (generally there is a
- ticket about it) it should list which versions
-
-## Inputs from the testing pad
-
-In the "Reproducibility" section of the testing pad you'll find
-clear-signed hashes for all products of this release. Verify the
-signature, and put the hashes (excluding the OpenPGP signature data)
-into a file called `SHA512SUMS.txt`.
-
-## Your inputs
-
-Set these environment variables accordingly:
-
-* `ISOS_CHECKOUT`: path to your Tails ISO history repo checout.
-* `PACKAGES_FILE`: path to the `.packages` file for this release
- (should be attached to the "Testing Tails `$VERSION`" email you have
- in your inbox)
-* `PUBLISHED_ARTIFACTS`: some _new_ directory where you can download
- gigabytes of data to.
-* `SHA512SUMS`: the path of the `SHA512SUMS.txt` file from above.
-* `TAILS_CHECKOUT`: path to your Tails Git repo checkout.
-
-## Derived environment variables
-
- cd "${TAILS_CHECKOUT:?}" && \
- TAG="$(echo $VERSION | tr '~' '-')" && \
- TAG_COMMIT="$(git rev-parse --verify ${TAG:?})" && \
- git fetch && \
- git checkout "${RELEASE_BRANCH:?}" && \
- git merge "origin/${RELEASE_BRANCH:?}" && \
- PERL5LIB_VERSION="$(awk '/^tails-perl5lib\s/ { print $2 }' "${PACKAGES_FILE:?}")" && \
- if [ -z "${PERL5LIB_VERSION}" ]; then
- echo 'Failed to determine PERL5LIB_VERSION, aborting' && \
- false
- fi && \
- PERL5LIB_CHECKOUT_TAG="debian/${PERL5LIB_VERSION}" && \
- IUK_VERSION="$(awk '/^tails-iuk\s/ { print $2 }' "${PACKAGES_FILE:?}")" && \
- if [ -z "${IUK_VERSION}" ]; then
- echo 'Failed to determine IUK_VERSION, aborting' && \
- false
- fi && \
- IUK_CHECKOUT_TAG="debian/${IUK_VERSION}"
-
-# Download published products
-
- mkdir -p "${PUBLISHED_ARTIFACTS:?}" && \
- cd "${PUBLISHED_ARTIFACTS:?}" && \
- mkdir tails-amd64-${VERSION:?} && \
- cd tails-amd64-${VERSION:?} && \
- wget http://dl.amnesia.boum.org/tails/${DIST:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso && \
- cd .. && \
- for old_version in ${IUK_SOURCE_VERSIONS}; do
- wget http://dl.amnesia.boum.org/tails/${DIST:?}/iuk/Tails_amd64_${old_version}_to_${VERSION:?}.iuk
- done
-
-# Obtain needed old Tails releases
-
- cd "${ISOS_CHECKOUT:?}" && \
- git annex sync && \
- for old_version in ${IUK_SOURCE_VERSIONS:?}; do
- tails_dir="tails-amd64-${old_version}" && \
- if [ ! -d "${ISOS:?}/${tails_dir}" ]; then
- git annex get "${tails_dir}" && \
- cp --dereference --recursive "${tails_dir}" "${ISOS:?}"
- fi
- done
-
-# Refresh iuk and perl5lib Git repos
-
- cd "${PERL5LIB_CHECKOUT:?}" && \
- git fetch && \
- git checkout "${PERL5LIB_CHECKOUT_TAG:?}" && \
- cd "${IUK_CHECKOUT:?}" && \
- git fetch && \
- git checkout "${IUK_CHECKOUT_TAG:?}"
-
-# Reproduce Tails
-
-## Fetch and verify the Git tag
-
- cd "${TAILS_CHECKOUT:?}" && \
- git fetch origin "${TAG}" && \
- git tag -v "${TAG}"
-
-* If the last output is a "Good signature" for the expected tag, made by
- Tails signing key, then we are good.
-
-* Otherwise, if you see _anything_ else, we're _not_ good; immediately
- contact the RM and tails@! Proceeding with the rest of the steps
- are pointless in this case, so await instruction.
-
-## Reproduce the image
-
- cd "${TAILS_CHECKOUT:?}" && \
- git checkout "${TAG:?}" && \
- git submodule update --init && \
- export SOURCE_DATE_EPOCH=$(date --utc --date="$(dpkg-parsechangelog --show-field=Date)" '+%s') && \
- rake build && \
- mkdir "${ISOS:?}/tails-amd64-${VERSION:?}" && \
- mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso" \
- "${ISOS:?}/tails-amd64-${VERSION:?}/"
-
-## Reproduce IUKs
-
-Follow the [[Build the Incremental Upgrade
-Kits|contribute/release_process/#prepare-iuk]] instructions. Note that
-the value of `SOURCE_DATE_EPOCH` set above is needed!
-
-# Verification
-
-If there is *any* type of mismatch at some point below, let the RM and
-tails@ know *immediately*! But still proceed and do everything below,
-potentially reporting multiple different issues.
-
-## Verify your products
-
- cd "${ISOS:?}" && \
- sha512sum -c "${SHA512SUMS:?}"
-
-## Verify published products
-
- cd "${PUBLISHED_ARTIFACTS:?}" && \
- sha512sum -c "${SHA512SUMS:?}"
-
-## Verify IDF
-
-This step can only be done after the release is been made public.
-
-Examine the IDF by running:
-
- curl https://tails.boum.org/install/v1/Tails/amd64/${DIST:?}/latest.yml
-
-and checking that it matches the output of the following command:
-
- cat <<-EOF
- sha256: $(sha256sum "${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso" | cut -f 1 -d ' ' | tr -d '\n')
- size: $(du --bytes "${ISOS:?}/tails-amd64-${VERSION:?}/tails-amd64-${VERSION:?}.iso" | cut -f1)
- url: http://dl.amnesia.boum.org/tails/${DIST:?}/tails-amd64-$VERSION/tails-amd64-$VERSION.iso
- EOF
-
-Keep this output, you will need it below!
-
-## Verify UDFs
-
-This step can only be done after the release is been made public.
-
-Examine each UDF by running:
-
- for old_version in ${IUK_SOURCE_VERSIONS}; do
- url=https://tails.boum.org/upgrade/v1/Tails/${old_version}/amd64/${DIST:?}/upgrades.yml
- (
- echo "Looking at '${url}':"
- echo
- curl --silent --show-error ${url}
- ) | less
- done
-
-and checking that there are either one or two `target-files`
-entries:
-
-* `type: full` means a full upgrade (so it refers to the ISO image)
- and must have the same values as for the IDF (you were asked to save
- the output above), so please verify that it matches!
-
-* `type: incremental` means an incremental upgrade (so it refers to a
- IUK) and should match the output of:
-
- for old_version in ${IUK_SOURCE_VERSIONS}; do
- cat <<EOF
- Expected values for https://tails.boum.org/upgrade/v1/Tails/${old_version}/amd64/${DIST:?}/upgrades.yml:
-
- sha256: $(sha256sum "${ISOS:?}/Tails_amd64_${old_version}_to_${VERSION:?}.iuk" | cut -f 1 -d ' ' | tr -d '\n')
- size: $(du --bytes "${ISOS:?}/Tails_amd64_${old_version}_to_${VERSION:?}.iuk" | cut -f1)
- url: http://dl.amnesia.boum.org/tails/${DIST:?}/iuk/Tails_amd64_${old_version}_to_${VERSION:?}.iuk
-
- EOF
- done
diff --git a/wiki/src/contribute/roadmap.mdwn b/wiki/src/contribute/roadmap.mdwn
index f44c60c..5f43a88 100644
--- a/wiki/src/contribute/roadmap.mdwn
+++ b/wiki/src/contribute/roadmap.mdwn
@@ -13,78 +13,77 @@ Priorities for the next years
[[!toc startlevel=3 levels=1]]
+### Easier installation
+
+- **Make it easier to install Tails on Windows and macOS** ([[!tails_ticket 15292]])
+- **Support Secure boot** ([[!tails_ticket 6560]])
+- **Improve our troubleshooting documentation** ([[!tails_ticket 11665]], [[!tails_ticket 11683]], [[!tails_ticket 14788]], [[!tails_ticket 14548]])
+
+### Better upgrades
+
+- **Allow always upgrading automatically** and get rid of manual upgrades ([[!tails_ticket 15281]])
+- **Try resuming automatic upgrades** if interrupted during download ([[!tails_ticket 15875]])
+- **Research lighter and more robust upgrade mechanisms** ([[!tails_ticket 15277]], [[!tails_ticket 15901]])
+
+### Applications and features
+
+- **Mobile messaging applications**: research support for Signal, Wire, Telegram, etc. ([[!tails_ticket 14567]])
+- **Backups**: make it easier to backup the persistent volume ([[!tails_ticket 12214]], [[!tails_ticket 5301]], [[Blueprint|blueprint/backups]])
+- **Redesign the experience of connecting to the network and Tor** ([[!tails_ticket 10491]])
+- **Remove some less popular packages** ([[!tails_ticket 15291]])
+
### Adoption
-- <strike>**Redesign the Download and Verify browser extension** to support *Chrome* and *Web Extensions* in *Firefox* 57 ([[!tails_ticket 12328]], [[Blueprint|blueprint/DAVE_2]])</strike> [DONE]
-- <strike>**Rethink the installation and upgrade process** in depth and reflect on the future of *Tails Installer*, the installation on Windows and macOS, and automatic upgrades ([[!tails_ticket 11679]])</strike> [DONE]
-- **Improve our installation instructions**:
- - Document a graphical installation tool for macOS ([[!tails_ticket 11682]])
- - Have a more robust tool for Windows ([[!tails_ticket 13206]])
- - Act on the expert review done in August 2017 ([[!tails_ticket 14548]])
-- **Give some love to our troubleshooting documentation**:
- - Our [[known issues page|support/known_issues]] ([[!tails_ticket 11665]])
- - Computers with unsupported Wi-Fi devices, very common on Mac ([[!tails_ticket 11683]])
- **Explain better what Tails is** and what makes it so awesome ([[!tails_ticket 9814]])
+- **Have a translation platform** to translate our website and train new translators ([[!tails_ticket 15867]], [[!tails_ticket 10034]])
- **Make Tails work for blind users** ([[!tails_ticket 14522]])
+- **Have a visual style guide** for our website ([[!tails_ticket 15800]])
### Resistance to remote exploitation
-- **Persistent Tor state** to have persistent entry guards ([[!tails_ticket 5462]], [[Blueprint|blueprint/persistent_Tor_state]])
-- **HTTPS only mirrors** to protect downloads in depth from malicious networks ([[!tails_ticket 9796]])
-- **Persistent seed for random number generator** to have stronger crypto ([[!tails_ticket 7675]], [[Blueprint|blueprint/randomness_seeding]])
-- **Have critical parts of Tails audited** ([[!tails_ticket 14508]])
- **Leverage reproducible builds** to detect a compromise in our infrastructure ([[!tails_ticket 14455]])
- **Switch to Wayland** ([[!tails_ticket 12213]])
+- **Research Flatpak (or similar) for sandboxing** ([[!tails_ticket 15874]])
### Community growth, diversity, and inclusion
-- **Create outreach material** ([[!tails_ticket 14523]])
-- **Outreach to under-represented communities** ([[!tails_ticket 14560]])
-- **Recruit new core workers**: <strike>sysadmin</strike>, <strike>technical writer</strike>, and accountant
-- **Lower technical requirements** for new contributors ([[!tails_ticket 14516]])
-
-### Applications and features
-
-- <strike>**Screen locker**: allow users to lock their session with a password ([[!tails_ticket 5684]], [[Blueprint|blueprint/screen_locker]])</strike> [DONE]
-- **Tails Server**: run onion services from Tails (VoIP chat rooms, collaboration tools, web servers, messaging servers, etc.) ([[!tails_ticket 5688]], [[Blueprint|blueprint/tails_server]])
-- <strike>**VeraCrypt support in GNOME**: graphical utilities to mount VeraCrypt volumes ([[!tails_ticket 11684]], [[!tails_ticket 6337]], [[Blueprint|blueprint/veracrypt]])</strike> [DONE]
-- **Graphical interface for the Additional Packages persistent feature**: allow users to customize which applications are available in their Tails ([[!tails_ticket 5996]] [[!tails_ticket 9059]], [[Blueprint|blueprint/additional_software_packages]])
-- **Mobile messaging applications**: investigate if we could support Signal, Wire, Telegram, etc. in Tails ([[!tails_ticket 14504]])
-- **Backups**: provide a graphical tool to backup the persistent volume ([[!tails_ticket 5301]], [[Blueprint|blueprint/backups]])
+- **Recruit new core workers**: help desk and sysadmin
+- **Make it easier to onboard new developers** ([[!tails_ticket 15864]])
+- **Apply to Outreachy and Google Summer of Code** ([[!tails_ticket 15865]])
### Sustainability of core code
-- **Try basing Tails on rolling snapshots of Debian Testing** to bring upstream changes earlier to Tails and collaborate better with upstream ([[!tails_ticket 12615]], [[Blueprint|blueprint/Debian_testing]])
-- **Have a budget for user-visible improvements** to our core applications ([[!tails_ticket 14544]])
+- **Release Tails 4.0 based on Debian Buster**
+- **Solve important usability issues** in our core applications ([[!tails_ticket 14544]])
- **Port complex shell scripts to Python** ([[!tails_ticket 11198]], [[Blueprint|blueprint/Port_shell_scripts_to_Python]])
- **Migrate from `aufs` to `overlayfs`** ([[!tails_ticket 8415]])
- **Have more robust time synchronization** when starting Tails ([[!tails_ticket 5774]], [[Blueprint|blueprint/robust_time_syncing]])
+- **Migrate to *Tor Launcher* based on WebExtension** ([[!tails_ticket 15709]])
+- **Upstream our security improvements to the *Thunderbird* autoconfiguration** ([[!tails_ticket 6156]])
### User research
- **Perform surveys** to learn who our users are and what they need ([[!tails_ticket 14545]], [[Blueprint|blueprint/survey_platform]])
-- **Agree on personas** to describe our target users and take better decisions ([[!tails_ticket 11162]], [[Blueprint|blueprint/personas]])
-- **Power our help desk with a request tracker** to know better how to help our user base at large ([[!tails_ticket 9803]], [[Blueprint|blueprint/RT_for_help_desk]])
+- **Have personas** to describe our target users and take better decisions ([[!tails_ticket 11162]], [[Blueprint|blueprint/personas]])
-### Funding from private partners
+### Diversity of incomes
-- **Strengthen our relationships** with existing partners
-- **Contact proactively** more potential partners
-- <strike>**Document better benefits** for partners</strike>
+- **Increase** the donations that we receive from private partners
+- **Continue increasing** the donations that we receive from individuals
### Infrastructure migrations
- **Update our infrastructure** to:
- - <strike>Debian Stretch</strike> [DONE]
- - Jenkins 2
- - <strike>Redmine 3.3</strike> [DONE]
- - Gitolite 3
- - <strike>Puppet 4</strike> [DONE]
-- **Have a better server infrastructure** to handle our growing needs on continuous integration and have a backup server ([[!tails_ticket 11680]], [[!tails_ticket 15071]])
+ - *Jenkins* 2
+ - *Gitolite* 3
+ - Replace *vmdebootstrap* ([[!tails_ticket 15349]])
+- **Have better backups of our infrastructure** ([[!tails_ticket 15071]])
- **Self-host our website** as boum.org is stopping hosting websites ([[!tails_ticket 14588]])
+- **Switch to GitLab** ([[!tails_ticket 15878]])
### Robust automated tests
-- **Use locally hosted Git repositories** ([[!tails_ticket 11869]])
- **Run our own email server** ([[!tails_ticket 12277]])
- **Notify developers on failure** ([[!tails_ticket 11355]])
+- **Upgrade the dependencies of our automated test suite** to work with Java 9 ([[!tails_ticket 15460]])
+- **Evaluate OpenQA** ([[!tails_ticket 15870]])
diff --git a/wiki/src/contribute/working_together/roles/foundations_team.mdwn b/wiki/src/contribute/working_together/roles/foundations_team.mdwn
index 909902a..4a435ac 100644
--- a/wiki/src/contribute/working_together/roles/foundations_team.mdwn
+++ b/wiki/src/contribute/working_together/roles/foundations_team.mdwn
@@ -1,5 +1,11 @@
[[!meta title="Foundations Team"]]
+[[!toc levels=2]]
+
+<a id="duties"></a>
+
+# Duties
+
The Tails Foundations Team is responsible for:
* maintaining the core Tails system, which includes e.g.
@@ -59,3 +65,23 @@ The Tails Foundations Team is responsible for:
* if time allows, do whatever code task the project sees as
top-priority, such as fixing Holes in the Roof, important bugs, or
implementing a feature that is needed to keep Tails relevant.
+
+<a id="meetings"></a>
+
+# Meetings
+
+Each month the Tails Foundations Team gathers for an online meeting.
+
+- **Date**:
+ - The **3rd** day of the month if it's a day between Monday and
+ Thursday (inclusive)
+ - The **6th** day of the month otherwise
+- **Time**: 16:00 Berlin time (14:00 or 15:00 UTC, depending on the date)
+- **Location**: [[`tails-meeting` XMPP chatroom|contribute/chat]]
+
+As a Foundations Team member, if you cannot make one of these
+meetings, please send the team before the meeting:
+
+ - a brief status update about life, work and tickets;
+ - information about how much more or less work you want for the
+ following month(s).
diff --git a/wiki/src/contribute/working_together/roles/release_manager.mdwn b/wiki/src/contribute/working_together/roles/release_manager.mdwn
index 89701e9..6afd217 100644
--- a/wiki/src/contribute/working_together/roles/release_manager.mdwn
+++ b/wiki/src/contribute/working_together/roles/release_manager.mdwn
@@ -17,13 +17,11 @@ and filing tickets for the Foundations Team as needed.
<tails-l10n@boum.org>.
- Ask the core team and contributors for availability at the
designated dates for testing the RC and final image.
- - XXX: ignore this until [[!tails_ticket 12629]] is resolved.
- Ask `tails@` for a _Trusted Reproducer_ who will reproduce the
+ - Ask <tails@boum.org> for a _Trusted Reproducer_ who will reproduce the
ISOs and IUKs for the RC and final release within 72 hours after
the RM has unplugged their smartcard. When accepting the offer,
the Trusted Reproducer must read the [["Preparation" section of
- the instructions|test/reproducibility/verification/#preparation]].
-
+ the instructions|contribute/release_process/test/reproducibility#preparation]].
- Update [[contribute/calendar]] accordingly.
- Update the due date on [[!tails_roadmap]] accordingly.
- Make sure you have hardware handy:
@@ -50,8 +48,6 @@ and filing tickets for the Foundations Team as needed.
## Two weeks after the beginning of your shift
-XXX: ignore this until [[!tails_ticket 12629]] is resolved.
-
- Ensure you have found a _Trusted Reproducer_ and write who this is
in the [[contribute/calendar]].
diff --git a/wiki/src/doc/first_steps/additional_software.de.po b/wiki/src/doc/first_steps/additional_software.de.po
index 10336be..3fb39e1 100644
--- a/wiki/src/doc/first_steps/additional_software.de.po
+++ b/wiki/src/doc/first_steps/additional_software.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2018-10-16 14:56+0200\n"
"PO-Revision-Date: 2016-02-13 02:46+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -172,7 +172,7 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Software not [[officially included in Tails|about/doc/features]] might have "
+"Software not [[officially included in Tails|doc/about/features]] might have "
"not been tested for security. We also cannot provide support or "
"documentation for it."
msgstr ""
@@ -574,14 +574,22 @@ msgstr ""
#~ "https://www.debian.org/distrib/packages.de.html]] danach suchen."
#~ msgid ""
-#~ "Since Tails is amnesic, any additional software package needs to be reinstalled in each working\n"
-#~ "session. To install the same software packages automatically at the beginning of every working session use the\n"
-#~ "[[<span class=\"guilabel\">Additional software packages</span> persistence feature|doc/first_steps/persistence/configure#additional_software]] instead.\n"
+#~ "Since Tails is amnesic, any additional software package needs to be "
+#~ "reinstalled in each working\n"
+#~ "session. To install the same software packages automatically at the "
+#~ "beginning of every working session use the\n"
+#~ "[[<span class=\"guilabel\">Additional software packages</span> "
+#~ "persistence feature|doc/first_steps/persistence/"
+#~ "configure#additional_software]] instead.\n"
#~ msgstr ""
-#~ "Da Tails vergesslich ist, müssen alle zusätzlichen Softwarepakete in jeder Arbeitssitzung neu installiert\n"
-#~ "werden. Benutzen Sie die dafür die [[Funktion für <span class=\"guilabel\">Zusätzliche Softwarepakete</span> \n"
+#~ "Da Tails vergesslich ist, müssen alle zusätzlichen Softwarepakete in "
+#~ "jeder Arbeitssitzung neu installiert\n"
+#~ "werden. Benutzen Sie die dafür die [[Funktion für <span class=\"guilabel"
+#~ "\">Zusätzliche Softwarepakete</span> \n"
#~ "des beständigen\n"
-#~ "Speicherbereichs|doc/first_steps/persistence/configure#additional_software]], um die gleichen Softwarepakete automatisch zu Beginn von jeder Arbeitssitzung zu installieren.\n"
+#~ "Speicherbereichs|doc/first_steps/persistence/"
+#~ "configure#additional_software]], um die gleichen Softwarepakete "
+#~ "automatisch zu Beginn von jeder Arbeitssitzung zu installieren.\n"
#~ msgid ""
#~ "Open a [[root terminal|doc/first_steps/startup_options/"
@@ -609,7 +617,9 @@ msgstr ""
#~ msgstr " apt install [package]\n"
#~ msgid " For example, to install the package `ikiwiki`, execute:\n"
-#~ msgstr " Zum Beispiel, um das Paket `ikiwiki` zu installieren, führen Se folgendes aus:\n"
+#~ msgstr ""
+#~ " Zum Beispiel, um das Paket `ikiwiki` zu installieren, führen Se "
+#~ "folgendes aus:\n"
#~ msgid " apt install ikiwiki\n"
#~ msgstr " apt install ikiwiki\n"
@@ -618,12 +628,15 @@ msgstr ""
#~ msgstr " <div class=\"note\">\n"
#~ msgid ""
-#~ " <p>You can also write multiple package names to install several packages at the same\n"
+#~ " <p>You can also write multiple package names to install several "
+#~ "packages at the same\n"
#~ " time. If a package has dependencies, those will be installed\n"
#~ " automatically.</p>\n"
#~ msgstr ""
-#~ " <p>Sie können auch mehrere Paketnamen angeben, um mehrere Pakete gleichzeitig zu\n"
-#~ " installieren. Falls ein Paket Abhängigkeiten besitzt, werden diese automatisch\n"
+#~ " <p>Sie können auch mehrere Paketnamen angeben, um mehrere Pakete "
+#~ "gleichzeitig zu\n"
+#~ " installieren. Falls ein Paket Abhängigkeiten besitzt, werden diese "
+#~ "automatisch\n"
#~ " installiert.</p>\n"
#~ msgid " </div>\n"
@@ -655,7 +668,8 @@ msgstr ""
#~ "Packages</span> features.\n"
#~ msgstr ""
#~ "Um diese Funktion zu nutzen, müssen Sie sowohl die Funktionen für <span\n"
-#~ "class=\"guilabel\">APT Listen</span> als auch für <span class=\"guilabel\">APT\n"
+#~ "class=\"guilabel\">APT Listen</span> als auch für <span class=\"guilabel"
+#~ "\">APT\n"
#~ "Pakete</span> aktivieren.\n"
#~ msgid ""
@@ -709,12 +723,18 @@ msgstr ""
#~ msgid ""
#~ "<strong>Installing additional software is at your own risk.</strong>\n"
#~ "Most additional software requires extra configuration to be able to\n"
-#~ "connect to the network through Tor, and will not work otherwise. Some other software might, for\n"
+#~ "connect to the network through Tor, and will not work otherwise. Some "
+#~ "other software might, for\n"
#~ "example, modify the firewall and break the security built in Tails.\n"
#~ "Software not officially included in Tails is not tested for security.\n"
#~ msgstr ""
-#~ "<strong>Die Installation zusätzlicher Software geschieht auf eigene Gefahr.</strong>\n"
-#~ "Die meiste zusätzliche Software benötigt extra Konfigurationen, um in der Lage zu sein,\n"
-#~ "eine Netzwerkverbindung über Tor herzustellen und wird sonst nicht funktionieren. Manch andere Software könnte\n"
-#~ "beispielsweise die Firewall verändern und die in Tails implementierte Sicherheit zerstören.\n"
-#~ "Software, die nicht in Tails enthalten ist, wurde nicht im Bezug auf Sicherheit getestet.\n"
+#~ "<strong>Die Installation zusätzlicher Software geschieht auf eigene "
+#~ "Gefahr.</strong>\n"
+#~ "Die meiste zusätzliche Software benötigt extra Konfigurationen, um in der "
+#~ "Lage zu sein,\n"
+#~ "eine Netzwerkverbindung über Tor herzustellen und wird sonst nicht "
+#~ "funktionieren. Manch andere Software könnte\n"
+#~ "beispielsweise die Firewall verändern und die in Tails implementierte "
+#~ "Sicherheit zerstören.\n"
+#~ "Software, die nicht in Tails enthalten ist, wurde nicht im Bezug auf "
+#~ "Sicherheit getestet.\n"
diff --git a/wiki/src/doc/first_steps/additional_software.es.po b/wiki/src/doc/first_steps/additional_software.es.po
index 6132a2a..d2644d6 100644
--- a/wiki/src/doc/first_steps/additional_software.es.po
+++ b/wiki/src/doc/first_steps/additional_software.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2018-10-16 14:56+0200\n"
"PO-Revision-Date: 2018-04-17 02:06+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -174,7 +174,7 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Software not [[officially included in Tails|about/doc/features]] might have "
+"Software not [[officially included in Tails|doc/about/features]] might have "
"not been tested for security. We also cannot provide support or "
"documentation for it."
msgstr ""
@@ -611,10 +611,19 @@ msgstr "Reinicia Tails para aplicar los cambios."
#~ "distrib/packages]]."
#~ msgid ""
-#~ "Since Tails is amnesic, any additional software package needs to be reinstalled in each working\n"
-#~ "session. To install the same software packages automatically at the beginning of every working session use the\n"
-#~ "[[<span class=\"guilabel\">Additional software packages</span> persistence feature|doc/first_steps/persistence/configure#additional_software]] instead.\n"
-#~ msgstr "Como Tails es amnésico, los paquetes de software adicionales necesitan ser reinstalados en cada sesión. Para instalar los mismos paquetes automáticamente cuando arrancas Tails, mejor usa la [[funcionalidad persistente <span class=\"guilabel\">Additional software packages</span> |doc/first_steps/persistence/configure#additional_software]].\n"
+#~ "Since Tails is amnesic, any additional software package needs to be "
+#~ "reinstalled in each working\n"
+#~ "session. To install the same software packages automatically at the "
+#~ "beginning of every working session use the\n"
+#~ "[[<span class=\"guilabel\">Additional software packages</span> "
+#~ "persistence feature|doc/first_steps/persistence/"
+#~ "configure#additional_software]] instead.\n"
+#~ msgstr ""
+#~ "Como Tails es amnésico, los paquetes de software adicionales necesitan "
+#~ "ser reinstalados en cada sesión. Para instalar los mismos paquetes "
+#~ "automáticamente cuando arrancas Tails, mejor usa la [[funcionalidad "
+#~ "persistente <span class=\"guilabel\">Additional software packages</span> |"
+#~ "doc/first_steps/persistence/configure#additional_software]].\n"
#~ msgid ""
#~ "Open a [[root terminal|doc/first_steps/startup_options/"
@@ -650,11 +659,13 @@ msgstr "Reinicia Tails para aplicar los cambios."
#~ msgstr " <div class=\"note\">\n"
#~ msgid ""
-#~ " <p>You can also write multiple package names to install several packages at the same\n"
+#~ " <p>You can also write multiple package names to install several "
+#~ "packages at the same\n"
#~ " time. If a package has dependencies, those will be installed\n"
#~ " automatically.</p>\n"
#~ msgstr ""
-#~ " <p>También puedes escribir varios nombres de paquetes para instalarlos al mismo tiempo.\n"
+#~ " <p>También puedes escribir varios nombres de paquetes para instalarlos "
+#~ "al mismo tiempo.\n"
#~ " Si un paquete tiene dependencias, estas serán instaladas\n"
#~ " automáticamente.</p>\n"
diff --git a/wiki/src/doc/first_steps/additional_software.fa.po b/wiki/src/doc/first_steps/additional_software.fa.po
index b8ef793..2c4ec54 100644
--- a/wiki/src/doc/first_steps/additional_software.fa.po
+++ b/wiki/src/doc/first_steps/additional_software.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2018-10-16 14:56+0200\n"
"PO-Revision-Date: 2015-10-14 19:35+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -174,7 +174,7 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Software not [[officially included in Tails|about/doc/features]] might have "
+"Software not [[officially included in Tails|doc/about/features]] might have "
"not been tested for security. We also cannot provide support or "
"documentation for it."
msgstr ""
@@ -575,12 +575,19 @@ msgstr ""
#~ "debian.org/distrib/packages]] دنبال آن بگردید."
#~ msgid ""
-#~ "Since Tails is amnesic, any additional software package needs to be reinstalled in each working\n"
-#~ "session. To install the same software packages automatically at the beginning of every working session use the\n"
-#~ "[[<span class=\"guilabel\">Additional software packages</span> persistence feature|doc/first_steps/persistence/configure#additional_software]] instead.\n"
+#~ "Since Tails is amnesic, any additional software package needs to be "
+#~ "reinstalled in each working\n"
+#~ "session. To install the same software packages automatically at the "
+#~ "beginning of every working session use the\n"
+#~ "[[<span class=\"guilabel\">Additional software packages</span> "
+#~ "persistence feature|doc/first_steps/persistence/"
+#~ "configure#additional_software]] instead.\n"
#~ msgstr ""
-#~ "از آن‌جا که تیلز ابزار فراموشی است، هر بستهٔ نرم‌افزاری بیشتری باید در هر نشست کاری دوباره نصب شود.\n"
-#~ "برای نصب خودکار همان بسته‌های نرم‌افزاری در آغاز هر نشست کاری از [[ویژگی مانای <span class=\"guilabel\">بسته‌های نرم‌افزاری اضافی</span> |doc/first_steps/persistence/configure#additional_software]] استفاده کنید.\n"
+#~ "از آن‌جا که تیلز ابزار فراموشی است، هر بستهٔ نرم‌افزاری بیشتری باید در هر "
+#~ "نشست کاری دوباره نصب شود.\n"
+#~ "برای نصب خودکار همان بسته‌های نرم‌افزاری در آغاز هر نشست کاری از [[ویژگی "
+#~ "مانای <span class=\"guilabel\">بسته‌های نرم‌افزاری اضافی</span> |doc/"
+#~ "first_steps/persistence/configure#additional_software]] استفاده کنید.\n"
#~ msgid ""
#~ "Open a [[root terminal|doc/first_steps/startup_options/"
@@ -605,7 +612,8 @@ msgstr ""
#~ msgstr " apt install [package]\n"
#~ msgid " For example, to install the package `ikiwiki`, execute:\n"
-#~ msgstr " برای نمونه برای نصب کردن بستهٔ `ikiwiki` این فرمان را اجرا کنید:\n"
+#~ msgstr ""
+#~ " برای نمونه برای نصب کردن بستهٔ `ikiwiki` این فرمان را اجرا کنید:\n"
#~ msgid " apt install ikiwiki\n"
#~ msgstr " apt install ikiwiki\n"
@@ -615,11 +623,13 @@ msgstr ""
#~ msgstr " <div class=\"note\">\n"
#~ msgid ""
-#~ " <p>You can also write multiple package names to install several packages at the same\n"
+#~ " <p>You can also write multiple package names to install several "
+#~ "packages at the same\n"
#~ " time. If a package has dependencies, those will be installed\n"
#~ " automatically.</p>\n"
#~ msgstr ""
-#~ " <p>همچنین می‌توانید نام چندین بستهٔ را بنویسید تا چندین بسته را هم‌زمان نصب کنید\n"
+#~ " <p>همچنین می‌توانید نام چندین بستهٔ را بنویسید تا چندین بسته را هم‌زمان "
+#~ "نصب کنید\n"
#~ " اگر یک بسته زیرشاخه‌هایی دارد آن‌‌ها نیز به طور خودکار\n"
#~ " نصب می‌شوند.</p>\n"
@@ -700,12 +710,16 @@ msgstr ""
#~ msgid ""
#~ "<strong>Installing additional software is at your own risk.</strong>\n"
#~ "Most additional software requires extra configuration to be able to\n"
-#~ "connect to the network through Tor, and will not work otherwise. Some other software might, for\n"
+#~ "connect to the network through Tor, and will not work otherwise. Some "
+#~ "other software might, for\n"
#~ "example, modify the firewall and break the security built in Tails.\n"
#~ "Software not officially included in Tails is not tested for security.\n"
#~ msgstr ""
#~ "<strong>مسئولیت نصب نرم‌افزار اضافی با خودتان است.</strong>\n"
#~ "بیشتر نرم‌افزارهای اضافی نیازمند برای اتصال به شبکه از طریق تور نیازمند\n"
-#~ "تنظیمات بیشتر هستند و در غیر این صورت کار نخواهند کرد. بعضی نرم‌افزارهای دیگر\n"
-#~ "ممکن است برای نمونه دیوار آتش را دستکاری کرده و امنیت موجود در تیلز را تضعیف کنند.\n"
-#~ "نرم‌افزارهایی که به طور رسمی در تیلز گنجانده نشده‌اند از نظر امنیتی بررسی نشده‌اند.\n"
+#~ "تنظیمات بیشتر هستند و در غیر این صورت کار نخواهند کرد. بعضی نرم‌افزارهای "
+#~ "دیگر\n"
+#~ "ممکن است برای نمونه دیوار آتش را دستکاری کرده و امنیت موجود در تیلز را "
+#~ "تضعیف کنند.\n"
+#~ "نرم‌افزارهایی که به طور رسمی در تیلز گنجانده نشده‌اند از نظر امنیتی بررسی "
+#~ "نشده‌اند.\n"
diff --git a/wiki/src/doc/first_steps/additional_software.fr.po b/wiki/src/doc/first_steps/additional_software.fr.po
index 8c90d82..4479368 100644
--- a/wiki/src/doc/first_steps/additional_software.fr.po
+++ b/wiki/src/doc/first_steps/additional_software.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2018-10-16 14:56+0200\n"
"PO-Revision-Date: 2016-09-05 12:27-0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -172,7 +172,7 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Software not [[officially included in Tails|about/doc/features]] might have "
+"Software not [[officially included in Tails|doc/about/features]] might have "
"not been tested for security. We also cannot provide support or "
"documentation for it."
msgstr ""
@@ -609,13 +609,21 @@ msgstr "Redémarrez Tails pour appliquer les changements."
#~ "https://www.debian.org/distrib/packages.fr.html]]."
#~ msgid ""
-#~ "Since Tails is amnesic, any additional software package needs to be reinstalled in each working\n"
-#~ "session. To install the same software packages automatically at the beginning of every working session use the\n"
-#~ "[[<span class=\"guilabel\">Additional software packages</span> persistence feature|doc/first_steps/persistence/configure#additional_software]] instead.\n"
+#~ "Since Tails is amnesic, any additional software package needs to be "
+#~ "reinstalled in each working\n"
+#~ "session. To install the same software packages automatically at the "
+#~ "beginning of every working session use the\n"
+#~ "[[<span class=\"guilabel\">Additional software packages</span> "
+#~ "persistence feature|doc/first_steps/persistence/"
+#~ "configure#additional_software]] instead.\n"
#~ msgstr ""
-#~ "Tails est amnésique. En conséquence, un logiciel additionnel doit être réinstallé après chaque redémarrage.\n"
-#~ "Pour réinstaller automatiquement un logiciel à chaque démarrage de Tails, vous devez utiliser\n"
-#~ "l'[[option de persistance <span class=\"guilabel\">Logiciels additionnels</span>|doc/first_steps/persistence/configure#additional_software]].\n"
+#~ "Tails est amnésique. En conséquence, un logiciel additionnel doit être "
+#~ "réinstallé après chaque redémarrage.\n"
+#~ "Pour réinstaller automatiquement un logiciel à chaque démarrage de Tails, "
+#~ "vous devez utiliser\n"
+#~ "l'[[option de persistance <span class=\"guilabel\">Logiciels "
+#~ "additionnels</span>|doc/first_steps/persistence/"
+#~ "configure#additional_software]].\n"
#~ msgid ""
#~ "Open a [[root terminal|doc/first_steps/startup_options/"
@@ -642,7 +650,9 @@ msgstr "Redémarrez Tails pour appliquer les changements."
#~ msgstr " apt install [paquet]\n"
#~ msgid " For example, to install the package `ikiwiki`, execute:\n"
-#~ msgstr " Par exemple, pour installer le paquet `ikiwiki`, exécutez la commande suivante:\n"
+#~ msgstr ""
+#~ " Par exemple, pour installer le paquet `ikiwiki`, exécutez la commande "
+#~ "suivante:\n"
#~ msgid " apt install ikiwiki\n"
#~ msgstr " apt install ikiwiki\n"
@@ -651,12 +661,15 @@ msgstr "Redémarrez Tails pour appliquer les changements."
#~ msgstr " <div class=\"note\">\n"
#~ msgid ""
-#~ " <p>You can also write multiple package names to install several packages at the same\n"
+#~ " <p>You can also write multiple package names to install several "
+#~ "packages at the same\n"
#~ " time. If a package has dependencies, those will be installed\n"
#~ " automatically.</p>\n"
#~ msgstr ""
-#~ " <p>Vous pouvez également écrire le nom de plusieurs paquets, pour installer plusieurs\n"
-#~ " paquets en même temps. Si un paquet a des dépendances, elles seront automatiquement\n"
+#~ " <p>Vous pouvez également écrire le nom de plusieurs paquets, pour "
+#~ "installer plusieurs\n"
+#~ " paquets en même temps. Si un paquet a des dépendances, elles seront "
+#~ "automatiquement\n"
#~ " installées.</p>\n"
#~ msgid " </div>\n"
@@ -689,7 +702,8 @@ msgstr "Redémarrez Tails pour appliquer les changements."
#~ "Packages</span> features.\n"
#~ msgstr ""
#~ "Pour utiliser cette option, vous devez activer la persistance des <span\n"
-#~ "class=\"guilabel\">Listes d'APT</span> et des <span class=\"guilabel\">Paquets APT</span>.\n"
+#~ "class=\"guilabel\">Listes d'APT</span> et des <span class=\"guilabel"
+#~ "\">Paquets APT</span>.\n"
#~ msgid ""
#~ "If you are offline and your additional software packages don't install, "
@@ -741,12 +755,18 @@ msgstr "Redémarrez Tails pour appliquer les changements."
#~ msgid ""
#~ "<strong>Installing additional software is at your own risk.</strong>\n"
#~ "Most additional software requires extra configuration to be able to\n"
-#~ "connect to the network through Tor, and will not work otherwise. Some other software might, for\n"
+#~ "connect to the network through Tor, and will not work otherwise. Some "
+#~ "other software might, for\n"
#~ "example, modify the firewall and break the security built in Tails.\n"
#~ "Software not officially included in Tails is not tested for security.\n"
#~ msgstr ""
-#~ "<strong>L'installation de logiciels additionnels est à vos risques et périls.</strong>\n"
-#~ "La plupart des logiciels additionnels requièrent une configuration supplémentaire pour\n"
-#~ "pouvoir se connecter en passant par Tor, et ne marcheront pas sans cela. D'autres logiciels pourraient,\n"
-#~ "par exemple, modifier le pare-feu et briser la sécurité construite au sein de Tails.\n"
-#~ "La sécurité des logiciels non officiellement inclus dans Tails n'est pas testée.\n"
+#~ "<strong>L'installation de logiciels additionnels est à vos risques et "
+#~ "périls.</strong>\n"
+#~ "La plupart des logiciels additionnels requièrent une configuration "
+#~ "supplémentaire pour\n"
+#~ "pouvoir se connecter en passant par Tor, et ne marcheront pas sans cela. "
+#~ "D'autres logiciels pourraient,\n"
+#~ "par exemple, modifier le pare-feu et briser la sécurité construite au "
+#~ "sein de Tails.\n"
+#~ "La sécurité des logiciels non officiellement inclus dans Tails n'est pas "
+#~ "testée.\n"
diff --git a/wiki/src/doc/first_steps/additional_software.it.po b/wiki/src/doc/first_steps/additional_software.it.po
index d64522d..dc9e0ff 100644
--- a/wiki/src/doc/first_steps/additional_software.it.po
+++ b/wiki/src/doc/first_steps/additional_software.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2018-10-16 14:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -152,7 +152,7 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Software not [[officially included in Tails|about/doc/features]] might have "
+"Software not [[officially included in Tails|doc/about/features]] might have "
"not been tested for security. We also cannot provide support or "
"documentation for it."
msgstr ""
@@ -612,12 +612,18 @@ msgstr ""
#~ msgid ""
#~ "<strong>Installing additional software is at your own risk.</strong>\n"
#~ "Most additional software requires extra configuration to be able to\n"
-#~ "connect to the network through Tor, and will not work otherwise. Some other software might, for\n"
+#~ "connect to the network through Tor, and will not work otherwise. Some "
+#~ "other software might, for\n"
#~ "example, modify the firewall and break the security built in Tails.\n"
#~ "Software not officially included in Tails is not tested for security.\n"
#~ msgstr ""
-#~ "<strong>L'installazione di software aggiuntivo è a tuo rischio e pericolo.</strong>\n"
-#~ "La maggior parte del software aggiuntivo necessita di configurazioni aggiuntive per\n"
-#~ "connettersi alla rete attraverso Tor, altrimenti non funziona. Altri software potrebbero,\n"
-#~ "per esempio, modificare le regole del firewall e danneggiare la sicurezza di Tails.\n"
-#~ "Il software non ufficialmente incluso in Tails non è testato per la sicurezza.\n"
+#~ "<strong>L'installazione di software aggiuntivo è a tuo rischio e pericolo."
+#~ "</strong>\n"
+#~ "La maggior parte del software aggiuntivo necessita di configurazioni "
+#~ "aggiuntive per\n"
+#~ "connettersi alla rete attraverso Tor, altrimenti non funziona. Altri "
+#~ "software potrebbero,\n"
+#~ "per esempio, modificare le regole del firewall e danneggiare la sicurezza "
+#~ "di Tails.\n"
+#~ "Il software non ufficialmente incluso in Tails non è testato per la "
+#~ "sicurezza.\n"
diff --git a/wiki/src/doc/first_steps/additional_software.mdwn b/wiki/src/doc/first_steps/additional_software.mdwn
index e4aad8f..c02e0c5 100644
--- a/wiki/src/doc/first_steps/additional_software.mdwn
+++ b/wiki/src/doc/first_steps/additional_software.mdwn
@@ -62,7 +62,7 @@ If you are unsure:
- Some software might, for example, modify the firewall and break the security
built in Tails. But other software like games or office tools are probably fine.
-- Software not [[officially included in Tails|about/doc/features]] might have not been tested for security.
+- Software not [[officially included in Tails|doc/about/features]] might have not been tested for security.
We also cannot provide support or documentation for it.
- Only applications that are packaged for Debian can be installed and they are
diff --git a/wiki/src/doc/first_steps/additional_software.pt.po b/wiki/src/doc/first_steps/additional_software.pt.po
index e7691c2..f4987ee 100644
--- a/wiki/src/doc/first_steps/additional_software.pt.po
+++ b/wiki/src/doc/first_steps/additional_software.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-08-16 18:12+0200\n"
+"POT-Creation-Date: 2018-10-16 14:56+0200\n"
"PO-Revision-Date: 2018-02-21 08:31+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
@@ -155,7 +155,7 @@ msgstr ""
#. type: Bullet: '- '
msgid ""
-"Software not [[officially included in Tails|about/doc/features]] might have "
+"Software not [[officially included in Tails|doc/about/features]] might have "
"not been tested for security. We also cannot provide support or "
"documentation for it."
msgstr ""
@@ -556,8 +556,10 @@ msgstr ""
#~ "class=\"guilabel\">APT Lists</span> and <span class=\"guilabel\">APT\n"
#~ "Packages</span> features.\n"
#~ msgstr ""
-#~ "Para usar esta funcionalidade, você precisa habilitar ambas as funcionalidades\n"
-#~ "<span class=\"guilabel\">Listas APT</span> e <span class=\"guilabel\">Pacotes\n"
+#~ "Para usar esta funcionalidade, você precisa habilitar ambas as "
+#~ "funcionalidades\n"
+#~ "<span class=\"guilabel\">Listas APT</span> e <span class=\"guilabel"
+#~ "\">Pacotes\n"
#~ "APT</span>.\n"
#~ msgid ""
@@ -609,12 +611,17 @@ msgstr ""
#~ msgid ""
#~ "<strong>Installing additional software is at your own risk.</strong>\n"
#~ "Most additional software requires extra configuration to be able to\n"
-#~ "connect to the network through Tor, and will not work otherwise. Some other software might, for\n"
+#~ "connect to the network through Tor, and will not work otherwise. Some "
+#~ "other software might, for\n"
#~ "example, modify the firewall and break the security built in Tails.\n"
#~ "Software not officially included in Tails is not tested for security.\n"
#~ msgstr ""
-#~ "<strong>A instalação de programas adicionais é por sua própria conta e risco.</strong>\n"
-#~ "A maioria dos programas adicionais requer configurações adicionais para poder conectar\n"
-#~ "à rede através do Tor , e não vão funcionar sem estas configurações. Alguns outros programas podem,\n"
+#~ "<strong>A instalação de programas adicionais é por sua própria conta e "
+#~ "risco.</strong>\n"
+#~ "A maioria dos programas adicionais requer configurações adicionais para "
+#~ "poder conectar\n"
+#~ "à rede através do Tor , e não vão funcionar sem estas configurações. "
+#~ "Alguns outros programas podem,\n"
#~ "por exemplo, modificar o firewall e quebrar a segurança do Tails.\n"
-#~ "Programas não incluídos oficialmente no Tails não tiveram sua segurança testada.\n"
+#~ "Programas não incluídos oficialmente no Tails não tiveram sua segurança "
+#~ "testada.\n"
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.de.po b/wiki/src/doc/first_steps/startup_options/administration_password.de.po
index 334c8c4..68e3b90 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.de.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.de.po
@@ -40,7 +40,7 @@ msgstr ""
msgid ""
"To [[install additional software|doc/first_steps/additional_software]]"
msgstr ""
-"Zum [[Installieren zusätzlicher Software|doc/advanced_topics/"
+"Zum [[Installieren zusätzlicher Software|doc/first_steps/"
"additional_software]]"
#. type: Bullet: ' - '
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.fr.po b/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
index 068d821..33b7f95 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.fr.po
@@ -35,7 +35,7 @@ msgstr ""
msgid ""
"To [[install additional software|doc/first_steps/additional_software]]"
msgstr ""
-"Pour [[installer des logiciels additionnels|doc/advanced_topics/"
+"Pour [[installer des logiciels additionnels|doc/first_steps/"
"additional_software]]"
#. type: Bullet: ' - '
diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.it.po b/wiki/src/doc/first_steps/startup_options/administration_password.it.po
index 3932762..6da3207 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.it.po
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.it.po
@@ -35,7 +35,7 @@ msgstr ""
msgid ""
"To [[install additional software|doc/first_steps/additional_software]]"
msgstr ""
-"Per [[installare software aggiuntivo|doc/advanced_topics/"
+"Per [[installare software aggiuntivo|doc/first_steps/"
"additional_software]]"
#. type: Bullet: ' - '
diff --git a/wiki/src/donate.de.po b/wiki/src/donate.de.po
index 94e5abc..b2a3cca 100644
--- a/wiki/src/donate.de.po
+++ b/wiki/src/donate.de.po
@@ -59,7 +59,7 @@ msgid ""
"<b>Domestic violence survivors</b> use Tails to escape surveillance in their "
"home."
msgstr ""
-"<b>Überlebende von häuslicher Gewalt</b> benutzen Tails, ums der Überwachung "
+"<b>Überlebende von häuslicher Gewalt</b> benutzen Tails, um der Überwachung "
"im eigenen Zuhause zu entkommen."
#. type: Content of: <div><div><ul><li>
@@ -84,7 +84,7 @@ msgid ""
msgstr ""
"<b>Allerdings können nicht alle spenden, die Tails benutzen.</b> Falls du es "
"tust, dann bietest du vielen anderen, die es vielleicht dringend brauchen, "
-"Tails als Wertvolles Werkzeug an."
+"Tails als wertvolles Werkzeug an."
#. type: Content of: <div><div><p>
msgid ""
@@ -94,7 +94,7 @@ msgid ""
msgstr ""
"Wir wissen, dass sichere Werkzeuge freie Software sein müssen, damit sie "
"vertrauenswürdig sein können. Das ist der Grund, warum wir Tails umsonst "
-"bereitstellen und um deine Hilfe bitten, um es am Leben zu halten."
+"bereitstellen und um deine Hilfe bitten, es am Leben zu erhalten."
#. type: Content of: <div><div><p>
msgid ""
diff --git a/wiki/src/donate.es.po b/wiki/src/donate.es.po
index ed12e46..808a6af 100755
--- a/wiki/src/donate.es.po
+++ b/wiki/src/donate.es.po
@@ -2,12 +2,13 @@
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Joaquín Serna <bubuanabelas@cryptolab.net>, 2018
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-10-13 01:26+0000\n"
-"PO-Revision-Date: 2018-05-13 21:39+0000\n"
+"PO-Revision-Date: 2018-10-16 03:56+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"
@@ -38,41 +39,54 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid "Tails is used more than 20&#8239;000 times every day:"
-msgstr ""
+msgstr "Tails es usado más de 20&#8239;000 veces por día:"
#. type: Content of: <div><div><ul><li>
msgid ""
"<b>Journalists and whistleblowers</b> use Tails to denounce the wrongdoings "
"of governments and corporations."
msgstr ""
+"<b>Periodistas e informantes</b> usan Tails para denunciar los delitos de "
+"gobiernos y corporaciones."
#. type: Content of: <div><div><ul><li>
msgid ""
"<b>Human-rights defenders</b> use Tails to avoid censorship and report human-"
"rights violations."
msgstr ""
+"<b>Defensores de los derechos humanos</b> usan Tails para evadir la censura "
+"y reportar violaciones a los derechos humanos."
#. type: Content of: <div><div><ul><li>
msgid ""
"<b>Domestic violence survivors</b> use Tails to escape surveillance in their "
"home."
msgstr ""
+"<b>Sobrevivientes de violencia domestica</b> usan Tails para escapar de la "
+"vigilancia en sus hogares."
#. type: Content of: <div><div><ul><li>
msgid "<b>Privacy-concerned citizens</b> use Tails to avoid online tracking."
-msgstr ""
+msgstr "<b>Ciudadanos preocupados por su privacidad</b> usan Tails para "
+"evadir el rastreo en linea."
#. type: Content of: <div><div><p>
msgid ""
-"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
+"<b>If everyone using Tails donated 5€, our fundraiser would be done in one "
"day.</b> The price of a USB stick is all we need."
msgstr ""
+"<b>Si cada persona que usa Tails donaran $6, nuestra campaña de donación se "
+"acabaría en un solo día.</b> Todo lo que pedimos es el precio de una "
+"memoria USB."
#. type: Content of: <div><div><p>
msgid ""
"<b>But not everyone using Tails can donate.</b> When you do, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""
+"<b>Pero no todos los que usan Tails pueden donar.</b> Cuando lo haces, estás "
+"haciendo llegar la preciosa herramienta que es Tails a otras personas que lo "
+"necesitan."
#. type: Content of: <div><div><p>
msgid ""
@@ -80,12 +94,11 @@ msgid ""
"why we are giving out Tails for free but asking for your help to protect and "
"sustain it."
msgstr ""
+"Sabes que las herramientas de seguridad deben ser software libre para ser "
+"confiable. Es por eso que Tails es gratuito pero te pedimos ayuda para "
+"protegerlo y mantenerlo"
#. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Donations from individuals, like you, are our most valuable funding as "
-#| "they make Tails more independent from government and corporate funding."
msgid ""
"Donations from individuals, like you, are our most valuable funding as they "
"make Tails more independent from government and corporate funding. We are a "
@@ -94,12 +107,11 @@ msgid ""
msgstr ""
"Las donaciones individuales, como la tuya, son nuestra fuente de "
"financiación más valiosa, ya que hacen Tails más independiente de la "
-"financiación de gobiernos o empresas."
+"financiación de gobiernos o empresas. Somos una organización muy pequeña sin "
+"fines de lucro y nuestro presupuesto anual es ridículamente pequeño "
+"comparado con el valor de Tails."
#. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid ""
-#| "This year, please consider making a donation to protect and sustain Tails."
msgid "Please consider making a donation to protect and sustain Tails."
msgstr ""
"Este año por favor considera hacer una donación para proteger y mantener "
@@ -170,7 +182,7 @@ msgid ""
"<input type=\"radio\" autocomplete=\"off\" checked/> Yearly </label>"
msgstr ""
"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
+"\" autocomplete=\"off\"/> Única vez </label> <label class=\"btn btn-lg btn-"
"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
"> Mensual </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
"<input type=\"radio\" autocomplete=\"off\" checked/> Anual </label>"
@@ -207,7 +219,7 @@ msgstr ""
"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Otro Importe</"
+"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Otro</"
"span>"
#. type: Content of: <div><div><div><form><div><label><div>
@@ -297,16 +309,12 @@ msgstr ""
"impuestos por la ley</strong>"
#. type: Content of: <div><div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Your donation goes entirely to Tails and will be handled by "
-#| "Zwiebelfreunde which is a non-profit organization in Germany."
msgid ""
"Your donation goes entirely to Tails and will be handled by CCT which is a "
"non-profit organization in Germany."
msgstr ""
-"Tu donación llegará a Tails en su totalidad y será gestionada por "
-"Zwiebelfreunde que es una organización sin fines de lucro de Alemania."
+"Tu donación llegará a Tails en su totalidad y será gestionada por CCT que es "
+"una organización sin fines de lucro de Alemania."
#. type: Content of: <div><div><div><div><h2>
msgid "Donate in dollars"
@@ -454,31 +462,30 @@ msgstr "<strong>1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</strong>"
msgid ""
"<a href=\"bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK\">[[!img "
"bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link=\"no\"]]</a>"
-msgstr ""
+msgstr "<a href=\"bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK\">[[!img "
+"bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link=\"no\"]]</a>"
#. type: Content of: <div><div><div><div><p>
msgid "<strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong>"
-msgstr ""
+msgstr "<strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong>"
#. type: Content of: <div><div><div><h4>
msgid "US check"
-msgstr ""
+msgstr "Cheque de Estados Unidos"
#. type: Content of: <div><div><div><p>
msgid "Riseup Labs"
-msgstr ""
+msgstr "Riseup Labs"
#. type: Content of: <div><div><div><p>
msgid "PO Box 4282"
-msgstr ""
+msgstr "PO Box 4282"
#. type: Content of: <div><div><div><p>
msgid "Seattle, WA 98194"
-msgstr ""
+msgstr "Seattle, WA 98194"
#. type: Content of: <div><div><h4>
-#, fuzzy
-#| msgid "Bank Transfer"
msgid "Bank transfer"
msgstr "Transferencia bancaria"
diff --git a/wiki/src/donate.fr.po b/wiki/src/donate.fr.po
index 1fdda58..9d6bac9 100644
--- a/wiki/src/donate.fr.po
+++ b/wiki/src/donate.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-10-13 01:26+0000\n"
-"PO-Revision-Date: 2018-04-01 11:37+0000\n"
+"PO-Revision-Date: 2018-10-15 08:22+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
@@ -36,41 +36,55 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid "Tails is used more than 20&#8239;000 times every day:"
-msgstr ""
+msgstr "Tails est utilisé plus de 20&#8239;000 fois chaque jour :"
#. type: Content of: <div><div><ul><li>
msgid ""
"<b>Journalists and whistleblowers</b> use Tails to denounce the wrongdoings "
"of governments and corporations."
msgstr ""
+"<b>Journalistes, lanceurs et lanceuses d'alerte</b> utilisent Tails pour "
+"dénoncer les actes répréhensibles des gouvernements et entreprises."
#. type: Content of: <div><div><ul><li>
msgid ""
"<b>Human-rights defenders</b> use Tails to avoid censorship and report human-"
"rights violations."
msgstr ""
+"<b>Les personnes défendant les droits humains</b> utilisent Tails pour "
+"éviter la censure et signaler les violations des droits humains."
#. type: Content of: <div><div><ul><li>
msgid ""
"<b>Domestic violence survivors</b> use Tails to escape surveillance in their "
"home."
msgstr ""
+"<b>Les personnes ayant échappé à des violences domestiques</b> utilisent Tor "
+"pour échapper à la surveillance dans leur domicile."
#. type: Content of: <div><div><ul><li>
msgid "<b>Privacy-concerned citizens</b> use Tails to avoid online tracking."
msgstr ""
+"<b>Les personnes soucieuses de la vie privée</b> utilisent Tails pour éviter "
+"d'être pistées en ligne."
#. type: Content of: <div><div><p>
msgid ""
"<b>If everyone using Tails donated $6, our fundraiser would be done in one "
"day.</b> The price of a USB stick is all we need."
msgstr ""
+"<b>Si chaque personne qui utilise Tails donnait 5€, notre campagne de dons "
+"serait terminée en un jour.</b> Nous n'avons besoin que de l'équivalent du "
+"prix d'une clé USB."
#. type: Content of: <div><div><p>
msgid ""
"<b>But not everyone using Tails can donate.</b> When you do, you are "
"offering to many others who need it, the very precious tool that is Tails."
msgstr ""
+"<b>Mais tout le monde ne peut pas donner.</b> Lorsque vous faites un don, "
+"vous offrez aux nombreuses personnes qui en ont besoin cet outil précieux "
+"qu'est Tails."
#. type: Content of: <div><div><p>
msgid ""
@@ -78,41 +92,38 @@ msgid ""
"why we are giving out Tails for free but asking for your help to protect and "
"sustain it."
msgstr ""
+"Nous savons que les outils de sécurité doivent être des logiciels libres "
+"pour être dignes de confiance. C'est pourquoi nous distribuons Tails "
+"gratuitement, mais nous vous demandons de nous aider à le protéger et à le "
+"soutenir."
#. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Donations from individuals, like you, are our most valuable funding as "
-#| "they make Tails more independent from government and corporate funding."
msgid ""
"Donations from individuals, like you, are our most valuable funding as they "
"make Tails more independent from government and corporate funding. We are a "
"very small non-profit and our yearly budget is ridiculously small compared "
"to the value of Tails."
msgstr ""
-"Les dons venants d'individus comme vous sont les plus précieux car ils "
-"permettent à Tails d'être moins dépendant des subventions des gouvernements "
-"et des entreprises."
+"Les dons venant d'individus comme vous sont les plus précieux car ils "
+"permettent à Tails d'être plus indépendant des subventions des gouvernements "
+"et des entreprises. Nous sommes une très petite organisation sans but "
+"lucratif et notre budget annuel est ridiculement petit comparé à la valeur "
+"de Tails."
#. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid ""
-#| "This year, please consider making a donation to protect and sustain Tails."
msgid "Please consider making a donation to protect and sustain Tails."
-msgstr ""
-"Cette année, s’il vous plaît, pensez à faire un don pour protéger et "
-"pérenniser Tails."
+msgstr "Merci de penser à faire un don pour protéger et soutenir Tails."
#. type: Content of: <div><div><p>
msgid "Thanks!"
msgstr "Merci !"
-#. HTML Variables for PayPal Payments Standard:
-#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
-#. 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.
-#. For recurring donations only.
-#. For one-time donation only.
+#. HTML Variables for PayPal Payments Standard:
+#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
+#. 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.
+#. For recurring donations only.
+#. For one-time donation only.
#. type: Content of: <div><div><div><form>
msgid ""
"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
@@ -308,8 +319,8 @@ msgstr "Donner en dollars"
msgid "Recurring donation"
msgstr "Don régulier"
-#. 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.
+#. 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>
msgid ""
"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
@@ -376,10 +387,10 @@ msgstr ""
msgid "One-time donation"
msgstr "Don ponctuel"
-#. Note for translators: the following parts need to be translated:
-#. - https://tails.boum.org/donate/thanks
-#. - https://tails.boum.org/donate/canceled
-#. - US
+#. Note for translators: the following parts need to be translated:
+#. - https://tails.boum.org/donate/thanks
+#. - https://tails.boum.org/donate/canceled
+#. - US
#. type: Content of: <div><div><div><div><form>
msgid ""
"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
@@ -448,30 +459,30 @@ msgid ""
"<a href=\"bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK\">[[!img "
"bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link=\"no\"]]</a>"
msgstr ""
+"<a href=\"bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK\">[[!img "
+"bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link=\"no\"]]</a>"
#. type: Content of: <div><div><div><div><p>
msgid "<strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong>"
-msgstr ""
+msgstr "<strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong>"
#. type: Content of: <div><div><div><h4>
msgid "US check"
-msgstr ""
+msgstr "Chèque États-Unis"
#. type: Content of: <div><div><div><p>
msgid "Riseup Labs"
-msgstr ""
+msgstr "Riseup Labs"
#. type: Content of: <div><div><div><p>
msgid "PO Box 4282"
-msgstr ""
+msgstr "PO Box 4282"
#. type: Content of: <div><div><div><p>
msgid "Seattle, WA 98194"
-msgstr ""
+msgstr "Seattle, WA 98194"
#. type: Content of: <div><div><h4>
-#, fuzzy
-#| msgid "Bank Transfer"
msgid "Bank transfer"
msgstr "Virement bancaire"
diff --git a/wiki/src/local.css b/wiki/src/local-donate.css
index 698a957..698a957 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local-donate.css
diff --git a/wiki/src/news/2018-fundraiser.fr.po b/wiki/src/news/2018-fundraiser.fr.po
index aedc40d..7166ee5 100644
--- a/wiki/src/news/2018-fundraiser.fr.po
+++ b/wiki/src/news/2018-fundraiser.fr.po
@@ -3,56 +3,62 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2018-10-13 01:26+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2018-10-15 08:38+0000\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Our donation campaign for 2019 begins today\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Notre campagne de dons 2019 commence aujourd'hui\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Fri, 12 Oct 2018 14:36:53 +0000\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Fri, 12 Oct 2018 14:36:53 +0000\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!pagetemplate template=\"news.tmpl\"]]\n"
-msgstr ""
+msgstr "[[!pagetemplate template=\"news.tmpl\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
"Every day, Tails helps thousands of people to safely use their computers "
"online and offline."
msgstr ""
+"Chaque jour, Tails aide des milliers de personnes à être protégées lors de "
+"l'utilisation d'un ordinateur en réseau et hors réseau."
#. type: Plain text
msgid ""
"Tails is available for free because we believe that nobody should have to "
"pay to be protected from surveillance and censorship."
msgstr ""
+"Tails est disponible gratuitement car nous croyons que personne ne devrait "
+"avoir à payer pour être protégé de la surveillance et de la censure."
#. type: Plain text
msgid ""
"Tails is free software because if our source code was closed, there would be "
"no way of verifying that it is secure."
msgstr ""
+"Tails est un logiciel libre car si notre code source était fermé, personne "
+"ne pourrait vérifier qu'il est sûr."
#. type: Plain text
msgid ""
@@ -61,6 +67,10 @@ msgid ""
"protect you against targeted advertisement, and we obviously don't want to "
"rely on these sources of revenue."
msgstr ""
+"Dans l'Internet d'aujourd'hui, la stratégie économique la plus rentable est "
+"de s'appuyer sur la publicité et le pistage. Mais l'une des raisons de notre "
+"existence est également de vous protéger contre la publicité ciblée, et nous "
+"ne voulons évidemment pas dépendre de ces sources de revenus."
#. type: Plain text
msgid ""
@@ -69,6 +79,11 @@ msgid ""
"want Tails to be smoother to install, upgrade, use and to include even more "
"security protection."
msgstr ""
+"Le nombre de personnes utilisant Tails est en constante augmentation et il "
+"est de notre responsabilité de fournir l'outil le plus simple et le plus sûr "
+"possible. En 2019, nous voulons que Tails soit plus facile à installer, à "
+"mettre à jour, à utiliser et d'inclure encore plus de protection en matière "
+"de sécurité."
#. type: Plain text
msgid ""
@@ -76,10 +91,14 @@ msgid ""
"small number given all the work done, and many of us still do a lot of work "
"for free in addition to paid hours."
msgstr ""
+"Réaliser Tails coûte environ 200&#8239;000€ chaque année. Il s'agit d'un "
+"très petit montant étant donné tout le travail accompli, et beaucoup d'entre "
+"nous font encore beaucoup de travail gratuitement en plus des heures "
+"rémunérées."
#. type: Plain text
msgid "Our money comes from:"
-msgstr ""
+msgstr "Notre argent vient de :"
#. type: Plain text
msgid ""
@@ -87,6 +106,12 @@ msgid ""
"or Lush - Foundations and NGOs like The Handshake Foundation or The ISC "
"Project - Funds from the US government like the Open Technology Fund"
msgstr ""
+"- Des personnes passionnées comme vous\n"
+"- Des entreprises privées comme Mozilla, DuckDuckGo ou Lush\n"
+"- Des fondations et des ONG comme The Handshake Foundation ou The ISC "
+"Project\n"
+"- Des fonds provenant du gouvernement des États-Unis comme le Open "
+"Technology Fund"
#. type: Plain text
#, no-wrap
@@ -94,6 +119,8 @@ msgid ""
"[[!img income.png link=\"no\" class=\"margin center\" alt=\"Individuals: 35%,\n"
"Foundations & NGOs: 34%, Related to US government: 24%, Companies: 7%\"]]\n"
msgstr ""
+"[[!img income.png link=\"no\" class=\"margin center\" alt=\"Individus : 35%,\n"
+"Fondations & ONG : 34%, En lien avec le gouvernement des États-Unis : 24%, Entreprises : 7%\"]]\n"
#. type: Plain text
msgid ""
@@ -102,6 +129,11 @@ msgid ""
"share this concern and we will never be at ease as long as the well-being of "
"our project depends on such funding."
msgstr ""
+"Nous entendons souvent des plaintes au sujet de projets logiciels destinés à "
+"lutter contre la surveillance, comme Tor et Tails, qui obtiennent des fonds "
+"du gouvernement des États-Unis. Nous partageons cette préoccupation et nous "
+"ne serons jamais à l'aise tant que le bon fonctionnement de notre projet "
+"dépendra d'un tel financement."
#. type: Plain text
#, no-wrap
@@ -109,6 +141,8 @@ msgid ""
"This is why it's so <b>important to be sustained\n"
"by users like you, and our independence protected by your donations.</b>\n"
msgstr ""
+"C'est pourquoi il est si <b>important d'être soutenu\n"
+"par des personnes comme vous, et que notre indépendance soit protégée par vos dons.</b>\n"
#. type: Plain text
#, no-wrap
@@ -118,6 +152,10 @@ msgid ""
"day. <b>If each user gave $6, our\n"
"fundraiser would be done in one day.</b> The price of a USB stick is all we need.\n"
msgstr ""
+"Avec nos [[statistiques anonymisées|support/faq#boot_statistics]],\n"
+"nous savons que Tails est utilisé plus de 20&#8239;000 fois chaque\n"
+"jour. <b>Si chaque personne utilisant Tails donne 5€, notre\n"
+"campagne de dons serait terminée en une seule journée.</b> Nous n'avons besoin que de l'équivalent d'une clé USB.\n"
#. type: Plain text
msgid ""
@@ -126,6 +164,10 @@ msgid ""
"giving to an anti-surveillance tool like Tails, or simply because they don't "
"have the money."
msgstr ""
+"Mais nous savons que beaucoup des [[personnes qui ont le plus besoin de "
+"Tails|news/who_are_you_helping]] ne peuvent pas donner, parce qu'elles sont "
+"en difficultés pour donner à un outil anti-surveillance comme Tails, ou "
+"simplement parce qu'elles n'ont pas d'argent."
#. type: Plain text
#, no-wrap
@@ -134,12 +176,15 @@ msgid ""
"donations for a total of 101&#8239;644€. <b>This year, we aim for 120&#8239;000€\n"
"and a larger number of donors.</b>\n"
msgstr ""
+"L'année dernière, nous avons reçu 1&#8239;167\n"
+"dons pour un total de 101&#8239;644€. <b> Cette année, nous aimerions atteindre 120&#8239;000€\n"
+"et un plus grand nombre de personnes faisant un don.</b>\n"
#. type: Plain text
msgid "Please consider taking a minute to donate to Tails today."
-msgstr ""
+msgstr "Merci de prendre une minute pour faire un don à Tails aujourd'hui."
#. type: Plain text
#, no-wrap
msgid "<div id=\"donate-button\"><a href=\"https://tails.boum.org/donate?r=2018\">Donate</a></div>\n"
-msgstr ""
+msgstr "<div id=\"donate-button\"><a href=\"https://tails.boum.org/donate?r=2018\">Faire un don</a></div>\n"
diff --git a/wiki/src/news/test_3.9-rc1.mdwn b/wiki/src/news/test_3.9-rc1.mdwn
index f5a9eb4..0aa618e 100644
--- a/wiki/src/news/test_3.9-rc1.mdwn
+++ b/wiki/src/news/test_3.9-rc1.mdwn
@@ -101,7 +101,7 @@ You can install 3.9~rc1 by following our usual
[[installation instructions|install]], skipping the **Download and
verify** step.
-<a class="download-file use-mirror-pool" href="">Tails 3.9~rc1 ISO image</a>
+<a class="download-file" href="">Tails 3.9~rc1 ISO image</a>
<span class="openpgp-small-link">[[OpenPGP signature|torrents/files/tails-amd64-3.9~rc1.iso.sig]]</span>
<br/>
<a class="download-file" href="" >Tails 3.9~rc1 torrent</a>
diff --git a/wiki/src/templates/news.tmpl b/wiki/src/templates/news.tmpl
index e9824ef..4a47ade 100644
--- a/wiki/src/templates/news.tmpl
+++ b/wiki/src/templates/news.tmpl
@@ -20,7 +20,7 @@
<TMPL_IF LOCAL_CSS>
<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
<TMPL_ELSE>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local-donate.css" type="text/css" />
</TMPL_IF>
<script src="<TMPL_VAR BASEURL>lib/js/mirror-dispatcher.js" type="text/javascript"></script>
diff --git a/wiki/src/templates/page.tmpl b/wiki/src/templates/page.tmpl
index 85bec31..1eaae2d 100644
--- a/wiki/src/templates/page.tmpl
+++ b/wiki/src/templates/page.tmpl
@@ -20,7 +20,7 @@
<TMPL_IF LOCAL_CSS>
<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
<TMPL_ELSE>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local-donate.css" type="text/css" />
</TMPL_IF>
<script src="<TMPL_VAR BASEURL>lib/js/mirror-dispatcher.js" type="text/javascript"></script>