Commit bbb8832c authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/web/8592-release-ia' into testing

Fix-committed: #8592
parents deb704b0 91477337
......@@ -93,7 +93,7 @@
<div id="download">
<a id="download-button" href="[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]" class="btn btn-lg btn-primary clearfix">
<span id="download-button-label" class="pull-left">Download Tails [[!inline pages="inc/stable_i386_version" raw="yes"]] ISO image
<small id="download-button-size" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>
(<small id="download-button-size" >[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small>)
</span>
<div id="download-button-state" class="pull-right">
<span id="download-button-state-retry" class="label label-warning">Retry</span>
......
......@@ -46,6 +46,8 @@ The following price estimations are based on interpromicro.com ones.
We currently prefer option C if it's doable, and option D otherwise.
<a id="option_C"></a>
### Option C: 12 cores, upgradable by adding a CPU
XXX:
......@@ -65,6 +67,8 @@ XXX:
Total --- **$5424**
<a id="option_D"></a>
### Option D: 2*6 cores, upgradable by replacing CPUs
XXX:
......
......@@ -181,6 +181,7 @@ the release branch's APT suite:
* [[perl5lib]]
* [[persistence-setup]]
* [[tails-iuk]]
* [[tor]]
* whisperback:
* follow [upstream release process](https://git-tails.immerda.ch/whisperback/plain/HACKING)
* build a Debian package
......@@ -236,10 +237,25 @@ Update other base branches
1. Merge the release branch into `devel` following the instructions for
[[merging base branches|contribute/APT_repository#workflow-merge-main-branch]].
2. Push the modified branches to Git:
2. Merge `devel` into `feature/jessie` following the instructions for
[[merging base branches|contribute/APT_repository#workflow-merge-main-branch]].
Given that these two branches' APT suites have diverged a lot, and
that `tails-merge-suite` currently happily overwrites newer
packages in the target with older packages from the source, it's
probably easier to just merge each individual APT overlay that was
just merged into the release branch into `feature/jessie`'s APT
suite. Also, most of our just upgraded bundled packages
(e.g. `tails-greeter`) may need to be rebuilt for Jessie.
3. Ensure that the release, `devel` and `feature/jessie` branches
have the expected content in `config/APT_overlays.d/`: e.g. it must
not list any overlay APT suite that has been merged already.
4. Push the modified branches to Git:
git push origin "${RELEASE_BRANCH}:${RELEASE_BRANCH}" \
devel:devel
devel:devel \
feature/jessie:feature/jessie
Update more included files
==========================
......@@ -625,8 +641,6 @@ Prepare upgrade-description files
Prepare the ISO description file for DAVE
-----------------------------------------
Skip this section if preparing a release candidate.
Update the ISO description file (IDF) used by the browser extension:
ISO_PATH="${ISOS}/tails-i386-${VERSION}/tails-i386-${VERSION}.iso"
......@@ -770,9 +784,9 @@ to be released in `inc/*`:
Update the size of the ISO image in `inc/*`:
LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' > \
"$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' \
> "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
Generate the expected signature verification output:
......@@ -1042,34 +1056,27 @@ this, and skip what does not make sense for a RC.
rm -rf "$bare_repo"
1. Pull `master` back and merge it into `stable`, and in turn into
`devel` and `experimental`.
`devel`, `experimental` and `feature/jessie`.
1. Follow the
[[post-release|contribute/APT_repository#workflow-post-release]] APT
repository documentation.
1. Push the resulting branches.
1. If this was a major release, then reset experimental:
- take note of branches merged into `experimental`, but not into
`devel`:
git log --pretty=oneline --color=never --merges devel..experimental \
| /bin/grep 'into experimental$' \
| sed -e 's,^[a-f0-9]\+\s\+,,' | sort -u
- `git checkout experimental && git reset --hard devel`
- merge additional Git branches into experimental
EXPERIMENTAL_BRANCHES="$(
git log --pretty=oneline --color=never --merges origin/devel..origin/experimental |
sed -n -E "s,^[a-f0-9]+ Merge( remote-tracking)? branch '(origin/)?([^']+)' into experimental$,origin/\3,p" |
grep -v -E '^origin/(master|stable|testing|devel|experimental)$' |
sort -u
)" && \
git checkout experimental && \
git reset --hard origin/devel && \
for branch in ${EXPERIMENTAL_BRANCHES} ; do
if [ -z "$(git diff experimental...${branch})" ]; then
echo "Skipping branch '${branch}' due to empty diff"
continue
fi
echo "Merging branch '${branch}' ..."
git merge --no-edit "${branch}" || (
echo "Please resolve the problem in another terminal (including committing in case of a conflict resolution)"
read -p "Press ENTER to continue! "
)
done && \
git push --force origin experimental:experimental
for branch in $UNMERGED_BRANCHES ; do
git merge $branch
done
- `git push --force origin experimental:experimental`
1. Make sure Jenkins manages to build all updated major branches fine:
<https://jenkins.tails.boum.org/>.
1. Delete the _Release Manager View for $VERSION_ Redmine custom query.
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-20 15:17+0100\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"PO-Revision-Date: 2014-06-08 17:10+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -67,14 +67,10 @@ msgid ""
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]]\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
" - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
" - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
......@@ -92,6 +88,11 @@ msgid ""
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]],\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
msgstr ""
" - [[!traillink Auf_einen_USB-Stick_oder_eine_SD-Karte_installieren|first_steps/installation]] (empfohlen)\n"
" - [[!traillink Manuelle_Installation_auf_einen_USB-Stick_oder_eine_SD_Karte|first_steps/installation/manual]],\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2016-01-11 21:42+0100\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"PO-Revision-Date: 2015-10-25 18:08+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
......@@ -72,14 +72,10 @@ msgid ""
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]]\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
" - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
" - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
......@@ -97,6 +93,11 @@ msgid ""
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]],\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
msgstr ""
" - [[!traillink نصب_روی_یک_درایو_یواس‌بی_یا_کارت_حافظه|first_steps/installation]] (پیشنهاد ما)\n"
" - [[!traillink نصب_دستی_روی_یک_درایو_یواس‌بی_یا_کارت_حافظه|first_steps/installation/manual]]\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-20 15:17+0100\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"PO-Revision-Date: 2014-10-08 08:44-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
......@@ -70,14 +70,10 @@ msgid ""
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]]\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
" - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
" - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
......@@ -95,6 +91,11 @@ msgid ""
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]],\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
msgstr ""
" - [[!traillink Installation_sur_une_clé_USB_ou_une_carte_SD|first_steps/installation]] (recommandée)\n"
" - [[!traillink Installation_manuelle_sur_une_clé_USB_ou_une_carte_SD|first_steps/installation/manual]],\n"
......
<div class="tip">
<p>For installing and starting Tails, we recommend you try our new
[[installation assistant|install]]. The following pages are the old
instructions, provided as a fallback.</p>
</div>
- [[!traillink Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|first_steps/media]]
- [[!traillink Burning_a_DVD|first_steps/dvd]]
- [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)
......@@ -5,11 +13,6 @@
using [[!traillink Linux|first_steps/installation/manual/linux]],
[[!traillink Windows|first_steps/installation/manual/windows]],
or [[!traillink Mac|first_steps/installation/manual/mac]]
- Uninstalling Tails or resetting a USB stick or SD card
using [[!traillink Linux|first_steps/reset/linux]]
[[!traillink Windows|first_steps/reset/windows]],
or [[!traillink Mac|first_steps/reset/mac]]
- [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]
- [[!traillink Start_Tails|first_steps/start_tails]]
- [[!traillink Startup_options|first_steps/startup_options]]
- [[!traillink Administration_password|first_steps/startup_options/administration_password]]
......@@ -30,3 +33,8 @@
- [[!traillink Report_an_error|first_steps/bug_reporting]]
- [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]
- [[!traillink Shutting_down_Tails|first_steps/shutdown]]
- [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]
- Uninstalling Tails or resetting a USB stick or SD card
using [[!traillink Linux|first_steps/reset/linux]],
[[!traillink Windows|first_steps/reset/windows]],
or [[!traillink Mac|first_steps/reset/mac]]
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-20 15:17+0100\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"PO-Revision-Date: 2014-07-30 18:34-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -66,14 +66,10 @@ msgid ""
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]]\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
" - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
" - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
" - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
" - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
" - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
......@@ -91,6 +87,11 @@ msgid ""
" - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
" - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - Uninstalling Tails or resetting a USB stick or SD card\n"
" using [[!traillink Linux|first_steps/reset/linux]],\n"
" [[!traillink Windows|first_steps/reset/windows]],\n"
" or [[!traillink Mac|first_steps/reset/mac]]\n"
msgstr ""
" - [[!traillink Instalando_em_uma_memória_USB_ou_cartão_SD|first_steps/installation]] (recomendado)\n"
" - [[!traillink Instalando_manualmente_em_uma_memória_USB_ou_cartão_SD|first_steps/installation/manual]],\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-11-17 21:32+0100\n"
"POT-Creation-Date: 2016-01-25 20:34+0100\n"
"PO-Revision-Date: 2015-05-31 23:05+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails localization discussion <tails-l10n@boum.org>\n"
......@@ -234,35 +234,9 @@ msgid "<pre>tails-upgrade-frontend-wrapper</pre>\n"
msgstr "<pre>tails-upgrade-frontend-wrapper</pre>.\n"
#. type: Plain text
#, no-wrap
msgid ""
"<!-- Note for translators: make sure that the translation of this string\n"
"integrates well with /inc/stable_i386_release_notes. -->\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
"for the latest version. They document all the changes in this new version:</p>\n"
msgstr ""
"<p>Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes.de\" raw=\"yes\"]]\n"
"für die neueste Version zu lesen. Sie beschreiben alle Änderungen in dieser neuen Version:</p>\n"
#. type: Plain text
#, no-wrap
msgid ""
"<ul>\n"
" <li>new features</li>\n"
" <li>bugs that were solved</li>\n"
" <li>known issues that have already been identified</li>\n"
"</ul>\n"
msgstr ""
"<ul>\n"
" <li>Neue Funktionen</li>\n"
" <li>Fehler, die behoben wurden</li>\n"
" <li>Bekannte Probleme, die bereits identifiziert wurden</li>\n"
"</ul>\n"
#, fuzzy, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade/release_notes.inline\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
#. type: Plain text
msgid ""
......@@ -309,16 +283,6 @@ msgstr "<a name=\"manual\"></a>\n"
msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
msgstr "Manuelles Aktualisieren mit Hilfe des <span class=\"application\">Tails Installers</span>\n"
#. type: Plain text
#, fuzzy, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
msgstr "Sie könnten auch <strong>besondere Anweisungen zum Aktualisieren</strong> enthalten.\n"
#. type: Plain text
msgid ""
"It might not always be possible to do an automatic upgrade as described "
......@@ -550,6 +514,29 @@ msgstr ""
msgid " </div>\n"
msgstr " </div>\n"
#~ msgid ""
#~ "<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
#~ "for the latest version. They document all the changes in this new version:</p>\n"
#~ msgstr ""
#~ "<p>Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes.de\" raw=\"yes\"]]\n"
#~ "für die neueste Version zu lesen. Sie beschreiben alle Änderungen in dieser neuen Version:</p>\n"
#~ msgid ""
#~ "<ul>\n"
#~ " <li>new features</li>\n"
#~ " <li>bugs that were solved</li>\n"
#~ " <li>known issues that have already been identified</li>\n"
#~ "</ul>\n"
#~ msgstr ""
#~ "<ul>\n"
#~ " <li>Neue Funktionen</li>\n"
#~ " <li>Fehler, die behoben wurden</li>\n"
#~ " <li>Bekannte Probleme, die bereits identifiziert wurden</li>\n"
#~ "</ul>\n"
#~ msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
#~ msgstr "Sie könnten auch <strong>besondere Anweisungen zum Aktualisieren</strong> enthalten.\n"
#~ msgid "Clone & Upgrade\n"
#~ msgstr "Klonen & Aktualisieren\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2015-12-24 15:03+0100\n"
"POT-Creation-Date: 2016-01-25 20:34+0100\n"
"PO-Revision-Date: 2015-10-26 17:35+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/upgrade/"
......@@ -227,28 +227,10 @@ msgid "<pre>tails-upgrade-frontend-wrapper</pre>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<!-- Note for translators: make sure that the translation of this string\n"
"integrates well with /inc/stable_i386_release_notes. -->\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
"for the latest version. They document all the changes in this new version:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<ul>\n"
" <li>new features</li>\n"
" <li>bugs that were solved</li>\n"
" <li>known issues that have already been identified</li>\n"
"</ul>\n"
msgstr ""
#, fuzzy, no-wrap
#| msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/upgrade/release_notes.inline\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
#. type: Plain text
msgid ""
......@@ -293,16 +275,6 @@ msgstr "<a name=\"manual\"></a>\n"
msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
msgstr "ارتقای دستی با استفاده از <span class=\"application\">نصب‌کنندهٔ تیلز</span>\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
msgstr "آن‌ها ممکن است شامل <strong>دستوراتی خاص برای ارتقا</strong> باشند.\n"
#. type: Plain text
msgid ""
"It might not always be possible to do an automatic upgrade as described "
......@@ -521,6 +493,9 @@ msgstr ""
msgid " </div>\n"
msgstr " </div>\n"
#~ msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
#~ msgstr "آن‌ها ممکن است شامل <strong>دستوراتی خاص برای ارتقا</strong> باشند.\n"
#~ msgid "Clone & Upgrade\n"
#~ msgstr "همتاسازی و ارتقا\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2015-11-17 21:32+0100\n"
"POT-Creation-Date: 2016-01-25 20:34+0100\n"
"PO-Revision-Date: 2015-10-19 00:26+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -229,35 +229,10 @@ msgid "<pre>tails-upgrade-frontend-wrapper</pre>\n"
msgstr "<pre>tails-upgrade-frontend-wrapper</pre>\n"
#. type: Plain text
#, no-wrap
msgid ""
"<!-- Note for translators: make sure that the translation of this string\n"
"integrates well with /inc/stable_i386_release_notes. -->\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
"for the latest version. They document all the changes in this new version:</p>\n"
msgstr ""
"<p>Nous vous recommandons de lire les [[!inline pages=\"inc/stable_i386_release_notes.fr\" raw=\"yes\"]]\n"
"de la dernière version. Elles documentent tous les changements de cette nouvelle version :</p>\n"
#. type: Plain text
#, no-wrap
msgid ""
"<ul>\n"
" <li>new features</li>\n"
" <li>bugs that were solved</li>\n"
" <li>known issues that have already been identified</li>\n"
"</ul>\n"
msgstr ""
"<ul>\n"
" <li>nouvelles fonctionnalités</li>\n"
" <li>bugs qui ont été corrigés</li>\n"
" <li>problèmes connus qui ont déjà été identifiés</li>\n"
"</ul>\n"
#, fuzzy, no-wrap
#| msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/first_steps/upgrade/release_notes.inline\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes.fr\" raw=\"yes\"]]\n"
#. type: Plain text
msgid ""
......@@ -304,16 +279,6 @@ msgstr "<a name=\"manual\"></a>\n"
msgid "Manual upgrade using <span class=\"application\">Tails Installer</span>\n"
msgstr "Installation manuelle avec l'<span class=\"application\">Installeur de Tails</span>\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes.fr\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
msgstr "Elles peuvent également contenir des <strong>instructions spéciales pour la mise à jour</strong>.\n"
#. type: Plain text
msgid ""
"It might not always be possible to do an automatic upgrade as described "
......@@ -546,6 +511,29 @@ msgstr ""
msgid " </div>\n"
msgstr " </div>\n"
#~ msgid ""
#~ "<p>We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes\" raw=\"yes\"]]\n"
#~ "for the latest version. They document all the changes in this new version:</p>\n"
#~ msgstr ""
#~ "<p>Nous vous recommandons de lire les [[!inline pages=\"inc/stable_i386_release_notes.fr\" raw=\"yes\"]]\n"
#~ "de la dernière version. Elles documentent tous les changements de cette nouvelle version :</p>\n"
#~ msgid ""
#~ "<ul>\n"
#~ " <li>new features</li>\n"
#~ " <li>bugs that were solved</li>\n"
#~ " <li>known issues that have already been identified</li>\n"
#~ "</ul>\n"
#~ msgstr ""
#~ "<ul>\n"
#~ " <li>nouvelles fonctionnalités</li>\n"
#~ " <li>bugs qui ont été corrigés</li>\n"
#~ " <li>problèmes connus qui ont déjà été identifiés</li>\n"
#~ "</ul>\n"
#~ msgid "They might also contain <strong>special instructions for upgrading</strong>.\n"
#~ msgstr "Elles peuvent également contenir des <strong>instructions spéciales pour la mise à jour</strong>.\n"
#~ msgid "Clone & Upgrade\n"
#~ msgstr "Cloner & Mettre à jour\n"
......
[[!meta title="Upgrading a Tails USB stick or SD card"]]
Tails includes an automatic mechanism to upgrade a USB stick or a SD card to
newer versions. When it is not possible to do this **automatic upgrade**, it is
possible to do a **manual upgrade**. This page describes both techniques.
Tails includes an automatic mechanism to upgrade a USB stick to
a newer version. In some cases, it is impossible to do an **automatic upgrade**
and you might have to do a **manual upgrade**. This page describes both techniques.
<div class="caution">
......@@ -17,10 +17,10 @@ persistent storage on the device will be preserved.**
<div class="note">
If you use Tails from a DVD or if your Tails device was not installed using
<span class="application">Tails Installer</span>, it is not possible to upgrade
and you need to follow our [[installation instructions|download#media]] again
with the new ISO image.
<p>If you use Tails from a DVD, you need to [[burn a new DVD|install/dvd]].</p>
<p>If you use Tails from a USB stick installed from Mac OS X using the
command line, you need to [[reinstall|install/mac/usb/overview]].</p>
</div>
......@@ -91,21 +91,7 @@ command:</p>
</div>
<div class="tip">
<!-- Note for translators: make sure that the translation of this string
integrates well with /inc/stable_i386_release_notes. -->
<p>We recommend you to read the [[!inline pages="inc/stable_i386_release_notes" raw="yes"]]
for the latest version. They document all the changes in this new version:</p>
<ul>
<li>new features</li>
<li>bugs that were solved</li>
<li>known issues that have already been identified</li>
</ul>
</div>
[[!inline pages="doc/first_steps/upgrade/release_notes.inline" raw="yes"]]
If an error occurs, the assistant proposes you to read one of the following
pages:
......@@ -122,20 +108,14 @@ pages:
Manual upgrade using <span class="application">Tails Installer</span>
=====================================================================
<div class="tip">
[[!inline pages="doc/first_steps/upgrade.release_notes" raw="yes"]]
They might also contain <strong>special instructions for upgrading</strong>.
</div>
[[!inline pages="doc/first_steps/upgrade/release_notes.inline" raw="yes"]]
<div class="note">
If you use Tails from a DVD or if your Tails device was not installed using
<span class="application">Tails Installer</span>, it is not possible to upgrade
and you need to follow our [[installation instructions|download#media]] again