Commit 08334183 authored by Tails developers's avatar Tails developers

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

parents 4d81fa4d 48f05fd4
......@@ -43,8 +43,6 @@ Resources
Doesn't work with Tails at the moment, but that's a frequent request
to upstream. Upstream is working on fixing this. That would allow
starting Tails on Mac UEFI.
* Mike Hommey's
[Debian EFI mode boot on a Macbook Pro, without rEFIt](http://glandium.org/blog/?p=2830)
* Steve McIntyre's EFI installation progress:
- [[!debpkg debian-cd]] 3.1.11 has x86 EFI support, see the
`debian/changelog` for details
......@@ -102,12 +100,6 @@ Resources
Matthew Garrett:
* [Secure Boot bootloader for distributions available now](http://mjg59.dreamwidth.org/20303.html)
* detailed [the ISO images for Fedora 17 installation
CD](http://mjg59.dreamwidth.org/11285.html) and [their Mac
support](http://mjg59.dreamwidth.org/12037.html): it supports BIOS,
UEFI, Mac platforms when burned to a CD or written directly to a USB
stick. This might be nice for the ISO that Tails distribute, but not
applicable to support USB sticks with incremental updates.
* [An overview of Fedora's Secure Boot implementation](http://mjg59.dreamwidth.org/18945.html)
More technical details:
......@@ -127,6 +119,22 @@ There is then two big area that needs work to support EFI:
Later
=====
EFI boot on Mac without rEFInd
------------------------------
This is not a requirement of ours for the first iteration, but could
be a nice future improvement.
* Mike Hommey's
[Debian EFI mode boot on a Macbook Pro, without
rEFIt](http://glandium.org/blog/?p=2830).
* Matthew Garrett detailed [the ISO images for Fedora 17 installation
CD](http://mjg59.dreamwidth.org/11285.html) and [their Mac
support](http://mjg59.dreamwidth.org/12037.html): it supports BIOS,
UEFI, Mac platforms when burned to a CD or written directly to a USB
stick. This might be nice for the ISO that Tails distribute, but not
applicable to support USB sticks with incremental updates.
Secure Boot
-----------
......@@ -135,10 +143,97 @@ Secure Boot
Test results
============
Prerequisite: Tails with an amd64 kernel (e.g. from current
experimental branch).
grub-efi
--------
Tested with grub-efi 2.00-22 from Debian unstable.
sudo apt-get install grub-efi-amd64-bin
# make the system partition an *EFI System Partition* (ESP)
parted "$TAILS_DEVICE" set 1 boot on
MODULES="
all_video
bitmap
bitmap_scale
boot
btrfs
bufio
cat
chain
configfile
crypto
echo
efifwsetup
efi_gop
efinet
efi_uga
ext2
extcmd
fat
font
gettext
gfxmenu
gfxterm
gzio
halt
hfsplus
iso9660
jpeg
keystatus
linux
linuxefi
loadenv
memdisk
minicmd
normal
part_apple
part_gpt
part_msdos
password_pbkdf2
png
read
reboot
search
search_fs_file
search_fs_uuid
search_label
sleep
terminal
test
trig
video
video_fb
"
mkdir -p "$TAILS_MOUNTPOINT"/{boot/grub,EFI/BOOT} && \
grub-mkimage --output="$TAILS_MOUNTPOINT"/EFI/BOOT/bootx64.efi \
--format x86_64-efi $MODULES
cat > "$TAILS_MOUNTPOINT"/boot/grub/grub.cfg <<EOF
menuentry Tails --class start {
echo $"Loading Tails..."
linux /live/vmlinuz2 initrd=/live/initrd2.img boot=live config live-media=removable nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin module=Tails quiet
initrd /live/initrd2.img
}
EOF
* boots on ThinkPenguin Royal
* boots on Macbook 13-inch Mid-2012 with rEFInd; one has to choose
*Fallback boot loader from Tails* in rEFInd, *Boot Linux from Tails*
does nothing at all
syslinux
--------
sudo apt-get install syslinux/experimental syslinux-common/experimental
Tested with syslinux 6.02+dfsg-1.
sudo apt-get install syslinux/experimental \
syslinux-common/experimental isolinux/experimental
# make the system partition an *EFI System Partition* (ESP)
parted "$TAILS_DEVICE" set 1 boot on
......@@ -147,11 +242,13 @@ syslinux
cp /usr/lib/SYSLINUX/efi64/syslinux.efi \
"$TAILS_MOUNTPOINT"/EFI/BOOT/bootx64.efi && \
cp "$TAILS_MOUNTPOINT"/syslinux/* "$TAILS_MOUNTPOINT"/EFI/BOOT/ & \
cp /usr/lib/syslinux/modules/efi64/* "$TAILS_MOUNTPOINT"/EFI/BOOT/
/bin/cp -f /usr/lib/syslinux/modules/efi64/* "$TAILS_MOUNTPOINT"/EFI/BOOT/
* boots on ThinkPad X220, X230, ThinkPenguin Royal
* does not boot on MacBook Pro 13-inc Mid 2012
* boots on ThinkPad X220 (syslinux 6.02+dfsg-1)
* boots on X230 (syslinux 6.02+dfsg-1)
* boots on ThinkPenguin Royal (syslinux 6.02+dfsg-1 and 6.03~pre1+dfsg-1)
* does not boot on MacBook Pro 13-inc Mid 2012 without rEFInd (expected)
* boots on MacBook Pro 13-inc Mid 2012 with rEFInd *if* `menu
background splash.png` is removed from `stdmenu.cfg`
* kexec'd kernel on shutdown freezes the X220, X230 and MacBook Pro
13-inc Mid 2012
background splash.png` is removed from `stdmenu.cfg`; one has to
choose *Fallback boot loader from Tails* in rEFInd, *Boot Linux from
Tails* does nothing at all (syslinux 6.02+dfsg-1 and 6.03~pre1+dfsg-1)
This diff is collapsed.
[[!toc levels=2]]
**Parent ticket**: [[!tails_ticket 6354]]
# Installation
This is currently easiest to set up (to avoid backporting, see below)
......@@ -20,6 +22,7 @@ building (see below).
and then have it backported to Wheezy.
Also, some of `vagrant-libvirt`'s dependencies are too old in Wheezy:
* `ruby-fog >= 1.10.0`: Sid has 1.12.1 and backporting is trivial
(i.e. just rebuild in a Wheezy chroot).
* `vagrant >= 1.1`: Sid has 1.2.2, backporting is trivial but also
......@@ -100,8 +103,8 @@ there's a Ruby gem). Having the next version of `veewee` in Debian
Until a `vagrant-libvirt`-compatible `veewee` is released, basebox
building won't be fully automatic using `rake` any more. One will have
to pick either of steps `1.{a,b,c}` below to create a disk image, and
then step `2` to package it into a `.box` (personally I went with `1c
+ 2` as that doesn't require any fiddling with Ruby gems):
then step `2` to package it into a `.box` (personally I went with
`1c + 2` as that doesn't require any fiddling with Ruby gems):
### 1.a How to fix images built with veewee 0.3.7 using KVM
......
......@@ -7,10 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2013-11-30 22:48+0100\n"
"PO-Revision-Date: 2013-10-13 17:16-0000\n"
"PO-Revision-Date: 2013-12-20 19:33+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -19,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Contributing to Tails\"]]\n"
msgstr "[[!meta title=\"Contribuer à Tails\"]]\n"
msgstr "[[!meta title=\"Participer à Tails\"]]\n"
#. type: Plain text
msgid ""
......@@ -27,9 +26,12 @@ msgid ""
"whatever you bring to this community will be appreciated. So read on to "
"find out how you can make a difference in Tails."
msgstr ""
"Il existe de nombreuses manières de participer à Tails. Trouvez ci-dessous "
"le moyen pour vous de contribuer à Tails, toute participation est la "
"bienvenue ! "
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
#| msgid ""
#| "<div class=\"contribute-roles-1\">\n"
#| "<h2>User</h2>\n"
......@@ -57,8 +59,9 @@ msgstr ""
"<div class=\"contribute-roles-1\">\n"
"<h2>Utilisateur</h2>\n"
"<div class=\"contribute-role\" id=\"user\">\n"
" <p>Tout utilisateur peut aider les autres ou fournir des informations utiles aux développeurs.</p>\n"
" <ul>\n"
" <li>[[Rapporter des bugs|doc/first_steps/bug_reporting]]</li>\n"
" <li>[[Rapporter des erreurs|doc/first_steps/bug_reporting]]</li>\n"
" <li>[[Fournir des informations nécessaires aux développeurs|contribute/how/input]]</li>\n"
" <li>[[Aider les autres utilisateurs de Tails|contribute/how/help]]</li>\n"
" </ul>\n"
......@@ -66,16 +69,7 @@ msgstr ""
"</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "<div class=\"contribute-roles-1\">\n"
#| "<h2>Donate</h2>\n"
#| "<div class=\"contribute-role\" id=\"donate\">\n"
#| " <ul>\n"
#| " <li>[[Make a donation|contribute/how/donate]]</li>\n"
#| " </ul>\n"
#| "</div>\n"
#| "</div>\n"
#, no-wrap
msgid ""
"<div class=\"contribute-roles-1\">\n"
"<h2>Donate</h2>\n"
......@@ -90,6 +84,7 @@ msgstr ""
"<div class=\"contribute-roles-1\">\n"
"<h2>Donner</h2>\n"
"<div class=\"contribute-role\" id=\"donate\">\n"
" <p> Faire un don accélère le développement de Tails.</p>\n"
" <ul>\n"
" <li>[[Faire un don|contribute/how/donate]]</li>\n"
" </ul>\n"
......@@ -97,7 +92,7 @@ msgstr ""
"</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
#| msgid ""
#| "<div class=\"contribute-roles-3\">\n"
#| "<h2>Contribute with your language skills</h2>\n"
......@@ -149,9 +144,10 @@ msgid ""
"</div>\n"
msgstr ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribuer selon vos compétences linguistiques</h2>\n"
"<h2>Participer grâce à vos compétences linguistiques</h2>\n"
"<div class=\"contribute-role\" id=\"content-writer\">\n"
" <h3>Écrire</h3>\n"
" <p>Une bonne plume peut rendre Tails accessible à davantage de monde.</p>\n"
" <ul>\n"
" <li>[[Améliorer la documentation|contribute/how/documentation]]</li>\n"
" <li>[[Écrire des communiqués de presse|contribute/how/promote]]</li>\n"
......@@ -159,12 +155,14 @@ msgstr ""
"</div>\n"
"<div class=\"contribute-role\" id=\"translator\">\n"
" <h3>Traduire</h3>\n"
" <p>Les traductions permettent à davantage de monde d'utiliser Tails.</p>\n"
" <ul>\n"
" <li>[[Améliorer Tails dans votre propre langue|contribute/how/translate]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"speaker\">\n"
" <h3>Parler</h3>\n"
" <p>Parler de Tails permet de le faire connaitre à toutes sortes de publics.</p>\n"
" <ul>\n"
" <li>[[Parler lors d'événements|contribute/how/promote]]</li>\n"
" </ul>\n"
......@@ -172,33 +170,7 @@ msgstr ""
"</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "<div class=\"contribute-roles-3\">\n"
#| "<h2>Contribute with your technical skills</h2>\n"
#| "<div class=\"contribute-role\" id=\"developer\">\n"
#| " <h3>Software developer</h3>\n"
#| " <ul>\n"
#| " <li>[[Fix a bug|contribute/how/code]]</li>\n"
#| " <li>[[Implement a feature|contribute/how/code]]</li>\n"
#| " </ul>\n"
#| "</div>\n"
#| "<div class=\"contribute-role\" id=\"sysadmin\">\n"
#| " <h3>System administrator</h3>\n"
#| " <ul>\n"
#| " <li>[[Run a BitTorrent seed|contribute/how/mirror]]</li>\n"
#| " <li>[[Run a HTTP mirror|contribute/how/mirror]]</li>\n"
#| " </ul>\n"
#| "</div>\n"
#| "<div class=\"contribute-role\" id=\"designer\">\n"
#| " <h3>Designer</h3>\n"
#| " <ul>\n"
#| " <li>[[Improve the website|contribute/how/website]]</li>\n"
#| " <li>[[Design graphics|contribute/how/graphics]]</li>\n"
#| " <li>[[Improve the Tails user interface|contribute/how/user_interface]]</li>\n"
#| " </ul>\n"
#| "</div>\n"
#| "</div>\n"
#, no-wrap
msgid ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribute with your technical skills</h2>\n"
......@@ -230,8 +202,9 @@ msgid ""
"</div>\n"
msgstr ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribuer selon vos compétences techniques</h2>\n"
"<h2>Participer grâce à vos compétences techniques</h2>\n"
"<div class=\"contribute-role\" id=\"developer\">\n"
" <p>Toutes sortes de compétences techniques peuvent contribuer à améliorer Tails.</p>\n"
" <h3>Développement logiciel</h3>\n"
" <ul>\n"
" <li>[[Corriger un bug|contribute/how/code]]</li>\n"
......@@ -240,6 +213,7 @@ msgstr ""
"</div>\n"
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
" <h3>Administration système</h3>\n"
" <p>Les administrateurs systèmes peuvent participer à l'infrastructure sur laquelle repose Tails.</p>\n"
" <ul>\n"
" <li>[[Faire tourner un mirroir BitTorrent|contribute/how/mirror]]</li>\n"
" <li>[[Faire tourner un mirroir HTTP|contribute/how/mirror]]</li>\n"
......@@ -247,8 +221,11 @@ msgstr ""
"</div>\n"
"<div class=\"contribute-role\" id=\"designer\">\n"
" <h3>Designer</h3>\n"
" <p>Un bon design peut rendre Tails plus attirant et plus facile à utiliser.</p>\n"
" <ul>\n"
" <li>[[Améliorer le site web|contribute/how/website]]</li>\n"
" <li>[[Participer au graphisme|contribute/how/graphics]]</li>\n"
" <li>[[Améliorer l'interface graphique pour l'utilisateur|contribute/how/user_interface]]</li>\n"
" </ul>\n"
"</div>\n"
"</div>\n"
......
......@@ -26,7 +26,9 @@ Then, please run:
$ git clone git://git.tails.boum.org/tails
$ cd tails
$ git checkout devel
$ export TAILS_BUILD_OPTIONS="noproxy"
$ rake build
$ unset TAILS_BUILD_OPTIONS
The first time, this can take a little while to download the base virtual
machine from Tails mirror (around 300 MB). It will then boot the machine,
......
......@@ -32,12 +32,17 @@ The words
next release of Tails but fixes for serious bug and security
issues;
- the beginning of the said phase.
* **IUK**: Incremental Upgrade Kit, see
[[contribute/design/incremental_upgrades]]
* **Release manager**: see the [[definition of this shifting
role|contribute/working_together/roles/release_manager]]
* **RM**: see Release Manager
* **t-p-s**: `tails-persistence-setup`, AKA the [[Persistent Volume
Assistant|doc/first_steps/persistence/configure]].
* **WAN**: see Welcome and annoying nitpicker
* **WB**: WhisperBack. See *3.5 Feedback* in the
[[contribute/design]] document.
* **WB**: see WhisperBack.
* **WhisperBack**: see *3.5 Feedback* in the [[contribute/design]]
document.
* **Welcome and annoying nitpicker**: see the [[definition of this
shifting
role|contribute/working_together/roles/welcome_and_annoying_nitpicker]]
......@@ -52,29 +52,21 @@ relevant tag of Tails' perl5lib):
RELEASE_TESTING=1 PERL5LIB=/home/user/tails/perl5lib/lib fakeroot dzil test
Build an upstream tarball:
Build an upstream tarball, tag the release, move the tarball out of
the build repository and cleanup:
dzil build
Tag the release:
git tag -s $VERSION -m "tails-persistent-setup $VERSION"
Move the tarball out of the build repository and cleanup:
mv Tails-Persistence-*.tar.gz .. && \
dzil build && \
git tag -s $VERSION -m "tails-persistent-setup $VERSION" && \
mv Tails-Persistence-*.tar.gz .. && \
rm -rf Tails-Persistence-* .build po/*.mo
Update the Debian package
=========================
Checkout the branch with Debian package specifics:
git checkout debian
Import the new upstream tarball:
Checkout the Debian packaging branch and import the new upstream tarball:
git-import-orig --upstream-vcs-tag=$VERSION ../Tails-Persistence-$VERSION.tar.gz
git checkout debian && \
git-import-orig --upstream-vcs-tag=$VERSION ../Tails-Persistence-$VERSION.tar.gz
Update `debian/changelog`:
......
......@@ -5,15 +5,15 @@
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: \n"
"POT-Creation-Date: 2013-10-14 14:12+0300\n"
"PO-Revision-Date: 2012-10-18 08:41-0000\n"
"PO-Revision-Date: 2013-12-09 22:05-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"Language-Team: <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
#, no-wrap
......@@ -231,6 +231,9 @@ msgid ""
"you can activate the <span class=\"guilabel\">[[GnuPG persistent volume\n"
"feature|doc/first_steps/persistence/configure/#gnupg]]</span>.\n"
msgstr ""
"Pour stocker vos clés GnuPG et configuration entre différentes session de travail,\n"
"vous pouvez activer l'<span class=\"guilabel\">[[option de persistance pour GnuPG|doc\n"
"/first_steps/persistence/configure/#gnupg]]</span>.\n"
#. type: Plain text
#, no-wrap
......
......@@ -7,13 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: sACKAGE VERSION\n"
"POT-Creation-Date: 2013-10-14 14:12+0300\n"
"PO-Revision-Date: 2012-10-18 09:35-0000\n"
"PO-Revision-Date: 2013-12-09 22:04-0000\n"
"Last-Translator: \n"
"Language-Team: sLANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
#, no-wrap
......@@ -257,6 +257,9 @@ msgid ""
"you can activate the <span class=\"guilabel\">[[GnuPG persistent volume\n"
"feature|doc/first_steps/persistence/configure/#gnupg]]</span>.\n"
msgstr ""
"Pour stocker vos clés GnuPG et configuration entre différentes session de travail,\n"
"vous pouvez activer l'<span class=\"guilabel\">[[option de persistance pour GnuPG|doc\n"
"/first_steps/persistence/configure/#gnupg]]</span>.\n"
#. type: Plain text
#, no-wrap
......
......@@ -7,10 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2013-11-29 15:53+0100\n"
"PO-Revision-Date: 2013-10-28 00:49-0000\n"
"PO-Revision-Date: 2013-12-20 19:31+0100\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -60,22 +59,29 @@ msgid ""
"automatically to those more secure persistent volume settings. To do this "
"upgrade, once and for all:"
msgstr ""
"Nous avons mis en place un mécanisme de migration qui vous permet, dans la "
"plupart des cas, de mettre à jour automatiquement vers des paramètres de "
"persistance plus sûrs. Pour faire cette mise à jour, une bonne fois pour "
"toute :"
#. type: Bullet: '1. '
msgid "**Start Tails 0.21**."
msgstr ""
msgstr "**Démarrez Tails 0.21**."
#. type: Bullet: '2. '
msgid ""
"**Enable persistence** without the read-only option. Activating the read-"
"only option prevents Tails from starting correctly until the upgrade is made."
msgstr ""
"**Activez la persistance** sans l'option lecture-seule. Activer cette option "
"empêcherait Tails de démarrer correctement jusqu'à ce que la mise à jour "
"soit effectuée."
#. type: Bullet: '3. '
msgid ""
"If the upgrade is successful, Tails starts as usual and no notification "
"appears."
msgstr ""
msgstr "Si la mise à jour s'est effectuée avec succès, Tails démarre comme d'habitude et aucune notification n'apparaît."
#. type: Plain text
msgid "But this automatic upgrade might not be sufficient in some cases."
......@@ -93,15 +99,24 @@ msgid ""
" For security reasons the automatic upgrade is not available in Tails 0.22 or\n"
" later.\n"
msgstr ""
"a. **Si vous n'avez pas mis à jour vers Tails 0.21 et utilisé directement Tails 0.22\n"
" ou supérieure**, installez [Tails 0.21](http://dl.amnesia.boum.org/tails/obsolete/)\n"
" pour exécuter la mise à jour automatique, ou suivez les instructions pour [[copier\n"
" votre volume persistant vers un nouveau périphérique|copy]].\n"
" Pour des raisons de sécurité, la mise à jour automatique n'est pas disponible dans\n"
" Tails 0.22 ou supérieure.\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
#| msgid "**If you have custom persistence settings or use [[additional software packages|configure#additional_software]]**, the corresponding settings are not upgraded automatically."
msgid ""
"b. **If you have custom persistence settings or use\n"
" [[additional software packages|configure#additional_software]]**, the\n"
" corresponding settings are not upgraded automatically.\n"
msgstr "**Si vous utilisez des paramètres de persistance personnalisés ou la [[persistance pour les logiciels additionnels|configure#additional_software]]**, les paramètres correspondants ne sont pas mis à jour automatiquement."
msgstr ""
"**Si vous utilisez des paramètres de persistance personnalisés ou\n"
"la [[persistance pour les logiciels additionnels|configure#additional_software]]**, les\n"
"paramètres correspondants ne sont pas mis à jour automatiquement.\n"
#. type: Plain text
#, no-wrap
......@@ -122,7 +137,7 @@ msgid " <div class=\"caution\">\n"
msgstr " <div class=\"caution\">\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
#| msgid ""
#| " If you have custom persistence settings or use additional software\n"
#| " but no notification appear on the desktop, then your Tails system\n"
......@@ -138,7 +153,7 @@ msgstr ""
" persistance pour les logiciels additionnels et qu'aucun message n'apparaît\n"
" au démarrage, il est possible que votre Tails soit corrompu.\n"
" Dans ce cas, suivez les instructions pour [[copier manuellement\n"
" vos données persistantes vers un nouveau périphérique|upgrade#new_device]].\n"
" vos données persistantes vers un nouveau périphérique|copy]].\n"
#. type: Plain text
#, no-wrap
......@@ -146,14 +161,18 @@ msgid " </div>\n"
msgstr " </div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#, no-wrap
#| msgid "**If you have good reasons to think that your persistence settings are corrupted** or if you want to be extra careful, then follow the instructions to [[manually copy your persistent data to a new device|upgrade#new_device]]."
msgid ""
"c. **If you have good reasons to think that your persistence settings\n"
" are corrupted** or if you want to be extra careful, then follow the\n"
" instructions to [[manually copy your persistent data to a new\n"
" device|copy]].\n"
msgstr "**Si vous avez de bonnes raisons de penser que vos paramètres de persistance sont corrompus** ou si vous souhaitez prendre cette précaution, suivez les instructions pour [[copier manuellement vos données persistantes vers un nouveau périphérique|upgrade#new_device]]."
msgstr ""
"**Si vous avez de bonnes raisons de penser que vos paramètres de persistance\n"
"sont corrompus** ou si vous souhaitez prendre cette précaution, suivez\n"
"les instructions pour [[copier manuellement vos données persistantes vers un\n"
"nouveau périphérique|copy]].\n"
#. type: Plain text
#, no-wrap
......@@ -322,7 +341,6 @@ msgstr ""
"si nécessaire."
#. type: Bullet: '1. '
#, fuzzy
#| msgid ""
#| "Follow the instructions to [[manually copy your persistent data to a new "
#| "device|upgrade#new_device]]."
......@@ -331,7 +349,7 @@ msgid ""
"device|copy]]."
msgstr ""
"Suivez les instructions pour [[copier manuellement vos données persistantes "
"vers un nouveau périphérique|upgrade#new_device]]."
"vers un nouveau périphérique|copy]]."
#. type: Plain text
#, no-wrap
......@@ -450,7 +468,9 @@ msgstr ""
#~ msgstr "<div id=\"new_device\">\n"
#~ msgid "Manually copying your persistent data to a new device\n"
#~ msgstr "Copier manuellement vos données persistantes vers un nouveau périphérique\n"
#~ msgstr ""
#~ "Copier manuellement vos données persistantes vers un nouveau "
#~ "périphérique\n"
#~ msgid ""
#~ "These instructions explain how to manually copy your persistent data to a "
......@@ -515,7 +535,8 @@ msgstr ""
#~ " <span class=\"guisubmenu\">Outils système</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Utilitaire de disque</span>\n"
#~ " </span>\n"
#~ " pour ouvrir l'<span class=\"application\">utilitaire de disque GNOME</span>.\n"
#~ " pour ouvrir l'<span class=\"application\">utilitaire de disque GNOME</"
#~ "span>.\n"
#~ msgid ""
#~ "In the left panel, click on the device corresponding to the old Tails "
......@@ -582,7 +603,8 @@ msgstr ""
#~ " <span class=\"guimenuitem\">New Tab</span>\n"
#~ " </span>\n"
#~ " and navigate to\n"
#~ " <span class=\"filename\">/live/persistence/TailsData_unlocked</span> in\n"
#~ " <span class=\"filename\">/live/persistence/TailsData_unlocked</span> "
#~ "in\n"
#~ " this new tab.\n"
#~ msgstr ""
#~ "1. Dans le navigateur de fichier, choisissez\n"
......@@ -591,7 +613,8 @@ msgstr ""
#~ " <span class=\"guimenuitem\">Nouvel onglet</span>\n"
#~ " </span>\n"
#~ " et naviguez jusqu'au dossier\n"
#~ " <span class=\"filename\">/live/persistence/TailsData_unlocked</span> dans\n"
#~ " <span class=\"filename\">/live/persistence/TailsData_unlocked</span> "
#~ "dans\n"
#~ " ce nouvel onglet.\n"
#~ msgid "Click on the <span class=\"guilabel\">TailsData</span> tab."
......@@ -631,8 +654,8 @@ msgstr ""
#~ msgid ""
#~ "The <span class=\"filename\">bookmarks</span> folder corresponds to the "
#~ "<span class=\"guilabel\">[[Browser bookmarks|"
#~ "configure#browser_bookmarks]]</span> persistence feature."
#~ "<span class=\"guilabel\">[[Browser bookmarks|configure#browser_bookmarks]]"
#~ "</span> persistence feature."
#~ msgstr ""
#~ "Le dossier <span class=\"filename\">bookmarks</span> correspond à "
#~ "l'option de persistance <span class=\"guilabel\">[[Marque-pages du "
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-12-11 16:56+0100\n"
"POT-Creation-Date: 2013-12-20 18:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -200,9 +200,11 @@ msgstr ""
#. type: Plain text
msgid ""
"The following USB sticks have issues starting Tails. They require removing "
"the `live-media=removable` boot parameter, which [[is dangerous|doc/"
"first_steps/bug_reporting/tails_does_not_start#entirely]]."
"The following USB sticks have issues starting Tails. They are configured by "
"the manufacturer as a fixed disk, and not as a removable disk. As a "
"consequence, they require removing the `live-media=removable` boot "
"parameter, which [[is dangerous|doc/first_steps/bug_reporting/"
"tails_does_not_start#entirely]]."
msgstr ""
#. type: Bullet: '* '
......@@ -218,7 +220,7 @@ msgid "SanDisk Cruzer Force 8GB"
msgstr ""
#. type: Bullet: '* '
msgid "SanDisk Cruzer Glide 8GB and 16GB"
msgid "SanDisk Cruzer Glide 4GB, 8GB and 16GB"
msgstr ""
#. type: Bullet: '* '
......@@ -229,6 +231,16 @@ msgstr ""
msgid "SanDisk Cruzer USB 3.0 64GB"
msgstr ""
#. type: Plain text
msgid ""
"SanDisk had begun the production of flash drives configured as fixed disk in "
"2012 to meet new requirements for Windows 8 Certification. The flash drives "
"that comply with this certification will have the Windows 8 logo on their "
"packaging. If a flash drive does not have the Windows 8 logo on its "
"packaging, then that drive will function as a removable disk about should "
"work with Tails."
msgstr ""
#. type: Plain text
msgid "See also [[!tails_ticket 6397]]."
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-12-11 16:56+0100\n"
"POT-Creation-Date: 2013-12-20 18:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -200,9 +200,11 @@ msgstr ""
#. type: Plain text
msgid ""
"The following USB sticks have issues starting Tails. They require removing "
"the `live-media=removable` boot parameter, which [[is dangerous|doc/"
"first_steps/bug_reporting/tails_does_not_start#entirely]]."
"The following USB sticks have issues starting Tails. They are configured by "
"the manufacturer as a fixed disk, and not as a removable disk. As a "
"consequence, they require removing the `live-media=removable` boot "
"parameter, which [[is dangerous|doc/first_steps/bug_reporting/"
"tails_does_not_start#entirely]]."
msgstr ""
#. type: Bullet: '* '
......@@ -218,7 +220,7 @@ msgid "SanDisk Cruzer Force 8GB"
msgstr ""
#. type: Bullet: '* '
msgid "SanDisk Cruzer Glide 8GB and 16GB"
msgid "SanDisk Cruzer Glide 4GB, 8GB and 16GB"
msgstr ""
#. type: Bullet: '* '
......@@ -229,6 +231,16 @@ msgstr ""
msgid "SanDisk Cruzer USB 3.0 64GB"
msgstr ""
#. type: Plain text
msgid ""
"SanDisk had begun the production of flash drives configured as fixed disk in "
"2012 to meet new requirements for Windows 8 Certification. The flash drives "
"that comply with this certification will have the Windows 8 logo on their "
"packaging. If a flash drive does not have the Windows 8 logo on its "
"packaging, then that drive will function as a removable disk about should "
"work with Tails."
msgstr ""
#. type: Plain text
msgid "See also [[!tails_ticket 6397]]."
msgstr ""
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-12-11 16:56+0100\n"
"POT-Creation-Date: 2013-12-20 18:02+0100\n"
"PO-Revision-Date: 2013-09-24 09:56-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <[email protected]>\n"
......@@ -234,10 +234,17 @@ msgid "Problematic USB sticks\n"
msgstr "Clés USB problématiques\n"
#. type: Plain text