Commit eafa36b0 authored by sajolida's avatar sajolida

Merge remote-tracking branch 'origin/master'

parents d03b952f d12b612b
......@@ -8,10 +8,10 @@ http://www.sphinx-doc.org/en/stable/intl.html?highlight=gettext
Lektor
======
Tor is considering using Lektor for their website:
The upcoming new Tor website uses [Lektor](https://www.getlektor.com/).
https://www.getlektor.com/
There's
a [PO plugin](https://github.com/numericube/lektor-i18n-plugin) for
Lektor but Tor does not use it. Ask hiro for details.
There's a PO plugin for Lektor:
https://github.com/numericube/lektor-i18n-plugin
Lektor will soon [[!debbug 892901 desc="be in Debian"]].
......@@ -4,17 +4,6 @@ All times are referenced to Berlin and Paris time.
## 2018Q1
* 2018-03-12:
- All branches targeting Tails 3.6 *must* be merged into the
`testing` branch by noon, CET.
- The upcoming Tor Browser is hopefully out so we can import it.
- Build and upload Tails 3.6 ISO image and IUKs.
- Hopefully start testing Tails 3.6.
* 2018-03-13:
- Finish testing Tails 3.6 by the afternoon, CET.
- **Release Tails 3.6** (major release) during late CET.
* 2018-03-19, 16:00: VeraCrypt team meeting
## 2018Q2
......
......@@ -10,7 +10,7 @@ Requirements
To release Tails you'll need some packages installed:
* `tidy mktorrent transmission-cli`
* Aufs DKMS module for your running kernel.
* aufs DKMS module for your running kernel.
* [[!debpts squashfs-tools]] that honors `$SOURCE_DATE_EPOCH`.
Install it from our custom `devel` APT suite.
* `tails-iuk` dependencies, including suggested packages (see
......@@ -80,6 +80,12 @@ be `testing` for major releases, and `stable` for point-releases.
Read the remainder of this document from the branch used to prepare the release!
</div>
Sanity check
============
Visit the [Jenkins RM view](https://jenkins.tails.boum.org/view/RM/)
and check that the jobs for the release branch have good enough results.
Freeze
======
......@@ -124,7 +130,7 @@ If we are at freeze time for a point-release:
1. Merge the `master` Git branch into `stable`:
git checkout stable && git merge --no-ff origin/master
git checkout stable && git fetch && git merge --no-ff origin/master
2. [[Merge each APT overlay suite|APT_repository/custom#workflow-merge-overlays]]
listed in the `stable` branch's `config/APT_overlays.d/` into the `stable`
......
......@@ -66,8 +66,9 @@ with GnuPG:
Filter the tarballs we want and make them available at build time,
when the tarballs are fetched:
grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt > \
config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt \
| grep -v '\<tor-browser-linux64-debug\.tar\.xz$' \
> config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
Then update the URL to the one chosen above:
......@@ -187,7 +188,7 @@ Import a new set of Tor Browser tarballs
)
done
3. Move the tarballs into your local Git annex:
2. Move the tarballs into your local Git annex:
cd "$TBB_ARCHIVE" && \
mkdir "$TBB_VERSION" && cd "$TBB_VERSION" && \
......
......@@ -2,6 +2,11 @@
# Tasks
## Continuously
Stay on top of email received on the Release Managers mailing list.
This includes for example failure notifications for Jenkins jobs.
## In the beginning of your shift
- Check the Mozilla release calendars:
......
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# 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"
"POT-Creation-Date: 2018-03-16 13:21+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <li>Start <span class=\"application\">Tails Installer</span> in\n"
" English from the command line:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>LANG=en_US tails-installer</pre>\n"
" </li>\n"
" </ul>\n"
msgstr ""
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# 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"
"POT-Creation-Date: 2018-03-16 13:21+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <li>Start <span class=\"application\">Tails Installer</span> in\n"
" English from the command line:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>LANG=en_US tails-installer</pre>\n"
" </li>\n"
" </ul>\n"
msgstr ""
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# 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"
"POT-Creation-Date: 2018-03-16 13:21+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <li>Start <span class=\"application\">Tails Installer</span> in\n"
" English from the command line:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>LANG=en_US tails-installer</pre>\n"
" </li>\n"
" </ul>\n"
msgstr ""
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# 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"
"POT-Creation-Date: 2018-03-16 13:21+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <li>Start <span class=\"application\">Tails Installer</span> in\n"
" English from the command line:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>LANG=en_US tails-installer</pre>\n"
" </li>\n"
" </ul>\n"
msgstr ""
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# 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"
"POT-Creation-Date: 2018-03-16 13:21+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <li>Start <span class=\"application\">Tails Installer</span> in\n"
" English from the command line:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>LANG=en_US tails-installer</pre>\n"
" </li>\n"
" </ul>\n"
msgstr ""
<p>If you are upgrading from Tails 3.5, it is only possible to select an
ISO image when running Tails in English. For other languages, the
file chooser button remains inactive:</p>
[[!img news/version_3.5/broken-file-chooser.png link="no"]]
<p>To do a manual upgrade from Tails 3.5, you can either:</p>
<ul>
<li>Restart Tails 3.5 in English</li>
<li>Start <span class="application">Tails Installer</span> in
English from the command line:
<pre>LANG=en_US tails-installer</pre>
</li>
</ul>
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# 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"
"POT-Creation-Date: 2018-03-16 13:21+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <li>Start <span class=\"application\">Tails Installer</span> in\n"
" English from the command line:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>LANG=en_US tails-installer</pre>\n"
" </li>\n"
" </ul>\n"
msgstr ""
......@@ -5,17 +5,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-14 10:19+0100\n"
"PO-Revision-Date: 2018-03-14 09:22+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-03-16 13:22+0000\n"
"PO-Revision-Date: 2018-03-16 13:26+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.10.1\n"
"X-Generator: Poedit 1.8.11\n"
"Language-Team: \n"
#. type: Plain text
#, no-wrap
......@@ -244,6 +244,11 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
"- Befolgen Sie zum Installieren unsere [[Installationsanweisungen|install]]."
#. type: Plain text
#, no-wrap
msgid "<a id=\"upgrade\"></a>\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
......@@ -251,6 +256,11 @@ msgid ""
"tails_ticket 13426]]). You have to [[upgrade manually|upgrade]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
......
......@@ -239,6 +239,11 @@ msgstr ""
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"upgrade\"></a>\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
......@@ -246,6 +251,11 @@ msgid ""
"tails_ticket 13426]]). You have to [[upgrade manually|upgrade]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-14 10:19+0100\n"
"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2018-03-14 10:28+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -239,6 +239,11 @@ msgstr ""
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"upgrade\"></a>\n"
msgstr "<a id=\"upgrade\"></a>\n"
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
......@@ -246,6 +251,11 @@ msgid ""
"tails_ticket 13426]]). You have to [[upgrade manually|upgrade]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fa\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
......
......@@ -243,6 +243,12 @@ msgstr ""
msgid "- To install, follow our [[installation instructions|install]]."
msgstr "- Pour installer, suivez nos [[instructions d'installation|install]]."
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<a id=\"known-issues\"></a>\n"
msgid "<a id=\"upgrade\"></a>\n"
msgstr "<a id=\"known-issues\"></a>\n"
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
......@@ -250,6 +256,11 @@ msgid ""
"tails_ticket 13426]]). You have to [[upgrade manually|upgrade]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
......
......@@ -242,6 +242,11 @@ msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
"- Per installare, segui le nostre [[istruzioni per l'installazione|install]]."
#. type: Plain text
#, no-wrap
msgid "<a id=\"upgrade\"></a>\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
......@@ -249,6 +254,11 @@ msgid ""
"tails_ticket 13426]]). You have to [[upgrade manually|upgrade]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
......
......@@ -100,10 +100,14 @@ See the list of [[long-standing issues|support/known_issues]].
- To install, follow our [[installation instructions|install]].
<a id="upgrade"></a>
- We do not provide automatic upgrades from older Tails installations for
this release, as we've hit an old bug while generating the necessary files
([[!tails_ticket 13426]]). You have to [[upgrade manually|upgrade]].
[[!inline pages="news/version_3.5/manual_upgrade.inline" raw="yes" sort="age"]]
- [[Download Tails 3.6.|install/download]]
# What's coming up?
......
......@@ -239,6 +239,11 @@ msgstr ""
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"upgrade\"></a>\n"
msgstr ""
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
......@@ -246,6 +251,11 @@ msgid ""
"tails_ticket 13426]]). You have to [[upgrade manually|upgrade]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
......
......@@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-02-21 18:45+0100\n"
"PO-Revision-Date: 2016-02-19 19:22+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2018-03-16 13:40+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
......@@ -22,10 +22,9 @@ msgid "[[!meta title=\"Manually upgrade inside Tails\"]]\n"
msgstr "[[!meta title=\"Manuell in Tails aktualisieren\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
#, no-wrap
......@@ -149,6 +148,26 @@ msgid ""
"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
msgstr "Schließen Sie den <span class=\"application\">Tails Installer</span>."
#. type: Plain text
#, no-wrap
msgid " <a id=\"3.5\"></a>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " <div class=\"bug\">\n"
msgstr " <div class=\"bug\">\n"
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
#. type: Plain text
#, no-wrap
msgid " </div>\n"
msgstr " </div>\n"
#. type: Bullet: '1. '
msgid ""
"Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
......@@ -207,10 +226,13 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
#~ "outdated Tails on another USB stick using <span class=\"application"
#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
#~ "In diesem Schritt werden Sie ein zwischenzeitliches Tails installieren, indem Sie\n"
#~ "mithilfe des <span class=\"application\">Tails Installers</span> Ihr veraltetes Tails auf einen anderen USB-Stick klonen.\n"
#~ "In diesem Schritt werden Sie ein zwischenzeitliches Tails installieren, "
#~ "indem Sie\n"
#~ "mithilfe des <span class=\"application\">Tails Installers</span> Ihr "
#~ "veraltetes Tails auf einen anderen USB-Stick klonen.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
......@@ -221,8 +243,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Aktualisieren Sie das zwischenzeitliche Tails\n"
#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgstr ""
#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
......@@ -239,7 +265,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
#~ " </span>\n"
#~ " um den <span class=\"application\">Tails Installer</span> erneut zu starten.\n"
#~ " um den <span class=\"application\">Tails Installer</span> erneut zu "
#~ "starten.\n"