summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyril Brulebois <ckb@riseup.net>2019-05-17 15:27:35 +0200
committerCyril Brulebois <ckb@riseup.net>2019-05-17 15:27:35 +0200
commitf173fab62e515b5b457742145ca0a3118c25841d (patch)
tree2b771fa9fe07ce506a95890ee4a6306148031cfc
parenta7a5403a864a766703274fbc15ae243971e1d6bb (diff)
parent198c9a3e13e37ec2b67f6fd5306465b5050fa364 (diff)
Merge branch 'feature/15291-remove-software' into stable (Fix-committed: #15291).
-rw-r--r--config/chroot_apt/preferences4
-rwxr-xr-xconfig/chroot_local-hooks/04-change-gids-and-uids21
-rwxr-xr-xconfig/chroot_local-hooks/06-adduser_clearnet3
-rwxr-xr-xconfig/chroot_local-hooks/06-adduser_htp3
-rwxr-xr-xconfig/chroot_local-hooks/06-adduser_tails-iuk-get-target-file3
-rwxr-xr-xconfig/chroot_local-hooks/06-adduser_tails-upgrade-frontend3
-rwxr-xr-xconfig/chroot_local-hooks/06-adduser_tor-launcher3
-rwxr-xr-xconfig/chroot_local-hooks/07-adduser_tails-install-iuk3
-rwxr-xr-xconfig/chroot_local-hooks/09-torsocks-apps2
-rw-r--r--config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing15
-rw-r--r--config/chroot_local-includes/etc/environment3
-rw-r--r--config/chroot_local-includes/etc/ferm/ferm.conf5
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/group1
-rw-r--r--config/chroot_local-includes/usr/share/tails/build/passwd1
-rw-r--r--config/chroot_local-packageslists/tails-common.list18
-rw-r--r--features/step_definitions/tor.rb24
-rw-r--r--features/tor_stream_isolation.feature21
-rw-r--r--wiki/src/contribute/design.mdwn4
-rw-r--r--wiki/src/contribute/roadmap.mdwn2
-rw-r--r--wiki/src/doc/about/features.mdwn13
-rw-r--r--wiki/src/doc/advanced_topics.index.mdwn1
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.de.po92
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.es.po111
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.fa.po110
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.fr.po93
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.it.po83
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.mdwn27
-rw-r--r--wiki/src/doc/advanced_topics/paperkey.pt.po87
-rw-r--r--wiki/src/doc/encryption_and_privacy.index.mdwn1
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.de.po148
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.es.po145
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.fa.po159
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.fr.po145
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.it.po117
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.mdwn51
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.pt.po119
-rw-r--r--wiki/src/doc/sensitive_documents/metadata.mdwn6
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.mdwn6
38 files changed, 32 insertions, 1621 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index e09367c..4b181c6 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -158,10 +158,6 @@ Package: xul-ext-torbirdy
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
-Package: pdf-redact-tools
-Pin: release o=Debian,n=sid
-Pin-Priority: 999
-
Explanation: weirdness in chroot_apt install-binary
Package: *
Pin: release o=chroot_local-packages
diff --git a/config/chroot_local-hooks/04-change-gids-and-uids b/config/chroot_local-hooks/04-change-gids-and-uids
index a8c5087..7320916 100755
--- a/config/chroot_local-hooks/04-change-gids-and-uids
+++ b/config/chroot_local-hooks/04-change-gids-and-uids
@@ -95,13 +95,20 @@ Change_gid () {
fi
}
-# Temporarily give these groups a GID that's out of the way, to avoid collisions
+# Temporarily give these users and groups a UID/GID that's out of the way,
+# to avoid collisions
+Change_uid debian-tor 1070
+Change_uid speech-dispatcher 1080
+Change_uid colord 1090
+Change_uid saned 1100
+Change_uid pulse 1110
+Change_uid hplip 1120
+Change_uid Debian-gdm 1130
Change_gid messagebus 1050
Change_gid ssh 1090
Change_gid memlockd 1100
Change_gid ssl-cert 1110
Change_gid vboxsf 1120
-Change_gid monkeysphere 1130
Change_gid debian-tor 1140
Change_gid lpadmin 1150
Change_gid scanner 1160
@@ -113,13 +120,19 @@ Change_gid Debian-gdm 1210
Change_gid kvm 1500
Change_gid render 1510
-# Finally, give these groups the desired GID
+# Finally, give these users and groups the desired UID/GID
+Change_uid debian-tor 107
+Change_uid speech-dispatcher 108
+Change_uid colord 109
+Change_uid saned 110
+Change_uid pulse 111
+Change_uid hplip 112
+Change_uid Debian-gdm 113
Change_gid messagebus 105
Change_gid ssh 109
Change_gid memlockd 110
Change_gid ssl-cert 111
Change_gid vboxsf 112
-Change_gid monkeysphere 113
Change_gid debian-tor 114
Change_gid lpadmin 115
Change_gid scanner 116
diff --git a/config/chroot_local-hooks/06-adduser_clearnet b/config/chroot_local-hooks/06-adduser_clearnet
index 00bd86c..2bd22db 100755
--- a/config/chroot_local-hooks/06-adduser_clearnet
+++ b/config/chroot_local-hooks/06-adduser_clearnet
@@ -9,4 +9,5 @@ set -e
echo "Creating the clearnet user"
-adduser --system --quiet --group clearnet
+addgroup --system --quiet --gid 123 clearnet
+adduser --system --quiet --uid 114 --gid 123 clearnet
diff --git a/config/chroot_local-hooks/06-adduser_htp b/config/chroot_local-hooks/06-adduser_htp
index 87e22fe..b5869df 100755
--- a/config/chroot_local-hooks/06-adduser_htp
+++ b/config/chroot_local-hooks/06-adduser_htp
@@ -9,4 +9,5 @@ set -e
echo "Creating the htp user"
-adduser --system --quiet --group --no-create-home htp
+addgroup --system --quiet --gid 124 htp
+adduser --system --quiet --uid 116 --gid 124 --no-create-home htp
diff --git a/config/chroot_local-hooks/06-adduser_tails-iuk-get-target-file b/config/chroot_local-hooks/06-adduser_tails-iuk-get-target-file
index d438f92..a1ef6eb 100755
--- a/config/chroot_local-hooks/06-adduser_tails-iuk-get-target-file
+++ b/config/chroot_local-hooks/06-adduser_tails-iuk-get-target-file
@@ -10,4 +10,5 @@ set -e
echo "Creating the tails-iuk-get-target-file user"
-adduser --system --quiet --group --no-create-home tails-iuk-get-target-file
+addgroup --system --quiet --gid 125 tails-iuk-get-target-file
+adduser --system --quiet --uid 117 --gid 125 --no-create-home tails-iuk-get-target-file
diff --git a/config/chroot_local-hooks/06-adduser_tails-upgrade-frontend b/config/chroot_local-hooks/06-adduser_tails-upgrade-frontend
index cf44e0a..89942d2 100755
--- a/config/chroot_local-hooks/06-adduser_tails-upgrade-frontend
+++ b/config/chroot_local-hooks/06-adduser_tails-upgrade-frontend
@@ -10,4 +10,5 @@ set -e
echo "Creating the tails-upgrade-frontend user"
-adduser --system --quiet --group --no-create-home tails-upgrade-frontend
+addgroup --system --quiet --gid 126 tails-upgrade-frontend
+adduser --system --quiet --uid 118 --gid 126 --no-create-home tails-upgrade-frontend
diff --git a/config/chroot_local-hooks/06-adduser_tor-launcher b/config/chroot_local-hooks/06-adduser_tor-launcher
index f7beab1..79f0bf9 100755
--- a/config/chroot_local-hooks/06-adduser_tor-launcher
+++ b/config/chroot_local-hooks/06-adduser_tor-launcher
@@ -9,5 +9,6 @@ set -e
echo "creating the tor-launcher user"
-adduser --system --quiet --group tor-launcher
+addgroup --system --quiet --gid 127 tor-launcher
+adduser --system --quiet --uid 119 --gid 127 tor-launcher
adduser tor-launcher debian-tor
diff --git a/config/chroot_local-hooks/07-adduser_tails-install-iuk b/config/chroot_local-hooks/07-adduser_tails-install-iuk
index c0a332c..de55a09 100755
--- a/config/chroot_local-hooks/07-adduser_tails-install-iuk
+++ b/config/chroot_local-hooks/07-adduser_tails-install-iuk
@@ -9,5 +9,6 @@ set -e
echo "Creating the tails-install-iuk user"
-adduser --system --quiet --group --no-create-home tails-install-iuk
+addgroup --system --quiet --gid 128 tails-install-iuk
+adduser --system --quiet --uid 120 --gid 128 --no-create-home tails-install-iuk
adduser tails-install-iuk tails-iuk-get-target-file
diff --git a/config/chroot_local-hooks/09-torsocks-apps b/config/chroot_local-hooks/09-torsocks-apps
index 3acc994..ad9a6f2 100755
--- a/config/chroot_local-hooks/09-torsocks-apps
+++ b/config/chroot_local-hooks/09-torsocks-apps
@@ -4,7 +4,7 @@ set -e
echo "Wrapping some applications with torsocks"
-APPS="gobby-0.5 openpgp-applet seahorse"
+APPS="openpgp-applet seahorse"
DBUS_SERVICES="org.gnome.seahorse.Application org.fedoraproject.Config.Printing"
WRAPPED_DBUS_SERVICES=""
diff --git a/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing b/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
index 5dc6a22..55e0a01 100644
--- a/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
+++ b/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing
@@ -26,21 +26,6 @@ rm /etc/console-setup/cached_setup_keyboard.sh
rm /var/cache/ldconfig/aux-cache
rm /var/lib/systemd/catalog/database
-# Delete non-deterministically generated files, that should not be shared among
-# all Tails systems anyway. We don't ship SSHd, so we don't bother generating
-# them at boot.
-# We remove with -f due to a suspected race condition: it seems that
-# .../authentication/sphere/S.gpg-agent can be removed (by gpg-agent?)
-# *right after* `rm -r` has listed it, so that when `rm` tries to
-# remove it, it doesn't exist any more and it fails.
-if [ -d /var/lib/monkeysphere/authentication/ ]; then
- rm -rf /var/lib/monkeysphere/authentication/
-else
- echo 'Cannot remove /var/lib/monkeysphere/authentication/:' \
- 'directory does not exist' >&2
- exit 1
-fi
-
# Empty non-deterministically generated file. If it exists and is empty, systemd
# will automatically set up a new unique ID. But if does not exist, systemd
# will populate /etc with preset unit settings, which will for example re-enable
diff --git a/config/chroot_local-includes/etc/environment b/config/chroot_local-includes/etc/environment
index 61b1165..afa3fab 100644
--- a/config/chroot_local-includes/etc/environment
+++ b/config/chroot_local-includes/etc/environment
@@ -3,9 +3,6 @@ NODE_PATH=/usr/local/lib/nodejs
SOCKS_SERVER=127.0.0.1:9050
SOCKS5_SERVER=127.0.0.1:9050
-# Port that the monkeysphere validation agent listens on
-MSVA_PORT='6136'
-
# Have Qt applications use the Adwaita theme
QT_STYLE_OVERRIDE=adwaita
diff --git a/config/chroot_local-includes/etc/ferm/ferm.conf b/config/chroot_local-includes/etc/ferm/ferm.conf
index 353d892..e8edef0 100644
--- a/config/chroot_local-includes/etc/ferm/ferm.conf
+++ b/config/chroot_local-includes/etc/ferm/ferm.conf
@@ -80,11 +80,6 @@ domain ip {
mod owner uid-owner $amnesia_uid ACCEPT;
}
- # White-list access to Monkeysphere
- daddr 127.0.0.1 proto tcp syn dport 6136 {
- mod owner uid-owner $amnesia_uid ACCEPT;
- }
-
# White-list access to OnionShare
daddr 127.0.0.1 proto tcp syn dport 17600:17650 {
mod owner uid-owner $amnesia_uid ACCEPT;
diff --git a/config/chroot_local-includes/usr/share/tails/build/group b/config/chroot_local-includes/usr/share/tails/build/group
index c317e93..b7b283c 100644
--- a/config/chroot_local-includes/usr/share/tails/build/group
+++ b/config/chroot_local-includes/usr/share/tails/build/group
@@ -50,7 +50,6 @@ messagebus:x:105:
ssh:x:109:
memlockd:x:110:
ssl-cert:x:111:
-monkeysphere:x:113:
debian-tor:x:114:tor-launcher
lpadmin:x:115:
vboxsf:x:112:
diff --git a/config/chroot_local-includes/usr/share/tails/build/passwd b/config/chroot_local-includes/usr/share/tails/build/passwd
index 53b460f..3dc63f7 100644
--- a/config/chroot_local-includes/usr/share/tails/build/passwd
+++ b/config/chroot_local-includes/usr/share/tails/build/passwd
@@ -22,7 +22,6 @@ systemd-resolve:x:102:104:systemd Resolver,,,:/run/systemd/resolve:/bin/false
_apt:x:104:65534::/nonexistent:/bin/false
messagebus:x:103:105::/var/run/dbus:/bin/false
memlockd:x:105:110:memlockd system account,,,:/usr/lib/memlockd:/bin/false
-monkeysphere:x:106:113:monkeysphere authentication user,,,:/var/lib/monkeysphere:/bin/bash
debian-tor:x:107:114::/var/lib/tor:/bin/false
speech-dispatcher:x:108:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/false
colord:x:109:117:colord colour management daemon,,,:/var/lib/colord:/bin/false
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 41b578d..893e75b 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -111,7 +111,6 @@ gnome-user-guide
gnupg-agent
gnupg2
gobi-loader
-gobby
## breaks lb because of desktop-base.postinst (see Debian bug #467620)
#if ARCHITECTURE amd64
# grub
@@ -126,19 +125,16 @@ hardlink
haveged
# needed by laptop-mode-tools to spin-down hard drives
hdparm
-hopenpgp-tools
inkscape
iptables
# ships isolinux.bin in syslinux 6.x packaging
isolinux
ferm
keepassx
-keyringer
memlockd
less
laptop-mode-tools
libgail-common
-libgfshare-bin
libcaribou-gtk-module
libsane-hpaio
live-config
@@ -147,11 +143,7 @@ live-tools
lvm2
macchanger
mat
-pdf-redact-tools
mesa-utils
-monkeysign
-monkeysphere
-msva-perl
nautilus
nautilus-wipe
nautilus-gtkhash
@@ -182,20 +174,17 @@ libreoffice-l10n-zh-cn
onioncircuits
openpgp-applet
openssh-client
-paperkey
parted
patch
pidgin
pidgin-guifications
pidgin-otr
pinentry-gtk2
-pitivi
poedit
ppp
pppoe
pulseaudio
pulseaudio-utils
-pwgen
p7zip-full
qt-at-spi
rng-tools
@@ -219,7 +208,6 @@ system-config-printer-common
synaptic
torsocks
totem-plugins
-traverso
ttf-dejavu
tcpdump
tcpflow
@@ -237,7 +225,6 @@ thunderbird-l10n-zh-cn
tor
tor-geoipdb
sound-juicer
-ssss
totem
unar
usbutils
@@ -351,11 +338,6 @@ modemmanager
usb-modeswitch
usb-modeswitch-data
-### Monkeysign dependencies for qrcodes scanning
-python-qrencode
-python-zbar
-python-zbarpygtk
-
### Printing support
foomatic-db
foomatic-db-engine
diff --git a/features/step_definitions/tor.rb b/features/step_definitions/tor.rb
index 1e3a6b5..a12221f 100644
--- a/features/step_definitions/tor.rb
+++ b/features/step_definitions/tor.rb
@@ -262,11 +262,6 @@ def stream_isolation_info(application)
:socksport => 9150,
:controller => true,
}
- when "Gobby"
- {
- :grep_monitor_expr => 'users:(("gobby-0.5"',
- :socksport => 9050
- }
when "SSH"
{
:grep_monitor_expr => 'users:(("\(nc\|ssh\)"',
@@ -325,25 +320,6 @@ And /^I re-run tails-upgrade-frontend-wrapper$/ do
$vm.execute_successfully("tails-upgrade-frontend-wrapper", :user => LIVE_USER)
end
-When /^I connect Gobby to "([^"]+)"$/ do |host|
- gobby = Dogtail::Application.new('gobby-0.5')
- gobby.child('Welcome to Gobby', roleName: 'label')
- gobby.button('Close').click
- # This indicates that Gobby has finished initializing itself
- # (generating DH parameters, etc.) -- before, the UI is not responsive
- # and our CTRL-t is lost.
- gobby.child('Failed to share documents', roleName: 'label')
- gobby.menu('File').click
- gobby.menuItem('Connect to Server...').click
- @screen.type("t", Sikuli::KeyModifier.CTRL)
- connect_dialog = gobby.dialog('Connect to Server')
- connect_dialog.child('', roleName: 'text').typeText(host)
- connect_dialog.button('Connect').click
- # This looks for the live user's presence entry in the chat, which
- # will only be shown if the connection succeeded.
- try_for(60) { gobby.child(LIVE_USER, roleName: 'table cell'); true }
-end
-
When /^the Tor Launcher autostarts$/ do
@screen.wait('TorLauncherWindow.png', 60)
end
diff --git a/features/tor_stream_isolation.feature b/features/tor_stream_isolation.feature
index 0db5f23..b2d2a3d 100644
--- a/features/tor_stream_isolation.feature
+++ b/features/tor_stream_isolation.feature
@@ -29,13 +29,6 @@ Feature: Tor stream isolation is effective
And the Tor Browser loads the startup page
Then I see that Tor Browser is properly stream isolated
- @fragile
- Scenario: Gobby is using the default SocksPort
- When I monitor the network connections of Gobby
- And I start "Gobby" via GNOME Activities Overview
- And I connect Gobby to "gobby.debian.org"
- Then I see that Gobby is properly stream isolated
-
Scenario: SSH is using the default SocksPort
When I monitor the network connections of SSH
And I run "ssh lizard.tails.boum.org" in GNOME Terminal
@@ -47,17 +40,3 @@ Feature: Tor stream isolation is effective
And I query the whois directory service for "boum.org"
And the whois command is successful
Then I see that whois is properly stream isolated
-
- @fragile
- Scenario: Explicitly torify-wrapped applications are using the default SocksPort
- When I monitor the network connections of Gobby
- And I run "torify /usr/bin/gobby-0.5" in GNOME Terminal
- And I connect Gobby to "gobby.debian.org"
- Then I see that Gobby is properly stream isolated
-
- @fragile
- Scenario: Explicitly torsocks-wrapped applications are using the default SocksPort
- When I monitor the network connections of Gobby
- And I run "torsocks /usr/bin/gobby-0.5" in GNOME Terminal
- And I connect Gobby to "gobby.debian.org"
- Then I see that Gobby is properly stream isolated
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index d098bf0..25fe45f 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1153,9 +1153,6 @@ GnuPG tools (namely: GPG itself and Seahorse) are configured to use
the sks-keyservers pool since it's reliable, well-synchronized with
the other HKP keyservers pools, and reachable over `hkps://`.
-Monkeysphere's `hkpms://` support will be used as soon as
-possible in place of the hierarchical X.509 certification model.
-
GnuPG is configured accordingly to the [OpenPGP Best
Practices](https://help.riseup.net/en/security/message-security/openpgp/best-practices),
e.g. to prefer non-outdated digest algorithms from the
@@ -1166,7 +1163,6 @@ disregard the preferred keyserver assigned to specific keys.
- [[!tails_gitweb config/chroot_local-includes/etc/skel/.gnupg/gpg.conf]]
- [[!tails_gitweb config/chroot_local-includes/etc/skel/.gnupg/dirmngr.conf]]
- [[!tails_gitweb config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults]]
-- hkpms is available in Debian: [[!debpkg msva-perl]]
### 3.6.17 Persistence feature
diff --git a/wiki/src/contribute/roadmap.mdwn b/wiki/src/contribute/roadmap.mdwn
index f8bd289..50486b3 100644
--- a/wiki/src/contribute/roadmap.mdwn
+++ b/wiki/src/contribute/roadmap.mdwn
@@ -31,7 +31,7 @@ Priorities for the next years
- **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]])
+- <strike>**Remove some less popular packages** ([[!tails_ticket 15291]])</strike> [DONE]
### Adoption
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index da97f57..50ea545 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -34,7 +34,6 @@ Networking
Messaging ([[More...|doc/anonymous_internet/pidgin]])
* [OnionShare](https://onionshare.org/) for anonymous filesharing
* [Thunderbird](https://www.thunderbird.net/) email client with [Enigmail](https://www.enigmail.net/) for OpenPGP support, also an RSS and Atom news feed reader ([[More...|doc/anonymous_internet/thunderbird]])
-* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing
* [Aircrack-ng](http://aircrack-ng.org/) for wireless network auditing
* [Electrum](https://electrum.org/), an easy-to-use bitcoin client ([[More...|doc/anonymous_internet/electrum]])
@@ -48,14 +47,12 @@ Desktop edition
* GNOME Sound Recorder for recording sound ([[More...|doc/sensitive_documents/sound_and_video]])
* [Audacity](https://www.audacityteam.org/) for recording and
editing sounds ([[More...|doc/sensitive_documents/sound_and_video]])
-* [PiTiVi](http://pitivi.org/) for non-linear audio/video editing ([[More...|doc/sensitive_documents/sound_and_video]])
* [Poedit](https://poedit.net/) to edit .po files
* [Simple Scan](https://launchpad.net/simple-scan) and
[SANE](http://sane-project.org/) for scanner support
* [Brasero](https://wiki.gnome.org/Apps/Brasero) to burn CD/DVDs
* [Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer) to rip audio
CDs
-* [Traverso](http://traverso-daw.org/) a multi-track audio recorder and editor
* [BookletImposer](http://kjo.herbesfolles.org/bookletimposer/) to convert linear PDF documents into booklets, and vice-versa
Encryption and privacy
@@ -65,22 +62,12 @@ Encryption and privacy
[VeraCrypt](https://veracrypt.fr) encrypted volumes (like USB sticks) ([[More...|doc/encryption_and_privacy/encrypted_volumes]])
* [GnuPG](http://gnupg.org/), the GNU implementation of OpenPGP for email and
data encyption and signing
-* [Monkeysign](http://web.monkeysphere.info/monkeysign),
- a tool for OpenPGP key signing and exchange
-* [PWGen](http://pwgen-win.sourceforge.net/), a strong password generator
-* [[!wikipedia Shamir's Secret Sharing]]
- using [gfshare](http://www.digital-scurf.org/software/libgfshare)
- and [ssss](http://point-at-infinity.org/ssss/)
* [GNOME screen keyboard](https://help.gnome.org/users/gnome-help/stable/keyboard-osk.html.en)
for accessibility, and as a countermeasure against hardware
[[!wikipedia Keystroke logging desc="keyloggers"]] ([[More...|doc/encryption_and_privacy/virtual_keyboard]])
* [MAT](https://mat.boum.org/) to anonymize metadata in files
-* [pdf-redact-tools](https://github.com/firstlookmedia/pdf-redact-tools) to help
- with securely redacting and stripping metadata from documents before publishing
* [KeePassX](http://www.keepassx.org/) password manager ([[More...|doc/encryption_and_privacy/manage_passwords]])
* [GtkHash](http://gtkhash.sourceforge.net/) to calculate checksums ([[More...|doc/encryption_and_privacy/checksums]])
-* [Keyringer](https://keyringer.pw/), a command line tool to encrypt secrets shared through Git ([[More...|doc/encryption_and_privacy/keyringer]])
-* [Paperkey](http://www.jabberwocky.com/software/paperkey/) a command line tool to back up OpenPGP secret keys on paper ([[More...|doc/advanced_topics/paperkey]])
The full packages list can be found in the [BitTorrent files download
directory](https://tails.boum.org/torrents/files/) (look for files with the `.packages`
diff --git a/wiki/src/doc/advanced_topics.index.mdwn b/wiki/src/doc/advanced_topics.index.mdwn
index 8b1a785..d4203c5 100644
--- a/wiki/src/doc/advanced_topics.index.mdwn
+++ b/wiki/src/doc/advanced_topics.index.mdwn
@@ -5,4 +5,3 @@
- [[!traillink <span_class="application">virt-manager</span>|advanced_topics/virtualization/virt-manager]]
- [[!traillink Accessing_resources_on_the_local_network|advanced_topics/lan]]
- [[!traillink Enable_a_wireless_device|advanced_topics/wireless_devices]]
- - [[!traillink Backing_up_OpenPGP_secret_keys_on_paper_using_<span_class="application">paperkey</span>|advanced_topics/paperkey]]
diff --git a/wiki/src/doc/advanced_topics/paperkey.de.po b/wiki/src/doc/advanced_topics/paperkey.de.po
deleted file mode 100644
index 818472d..0000000
--- a/wiki/src/doc/advanced_topics/paperkey.de.po
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-05-17 10:08+0200\n"
-"PO-Revision-Date: 2016-05-13 19:32+0200\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Backing up OpenPGP secret keys on paper using paperkey\"]]\n"
-msgstr "[[!meta title=\"Geheime OpenPGP-Schlüssel mit Paperkey auf Papier sichern\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> is a command\n"
-"line tool to export OpenPGP secret keys in a format suitable for\n"
-"printing on paper.\n"
-msgstr ""
-"<span class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> ist ein Kommandozeilenwerkzeug,\n"
-"um geheime OpenPGP-Schlüssel in einem zum Druck auf Papier\n"
-"geeigneten Format zu exportieren.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Paper can be destroyed easily but it also has amazingly long retention\n"
-"qualities, far longer than the magnetic or optical media that are\n"
-"generally used to back up computer data. So <span class=\"application\">paperkey</span> can be useful in\n"
-"combination with other backup strategies.\n"
-msgstr ""
-"Papier kann einfach zerstört werden, hat aber auch herausragende Qualitäten in\n"
-"der Langzeithaltbarkeit, viel länger als magnetische oder optische Medien, die\n"
-"normalerweise für Sicherungen von Computerdaten verwendet werden. Somit kann <span class=\"application\">paperkey</span>\n"
-"in Kombination mit anderen Sicherungsmethoden nützlich sein.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Your OpenPGP key as exported by <span\n"
-"class=\"application\">paperkey</span> is still protected by your\n"
-"passphrase.</p>\n"
-msgstr ""
-"<p>Ihre durch <span class=\"application\">paperkey</span>\n"
-"exportieren OpenPGP-Schlüssel werden weiterhin durch\n"
-"Ihr Kennwort geschützt.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To learn how to use <span class=\"application\">paperkey</span>, read the [documentation on the\n"
-"<span class=\"application\">paperkey</span> website](http://www.jabberwocky.com/software/paperkey/).\n"
-msgstr ""
-"Um zu lernen, wie Sie <span class=\"application\">paperkey</span> verwenden, lesen Sie die [Dokumentation\n"
-"auf der Webseite von <span class=\"application\">paperkey</span>](http://www.jabberwocky.com/software/paperkey/).\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For example, to export an OpenPGP secret key using <span class=\"application\">paperkey</span>, execute\n"
-"the following command, replacing <span class=\"command\">[keyid]</span> with the ID of the key that\n"
-"you want to export:\n"
-msgstr ""
-"Beispielsweise können Sie folgenden Befehl ausführen, wobei Sie <span class=\"command\">[keyid]</span> mit der\n"
-"ID des Schlüssels ersetzen, den Sie exportieren wollen, um einen geheimen OpenPGP-Schlüssel mit\n"
-"<span class=\"application\">paperkey</span> zu exportieren:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " gpg --export-secret-key [keyid] | paperkey | gedit\n"
-msgstr " gpg --export-secret-key [keyid] | paperkey | gedit\n"
diff --git a/wiki/src/doc/advanced_topics/paperkey.es.po b/wiki/src/doc/advanced_topics/paperkey.es.po
deleted file mode 100644
index a3cf965..0000000
--- a/wiki/src/doc/advanced_topics/paperkey.es.po
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-01-17 16:52+0000\n"
-"PO-Revision-Date: 2016-10-27 01:05+0000\n"
-"Last-Translator: Tails developers <amnesiatranslators@boum.org>\n"
-"Language-Team: Spanish "
-"<https://translate.tails.boum.org/projects/tails/first_stepsindex/es/>\n"
-"Language: es\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"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Backing up OpenPGP secret keys on paper using paperkey\"]]\n"
-msgstr ""
-"[[!meta title=\"Copia de seguridad de claves secretas OpenPGP en papel con "
-"paperkey\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span "
-"class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> "
-"is a command\n"
-"line tool to export OpenPGP secret keys in a format suitable for\n"
-"printing on paper.\n"
-msgstr ""
-"<span class=\"application\""
-">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> es una "
-"herramienta de\n"
-"línea de comandos para exportar claves secretas OpenPGP en un formato "
-"adecuado para\n"
-"imprimir en papel.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Paper can be destroyed easily but it also has amazingly long retention\n"
-"qualities, far longer than the magnetic or optical media that are\n"
-"generally used to back up computer data. So <span "
-"class=\"application\">paperkey</span> can be useful in\n"
-"combination with other backup strategies.\n"
-msgstr ""
-"El papel se puede destruir fácilmente, pero también tiene unas cualidades de "
-"retención\n"
-"increíblemente largas, mucho más largas que los soportes magnéticos u "
-"ópticos que se\n"
-"utilizan generalmente para realizar copias de seguridad de datos "
-"informáticos. Así que <span class=\"application\">paperkey</span> puede ser "
-"útil en combinación con otras estrategias de copia de seguridad.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Your OpenPGP key as exported by <span\n"
-"class=\"application\">paperkey</span> is still protected by your\n"
-"passphrase.</p>\n"
-msgstr ""
-"Tu clave OpenPGP tal y como fue exportada por <span class=\"application\""
-">paperkey</span> aún está protegida por tu contraseña.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To learn how to use <span class=\"application\">paperkey</span>, read the "
-"[documentation on the\n"
-"<span class=\"application\">paperkey</span> "
-"website](http://www.jabberwocky.com/software/paperkey/).\n"
-msgstr ""
-"Para aprender a usar <span class=\"application\">paperkey</span>, lee la ["
-"documentación en la web de <span class=\"application\""
-">paperkey</span>](http://www.jabberwocky.com/software/paperkey/).\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For example, to export an OpenPGP secret key using <span "
-"class=\"application\">paperkey</span>, execute\n"
-"the following command, replacing <span class=\"command\">[keyid]</span> with "
-"the ID of the key that\n"
-"you want to export:\n"
-msgstr ""
-"Por ejemplo, para exportar una clave secreta OpenPGP usando <span class=\""
-"application\">paperkey</span>, ejecuta\n"
-"el siguiente comando, reemplazando <span class=\"command\">[keyid]</span> "
-"con el ID de la clave que deseas\n"
-"exportar:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " gpg --export-secret-key [keyid] | paperkey | gedit\n"
-msgstr " gpg --export-secret-key [keyid] | paperkey | gedit\n"
diff --git a/wiki/src/doc/advanced_topics/paperkey.fa.po b/wiki/src/doc/advanced_topics/paperkey.fa.po
deleted file mode 100644
index 2135dfc..0000000
--- a/wiki/src/doc/advanced_topics/paperkey.fa.po
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-07-28 09:53+0200\n"
-"PO-Revision-Date: 2015-10-14 17:02+0000\n"
-"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian "
-"<http://weblate.451f.org:8889/projects/tails/paperkey/fa/>\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.4-dev\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Backing up OpenPGP secret keys on paper using paperkey\"]]\n"
-msgstr ""
-"[[!meta title=\"گرفتن نسخهٔ پشتیبان از کلیدهای مخفی اُپن‌پی‌جی‌پی با استفاده "
-"از پیپرکی\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span "
-"class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> "
-"is a command\n"
-"line tool to export OpenPGP secret keys in a format suitable for\n"
-"printing on paper.\n"
-msgstr ""
-"<span class=\"application\""
-">[پیپرکی](http://www.jabberwocky.com/software/paperkey/)</span> یک\n"
-"ابزار خط فرمان برای خارج کردن کلیدهای مخفی اُپن‌پی‌جی‌پی در قالبی مناسب \n"
-"برای چاپ کردن روی کاغذ است.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Paper can be destroyed easily but it also has amazingly long retention\n"
-"qualities, far longer than the magnetic or optical media that are\n"
-"generally used to back up computer data. So <span "
-"class=\"application\">paperkey</span> can be useful in\n"
-"combination with other backup strategies.\n"
-msgstr ""
-"کاغذ ممکن است به راحتی از بین برود اما کیفیت نگهداری بسیار بالایی و دوامی "
-"بسیار بیشتر از \n"
-"دستگاه‌های ذخیرهٔ نوری یا مغناطیسی نیز دارد که معمولاً برای گرفتن نسخهٔ "
-"پشتیبان\n"
-" از اطلاعات به کار می‌روند. بنابراین <span class=\"application\""
-">پیپرکی</span>\n"
-"می‌تواند در کنار دیگر استراتژی‌های پشتیبان گرفتن مفید باشد.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Your OpenPGP key as exported by <span\n"
-"class=\"application\">paperkey</span> is still protected by your\n"
-"passphrase.</p>\n"
-msgstr ""
-"<p>کلید اُپن‌پی‌جی‌پی شما که توسط<span\n"
-"class=\"application\">پیپرکی</span> خارج شده همچنان با یک\n"
-"گذرواژه محافظت می‌شود.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To learn how to use <span class=\"application\">paperkey</span>, read the "
-"[documentation on the\n"
-"<span class=\"application\">paperkey</span> "
-"website](http://www.jabberwocky.com/software/paperkey/).\n"
-msgstr ""
-"برای یادگیری نحوهٔ استفاده از <span class=\"application\">پیپرکی</span> ["
-"مستندات تارنمای<span class=\"application\""
-">پیپرکی</span>](http://www.jabberwocky.com/software/paperkey/) را بخوانید.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For example, to export an OpenPGP secret key using <span "
-"class=\"application\">paperkey</span>, execute\n"
-"the following command, replacing <span class=\"command\">[keyid]</span> with "
-"the ID of the key that\n"
-"you want to export:\n"
-msgstr ""
-"برای نمونه برای خارج کردن یک کلید مخفی اُپن‌پی‌جی‌پی با استفاده از <span "
-"class=\"application\">پیپرکی</span>، این فرمان را اجرا کرده و <span class=\""
-"command\">[keyid]</span> را با شناسهٔ کلیدی که می‌خواهید خارج کنید جایگزین "
-"کنید:\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " gpg --export-secret-key [keyid] | paperkey | gedit\n"
-msgstr " gpg --export-secret-key [keyid] | paperkey | gedit\n"
diff --git a/wiki/src/doc/advanced_topics/paperkey.fr.po b/wiki/src/doc/advanced_topics/paperkey.fr.po
deleted file mode 100644
index a628140..0000000
--- a/wiki/src/doc/advanced_topics/paperkey.fr.po
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-20 20:57+0200\n"
-"PO-Revision-Date: 2015-06-12 09:50-0000\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"
-"X-Generator: Poedit 1.5.4\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Backing up OpenPGP secret keys on paper using paperkey\"]]\n"
-msgstr "[[!meta title=\"Sauvegarder sa clé secrète OpenPGP sur papier avec paperkey\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> is a command\n"
-"line tool to export OpenPGP secret keys in a format suitable for\n"
-"printing on paper.\n"
-msgstr ""
-"<span class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> est un outil\n"
-"en ligne de commande pour exporter sa clé secrète OpenPGP dans un format qui convient\n"
-"à l'impression sur papier.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Paper can be destroyed easily but it also has amazingly long retention\n"
-"qualities, far longer than the magnetic or optical media that are\n"
-"generally used to back up computer data. So <span class=\"application\">paperkey</span> can be useful in\n"
-"combination with other backup strategies.\n"
-msgstr ""
-"La papier peut être détruit facilement mais peut aussi perdurer très longtemps,\n"
-"bien plus que les périphériques magnétiques ou optiques que nous\n"
-"utilisons généralement pour sauvegarder nos données numériques. C'est pourquoi\n"
-"<span class=\"application\">paperkey</span> peut être très utile combiné avec d'autres\n"
-"stratégies de sauvegarde.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Your OpenPGP key as exported by <span\n"
-"class=\"application\">paperkey</span> is still protected by your\n"
-"passphrase.</p>\n"
-msgstr ""
-"<p>Votre clé OpenPGP exportée par <span\n"
-"class=\"application\">paperkey</span> est toujours protégée\n"
-"par votre phrase de passe.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To learn how to use <span class=\"application\">paperkey</span>, read the [documentation on the\n"
-"<span class=\"application\">paperkey</span> website](http://www.jabberwocky.com/software/paperkey/).\n"
-msgstr ""
-"Pour apprendre à utiliser <span class=\"application\">paperkey</span>, lisez la [documentation du site\n"
-"web de <span class=\"application\">paperkey</span>](http://www.jabberwocky.com/software/paperkey/).\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For example, to export an OpenPGP secret key using <span class=\"application\">paperkey</span>, execute\n"
-"the following command, replacing <span class=\"command\">[keyid]</span> with the ID of the key that\n"
-"you want to export:\n"
-msgstr ""
-"Par exemple, pour exporter une clé secrète OpenPGP en utilisant <span class=\"application\">paperkey</span>, lancer\n"
-"la commande suivante, en remplaçant <span class=\"command\">[keyid]</span> par l'identifiant de la clé que vous\n"
-"voulez exporter :\n"
-
-#. type: Plain text
-#, no-wrap
-msgid " gpg --export-secret-key [keyid] | paperkey | gedit\n"
-msgstr " gpg --export-secret-key [keyid] | paperkey | gedit\n"
diff --git a/wiki/src/doc/advanced_topics/paperkey.it.po b/wiki/src/doc/advanced_topics/paperkey.it.po
deleted file mode 100644
index d0ea200..0000000
--- a/wiki/src/doc/advanced_topics/paperkey.it.po
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-19 23:06+0100\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"
-"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 "[[!meta title=\"Backing up OpenPGP secret keys on paper using paperkey\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span "
-"class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> "
-"is a command\n"
-"line tool to export OpenPGP secret keys in a format suitable for\n"
-"printing on paper.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Paper can be destroyed easily but it also has amazingly long retention\n"
-"qualities, far longer than the magnetic or optical media that are\n"
-"generally used to back up computer data. So <span "
-"class=\"application\">paperkey</span> can be useful in\n"
-"combination with other backup strategies.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Your OpenPGP key as exported by <span\n"
-"class=\"application\">paperkey</span> is still protected by your\n"
-"passphrase.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To learn how to use <span class=\"application\">paperkey</span>, read the "
-"[documentation on the\n"
-"<span class=\"application\">paperkey</span> "
-"website](http://www.jabberwocky.com/software/paperkey/).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For example, to export an OpenPGP secret key using <span "
-"class=\"application\">paperkey</span>, execute\n"
-"the following command, replacing <span class=\"command\">[keyid]</span> with "
-"the ID of the key that\n"
-"you want to export:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " gpg --export-secret-key [keyid] | paperkey | gedit\n"
-msgstr ""
diff --git a/wiki/src/doc/advanced_topics/paperkey.mdwn b/wiki/src/doc/advanced_topics/paperkey.mdwn
deleted file mode 100644
index 67f1942..0000000
--- a/wiki/src/doc/advanced_topics/paperkey.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-[[!meta title="Backing up OpenPGP secret keys on paper using paperkey"]]
-
-<span class="application">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> is a command
-line tool to export OpenPGP secret keys in a format suitable for
-printing on paper.
-
-Paper can be destroyed easily but it also has amazingly long retention
-qualities, far longer than the magnetic or optical media that are
-generally used to back up computer data. So <span class="application">paperkey</span> can be useful in
-combination with other backup strategies.
-
-<div class="note">
-
-<p>Your OpenPGP key as exported by <span
-class="application">paperkey</span> is still protected by your
-passphrase.</p>
-
-</div>
-
-To learn how to use <span class="application">paperkey</span>, read the [documentation on the
-<span class="application">paperkey</span> website](http://www.jabberwocky.com/software/paperkey/).
-
-For example, to export an OpenPGP secret key using <span class="application">paperkey</span>, execute
-the following command, replacing <span class="command">[keyid]</span> with the ID of the key that
-you want to export:
-
- gpg --export-secret-key [keyid] | paperkey | gedit
diff --git a/wiki/src/doc/advanced_topics/paperkey.pt.po b/wiki/src/doc/advanced_topics/paperkey.pt.po
deleted file mode 100644
index 7e934f4..0000000
--- a/wiki/src/doc/advanced_topics/paperkey.pt.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
-"PO-Revision-Date: 2018-02-05 19:21+0000\n"
-"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Portuguese "
-"<http://translate.tails.boum.org/projects/tails/paperkey/pt/>\n"
-"Language: pt\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"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Backing up OpenPGP secret keys on paper using paperkey\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span "
-"class=\"application\">[Paperkey](http://www.jabberwocky.com/software/paperkey/)</span> "
-"is a command\n"
-"line tool to export OpenPGP secret keys in a format suitable for\n"
-"printing on paper.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Paper can be destroyed easily but it also has amazingly long retention\n"
-"qualities, far longer than the magnetic or optical media that are\n"
-"generally used to back up computer data. So <span "
-"class=\"application\">paperkey</span> can be useful in\n"
-"combination with other backup strategies.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Your OpenPGP key as exported by <span\n"
-"class=\"application\">paperkey</span> is still protected by your\n"
-"passphrase.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To learn how to use <span class=\"application\">paperkey</span>, read the "
-"[documentation on the\n"
-"<span class=\"application\">paperkey</span> "
-"website](http://www.jabberwocky.com/software/paperkey/).\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"For example, to export an OpenPGP secret key using <span "
-"class=\"application\">paperkey</span>, execute\n"
-"the following command, replacing <span class=\"command\">[keyid]</span> with "
-"the ID of the key that\n"
-"you want to export:\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " gpg --export-secret-key [keyid] | paperkey | gedit\n"
-msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy.index.mdwn b/wiki/src/doc/encryption_and_privacy.index.mdwn
index 7d24036..d32af9a 100644
--- a/wiki/src/doc/encryption_and_privacy.index.mdwn
+++ b/wiki/src/doc/encryption_and_privacy.index.mdwn
@@ -10,4 +10,3 @@
- [[!traillink Securely_delete_files_and_clean_diskspace_using_Nautilus_Wipe|encryption_and_privacy/secure_deletion]]
- [[!traillink Manage_passwords_using_<span_class="application">KeePassX</span>|encryption_and_privacy/manage_passwords]]
- [[!traillink Calculating_checksums_using_<span_class="application">GtkHash</span>|encryption_and_privacy/checksums]]
- - [[!traillink Sharing_encrypted_secrets_using_<span_class="application">keyringer</span>|encryption_and_privacy/keyringer]]
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.de.po b/wiki/src/doc/encryption_and_privacy/keyringer.de.po
deleted file mode 100644
index 302daf9..0000000
--- a/wiki/src/doc/encryption_and_privacy/keyringer.de.po
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-04-19 18:45+0300\n"
-"PO-Revision-Date: 2016-01-27 21:41+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
-"Language-Team: Tails translators <tails@boum.org>\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Sharing encrypted secrets using keyringer\"]]\n"
-msgstr "[[!meta title=\"Verschlüsselte Geheimnisse mit keyringer austauschen\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> is\n"
-"an encrypted and distributed secret sharing software running from the\n"
-"command line.\n"
-msgstr ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> ist\n"
-"eine Software für verschlüsselte und verteilte Geheimnisse, die von der\n"
-"Kommandozeile aus läuft.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Keyringer</span> lets you manage and share\n"
-"secrets using OpenPGP and [Git](http://git-scm.com/) with custom\n"
-"commands to encrypt, decrypt, and edit text files and other kind of\n"
-"documents. By storing those secrets in Git, you can share them with\n"
-"other people in a distributed manner.\n"
-msgstr ""
-"<span class=\"application\">Keyringer</span> erlaubt es Ihnen mit speziellen\n"
-"Befehlen für das Verschlüsseln, Entschlüsseln und Bearbeiten von Textdateien\n"
-"und anderen Dokumententypen, Geheimnisse unter der Benutzung von OpenPGP\n"
-"und [Git](http://git-scm.com/) zu verwalten und zu teilen. Durch das Speichern \n"
-"dieser Geheimnisse in Git können Sie diese mit anderen Menschen auf verteilte\n"
-"Weise teilen.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Using <span class=\"application\">keyringer</span> requires previous\n"
-"knowledge of Git and the command line.</span>\n"
-msgstr ""
-"<p>Die Benutzung von <span class=\"application\">keyringer</span> erfordert\n"
-"Vorkenntnisse in Git und der Kommandozeile.</span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid ""
-"To learn how to use *keyringer*, read the [documentation on the *keyringer* "
-"website](https://keyringer.pw/)."
-msgstr ""
-"Um zu lernen, wie *keyringer* benutzt wird, lesen Sie die [Dokumentation auf "
-"der *keyringer*-Website](https://keyringer.pw/)."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>You can use the <span class=\"guilabel\">open</span> command of\n"
-"<span class=\"application\">keyringer</span> to edit, encrypt, and\n"
-"share <span class=\"application\">LibreOffice</span> documents,\n"
-"images, etc.</p>\n"
-msgstr ""
-"<p>Sie können den <span class=\"guilabel\">open</span>-Befehl von\n"
-"<span class=\"application\">keyringer</span> benutzen, um\n"
-"<span class=\"application\">LibreOffice</span>-Dokumente, Bilder usw. zu bearbeiten,\n"
-"verschlüsseln und teilen.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To store your *keyringer* configuration across separate working\n"
-"sessions, you can enable the [[<span class=\"guilabel\">Dotfiles</span>\n"
-"persistence feature|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"and make persistent the files in the <span\n"
-"class=\"filename\">.keyringer</span> folder of your\n"
-"<span class=\"filename\">Home</span> folder.\n"
-msgstr ""
-"Um Ihre Konfiguration von *keyringer* über mehrere Arbeitssitzungen\n"
-"hinweg zu speichern, können Sie die Funktion für [[<span class=\"guilabel\">\n"
-"versteckte Konfigurationsdateien im beständigen Speicherbereich</span>\n"
-"|doc/first_steps/persistence/configure/#dotfiles]] und die Dateien im <span\n"
-"class=\"filename\">.keyringer</span>-Ordner Ihres\n"
-"<span class=\"filename\">Home</span>-Ordners beständig speichern.\n"
-
-#. type: Plain text
-msgid "For example, if you have a single keyringer named **top-secret**:"
-msgstr ""
-"Beispielsweise, wenn Sie einen einzelnen keyringer namens **top-secret** "
-"haben:"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-msgstr ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-
-#. type: Plain text
-msgid ""
-"Make sure to update your *dotfiles* each time you use the **init**, "
-"**teardown**, **destroy**, or **preferences** command of *keyringer*."
-msgstr ""
-"Stellen Sie sicher, Ihre *versteckten Konfigurationsdateien* jedes Mal zu "
-"aktualisieren, wenn Sie die **init**, **teardown**, **destroy**, oder "
-"**preferences** Befehle von *keyringer* benutzen."
-
-#. type: Plain text
-msgid "To do so you can execute the following command:"
-msgstr "Um dies zu tun, können Sie folgenden Befehl ausführen:"
-
-#. type: Plain text
-#, no-wrap
-msgid " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
-msgstr " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.es.po b/wiki/src/doc/encryption_and_privacy/keyringer.es.po
deleted file mode 100644
index 432fde5..0000000
--- a/wiki/src/doc/encryption_and_privacy/keyringer.es.po
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.
-msgid ""
-msgstr ""
-"Project-Id-Version: Tails\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-01-17 16:52+0000\n"
-"PO-Revision-Date: 2018-02-06 21:12+0000\n"
-"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
-"Language-Team: Spanish "
-"<http://translate.tails.boum.org/projects/tails/keyringer/es/>\n"
-"Language: es\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"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Sharing encrypted secrets using keyringer\"]]\n"
-msgstr "[[!meta title=\"Compartir secretos encriptados con keyringer\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> is\n"
-"an encrypted and distributed secret sharing software running from the\n"
-"command line.\n"
-msgstr ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> es un\n"
-"programa para compartir secretos encriptados distribuidos que funciona "
-"desde\n"
-"la línea de comandos.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Keyringer</span> lets you manage and share\n"
-"secrets using OpenPGP and [Git](http://git-scm.com/) with custom\n"
-"commands to encrypt, decrypt, and edit text files and other kind of\n"
-"documents. By storing those secrets in Git, you can share them with\n"
-"other people in a distributed manner.\n"
-msgstr ""
-"<span class=\"application\">Keyringer</span> te permite gestionar y "
-"compartir\n"
-"secretos usando OpenPGP y [Git](http://git-scm.com/) con comandos\n"
-"personalizados para cifrar, descifrar, y editar archivos de texto y otros "
-"tipos de\n"
-"documentos. Guardando estos secretos en Git, puedes compartirlos con\n"
-"otras personas en una manera distribuida.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Using <span class=\"application\">keyringer</span> requires previous\n"
-"knowledge of Git and the command line.</span>\n"
-msgstr ""
-"<p>Usar <span class=\"application\">keyringer</span> requiere conocimiento\n"
-"previo de Git y la línea de comandos.</span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid ""
-"To learn how to use *keyringer*, read the [documentation on the *keyringer* "
-"website](https://keyringer.pw/)."
-msgstr ""
-"Para aprender a usar *keyringer*, lee la [documentación en el sitio web de "
-"*keyringer*](https://keyringer.pw/)."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>You can use the <span class=\"guilabel\">open</span> command of\n"
-"<span class=\"application\">keyringer</span> to edit, encrypt, and\n"
-"share <span class=\"application\">LibreOffice</span> documents,\n"
-"images, etc.</p>\n"
-msgstr ""
-"<p>Puedes usar el comando <span class=\"guilabel\">open</span> de\n"
-"<span class=\"application\">keyringer</span> para editar, encriptar y\n"
-"compartir documentos <span class=\"application\">LibreOffice</span>,\n"
-"imágenes, etc.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To store your *keyringer* configuration across separate working\n"
-"sessions, you can enable the [[<span class=\"guilabel\">Dotfiles</span>\n"
-"persistence feature|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"and make persistent the files in the <span\n"
-"class=\"filename\">.keyringer</span> folder of your\n"
-"<span class=\"filename\">Home</span> folder.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "For example, if you have a single keyringer named **top-secret**:"
-msgstr "Por ejemplo, si tienes un simple keyringer llamado **top-secret**:"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-msgstr ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-
-#. type: Plain text
-msgid ""
-"Make sure to update your *dotfiles* each time you use the **init**, "
-"**teardown**, **destroy**, or **preferences** command of *keyringer*."
-msgstr ""
-
-#. type: Plain text
-msgid "To do so you can execute the following command:"
-msgstr "Para realizarlo puedes ejecutar el siguiente comando:"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" rsync -va --ignore-existing --delete ~/.keyringer "
-"/live/persistence/TailsData_unlocked/dotfiles\n"
-msgstr ""
-" rsync -va --ignore-existing --delete ~/.keyringer "
-"/live/persistence/TailsData_unlocked/dotfiles\n"
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.fa.po b/wiki/src/doc/encryption_and_privacy/keyringer.fa.po
deleted file mode 100644
index 91f4aa0..0000000
--- a/wiki/src/doc/encryption_and_privacy/keyringer.fa.po
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-07-28 09:53+0200\n"
-"PO-Revision-Date: 2015-10-16 14:33+0000\n"
-"Last-Translator: sprint5 <translation5@451f.org>\n"
-"Language-Team: Persian "
-"<http://weblate.451f.org:8889/projects/tails/keyringer/fa/>\n"
-"Language: fa\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.4-dev\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Sharing encrypted secrets using keyringer\"]]\n"
-msgstr ""
-"[[!meta title=\"به‌اشتراک‌گذاری رازهای رمزگذاری‌شده با استفاده از کی‌رینگر\""
-"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> is\n"
-"an encrypted and distributed secret sharing software running from the\n"
-"command line.\n"
-msgstr ""
-"<span class=\"application\">[کی‌رینگر](https://keyringer.pw/)</span>\n"
-"یک نرم‌افزار رمزگذاری‌شده و توزیع‌شدهٔ اشتراک‌گذاری رازها است که از طریق خط "
-"فرمان\n"
-" اجرا می‌شود.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Keyringer</span> lets you manage and share\n"
-"secrets using OpenPGP and [Git](http://git-scm.com/) with custom\n"
-"commands to encrypt, decrypt, and edit text files and other kind of\n"
-"documents. By storing those secrets in Git, you can share them with\n"
-"other people in a distributed manner.\n"
-msgstr ""
-"<span class=\"application\">کی‌رینگر</span> به شما اجازه می‌دهد تا رازها را "
-"مدیریت کنید و \n"
-"به اشتراک بگذارید و با استفاده از اُپن‌پی‌جی‌پی و [گیت](http://git-scm.com/) "
-"و خط‌های فرمان خاص، \n"
-"فایل‌های متنی و دیگر اسناد را رمزگذاری، رمزگشایی و ویرایش کنید. می‌توانید با "
-"ذخیره کردن \n"
-"این رازها در گیت آن‌ها را به شکل توزیع‌شده با افراد دیگر \n"
-"به اشتراک بگذارید.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Using <span class=\"application\">keyringer</span> requires previous\n"
-"knowledge of Git and the command line.</span>\n"
-msgstr ""
-"<p>استفاده از <span class=\"application\">کی‌رینگر</span> نیاز به دانش "
-"پیشین\n"
-"در مورد گیت و خط فرمان دارد.</span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid ""
-"To learn how to use *keyringer*, read the [documentation on the *keyringer* "
-"website](https://keyringer.pw/)."
-msgstr ""
-"برای یادگیری نحوهٔ استفاده از *کی‌رینگر* [سند تارنمای "
-"*کی‌رینگر*](https://keyringer.pw/) را بخوانید."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>You can use the <span class=\"guilabel\">open</span> command of\n"
-"<span class=\"application\">keyringer</span> to edit, encrypt, and\n"
-"share <span class=\"application\">LibreOffice</span> documents,\n"
-"images, etc.</p>\n"
-msgstr ""
-"<p>می‌توانید از فرمان <span class=\"guilabel\">open</span>\n"
-"<span class=\"application\">کی‌رینگر</span> برای ویرایش، رمزگذاری و "
-"به‌اشتراک‌گذاری\n"
-"سندهای <span class=\"application\">لیبره‌آفیس</span>، عکس‌ها و غیره\n"
-"استفاده کنید.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To store your *keyringer* configuration across separate working\n"
-"sessions, you can enable the [[<span class=\"guilabel\">Dotfiles</span>\n"
-"persistence feature|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"and make persistent the files in the <span\n"
-"class=\"filename\">.keyringer</span> folder of your\n"
-"<span class=\"filename\">Home</span> folder.\n"
-msgstr ""
-"برای ذخیره کردن پیکربندی *کی‌رینگر* در نشست‌های کاری مختلف خود،\n"
-"می‌توانید [[ویژگی مانای <span class=\"guilabel\""
-">دات‌فایلز</span>|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"را فعال کرده و فایل‌های پوشهٔ <span\n"
-"class=\"filename\">.keyringer</span> پوشهٔ\n"
-"<span class=\"filename\">خانه</span> خود را مانا کنید.\n"
-
-#. type: Plain text
-msgid "For example, if you have a single keyringer named **top-secret**:"
-msgstr "برای نمونه، اگر یک دسته‌کلید به نام **top-secret* دارید:"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-msgstr ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-
-#. type: Plain text
-msgid ""
-"Make sure to update your *dotfiles* each time you use the **init**, "
-"**teardown**, **destroy**, or **preferences** command of *keyringer*."
-msgstr ""
-"هر بار که از فرمان‌های **init**، **teardown**، **destroy** یا **prefrences** "
-"*کی‌رینگر* استفاده می‌کنید، مطمئن شوید *دات‌فایلز* خود را به‌روز کرده‌اید."
-
-#. type: Plain text
-msgid "To do so you can execute the following command:"
-msgstr "برای این کار باید این فرمان را اجرا کنید:"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" rsync -va --ignore-existing --delete ~/.keyringer "
-"/live/persistence/TailsData_unlocked/dotfiles\n"
-msgstr ""
-" rsync -va --ignore-existing --delete ~/.keyringer "
-"/live/persistence/TailsData_unlocked/dotfiles\n"
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.fr.po b/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
deleted file mode 100644
index d8c4209..0000000
--- a/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-06-28 17:27+0300\n"
-"PO-Revision-Date: 2017-06-17 12:04+0000\n"
-"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
-"Language-Team: \n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Sharing encrypted secrets using keyringer\"]]\n"
-msgstr "[[!meta title=\"Partager des secrets chiffrés avec keyringer\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> is\n"
-"an encrypted and distributed secret sharing software running from the\n"
-"command line.\n"
-msgstr ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> est\n"
-"un logiciel de partage de secrets chiffrés et distribués qui fonctionne en\n"
-"ligne de commande.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Keyringer</span> lets you manage and share\n"
-"secrets using OpenPGP and [Git](http://git-scm.com/) with custom\n"
-"commands to encrypt, decrypt, and edit text files and other kind of\n"
-"documents. By storing those secrets in Git, you can share them with\n"
-"other people in a distributed manner.\n"
-msgstr ""
-"<span class=\"application\">Keyringer</span> vous permet de gérer et partager\n"
-"des secrets avec OpenPGP et [Git](http://git-scm.com/) via des commandes\n"
-"personnalisées pour chiffrer, déchiffrer, et éditer des fichiers textes et d'autre types de\n"
-"documents. En conservant ces secrets dans Git, vous pouvez les partager avec\n"
-"d'autres personnes de manière distribuée.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Using <span class=\"application\">keyringer</span> requires previous\n"
-"knowledge of Git and the command line.</span>\n"
-msgstr ""
-"<p>Utiliser <span class=\"application\">keyringer</span> requière\n"
-"des connaissances préalables en Git ainsi qu'en ligne de commande.</span>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid ""
-"To learn how to use *keyringer*, read the [documentation on the *keyringer* "
-"website](https://keyringer.pw/)."
-msgstr ""
-"Pour apprendre à utiliser *keyringer*, lisez la [documentation du site web "
-"de *keyringer*](https://keyringer.pw/) (en anglais)."
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>You can use the <span class=\"guilabel\">open</span> command of\n"
-"<span class=\"application\">keyringer</span> to edit, encrypt, and\n"
-"share <span class=\"application\">LibreOffice</span> documents,\n"
-"images, etc.</p>\n"
-msgstr ""
-"<p>Vous pouvez utiliser la commande <span class=\"guilabel\">open</span> de\n"
-"<span class=\"application\">keyringer</span> pour éditer, chiffrer, et\n"
-"partager des documents <span class=\"application\">LibreOffice</span>, des\n"
-"images, etc.</p>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To store your *keyringer* configuration across separate working\n"
-"sessions, you can enable the [[<span class=\"guilabel\">Dotfiles</span>\n"
-"persistence feature|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"and make persistent the files in the <span\n"
-"class=\"filename\">.keyringer</span> folder of your\n"
-"<span class=\"filename\">Home</span> folder.\n"
-msgstr ""
-"Pour conserver votre configuration de *keyringer* à travers plusieurs sessions,\n"
-"vous pouvez activer l'[[option <span class=\"guilabel\">Dotfiles</span>\n"
-"de la persistance|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"et rendre persistants les fichiers du dossier <span\n"
-"class=\"filename\">.keyringer</span> de votre dossier\n"
-"<span class=\"filename\">Home</span>.\n"
-
-#. type: Plain text
-msgid "For example, if you have a single keyringer named **top-secret**:"
-msgstr "Par exemple, si vous avez un seul keyringer appelé **top-secret** :"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-msgstr ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-
-#. type: Plain text
-msgid ""
-"Make sure to update your *dotfiles* each time you use the **init**, "
-"**teardown**, **destroy**, or **preferences** command of *keyringer*."
-msgstr ""
-"Veillez à mettre à jour vos *dotfiles* à chaque fois que vous utilisez les "
-"commandes **init**, **teardown**, **destroy**, ou **preferences** de "
-"*keyringer*."
-
-#. type: Plain text
-msgid "To do so you can execute the following command:"
-msgstr "Pour faire cela vous pouvez exécuter la commande suivante :"
-
-#. type: Plain text
-#, no-wrap
-msgid " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
-msgstr " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.it.po b/wiki/src/doc/encryption_and_privacy/keyringer.it.po
deleted file mode 100644
index 4c65f70..0000000
--- a/wiki/src/doc/encryption_and_privacy/keyringer.it.po
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-19 23:06+0100\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"
-"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 "[[!meta title=\"Sharing encrypted secrets using keyringer\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> is\n"
-"an encrypted and distributed secret sharing software running from the\n"
-"command line.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Keyringer</span> lets you manage and share\n"
-"secrets using OpenPGP and [Git](http://git-scm.com/) with custom\n"
-"commands to encrypt, decrypt, and edit text files and other kind of\n"
-"documents. By storing those secrets in Git, you can share them with\n"
-"other people in a distributed manner.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Using <span class=\"application\">keyringer</span> requires previous\n"
-"knowledge of Git and the command line.</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid ""
-"To learn how to use *keyringer*, read the [documentation on the *keyringer* "
-"website](https://keyringer.pw/)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>You can use the <span class=\"guilabel\">open</span> command of\n"
-"<span class=\"application\">keyringer</span> to edit, encrypt, and\n"
-"share <span class=\"application\">LibreOffice</span> documents,\n"
-"images, etc.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To store your *keyringer* configuration across separate working\n"
-"sessions, you can enable the [[<span class=\"guilabel\">Dotfiles</span>\n"
-"persistence feature|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"and make persistent the files in the <span\n"
-"class=\"filename\">.keyringer</span> folder of your\n"
-"<span class=\"filename\">Home</span> folder.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "For example, if you have a single keyringer named **top-secret**:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Make sure to update your *dotfiles* each time you use the **init**, "
-"**teardown**, **destroy**, or **preferences** command of *keyringer*."
-msgstr ""
-
-#. type: Plain text
-msgid "To do so you can execute the following command:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" rsync -va --ignore-existing --delete ~/.keyringer "
-"/live/persistence/TailsData_unlocked/dotfiles\n"
-msgstr ""
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.mdwn b/wiki/src/doc/encryption_and_privacy/keyringer.mdwn
deleted file mode 100644
index ce70bbf..0000000
--- a/wiki/src/doc/encryption_and_privacy/keyringer.mdwn
+++ /dev/null
@@ -1,51 +0,0 @@
-[[!meta title="Sharing encrypted secrets using keyringer"]]
-
-<span class="application">[Keyringer](https://keyringer.pw/)</span> is
-an encrypted and distributed secret sharing software running from the
-command line.
-
-<span class="application">Keyringer</span> lets you manage and share
-secrets using OpenPGP and [Git](http://git-scm.com/) with custom
-commands to encrypt, decrypt, and edit text files and other kind of
-documents. By storing those secrets in Git, you can share them with
-other people in a distributed manner.
-
-<div class="note">
-
-<p>Using <span class="application">keyringer</span> requires previous
-knowledge of Git and the command line.</span>
-
-</div>
-
-To learn how to use *keyringer*, read the [documentation on the
-*keyringer* website](https://keyringer.pw/).
-
-<div class="tip">
-
-<p>You can use the <span class="guilabel">open</span> command of
-<span class="application">keyringer</span> to edit, encrypt, and
-share <span class="application">LibreOffice</span> documents,
-images, etc.</p>
-
-</div>
-
-To store your *keyringer* configuration across separate working
-sessions, you can enable the [[<span class="guilabel">Dotfiles</span>
-persistence feature|doc/first_steps/persistence/configure/#dotfiles]]
-and make persistent the files in the <span
-class="filename">.keyringer</span> folder of your
-<span class="filename">Home</span> folder.
-
-For example, if you have a single keyringer named **top-secret**:
-
- /live/persistence/TailsData_unlocked/dotfiles
- └── .keyringer
-    ├── config
-    └── top-secret
-
-Make sure to update your *dotfiles* each time you use the **init**,
-**teardown**, **destroy**, or **preferences** command of *keyringer*.
-
-To do so you can execute the following command:
-
- rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.pt.po b/wiki/src/doc/encryption_and_privacy/keyringer.pt.po
deleted file mode 100644
index 7063f4d..0000000
--- a/wiki/src/doc/encryption_and_privacy/keyringer.pt.po
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2015-04-19 18:45+0300\n"
-"PO-Revision-Date: 2018-02-05 19:21+0000\n"
-"Last-Translator: Tails translators <amnesia@boum.org>\n"
-"Language-Team: Portuguese "
-"<http://translate.tails.boum.org/projects/tails/keyringer/pt/>\n"
-"Language: pt\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"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"Sharing encrypted secrets using keyringer\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">[Keyringer](https://keyringer.pw/)</span> is\n"
-"an encrypted and distributed secret sharing software running from the\n"
-"command line.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"application\">Keyringer</span> lets you manage and share\n"
-"secrets using OpenPGP and [Git](http://git-scm.com/) with custom\n"
-"commands to encrypt, decrypt, and edit text files and other kind of\n"
-"documents. By storing those secrets in Git, you can share them with\n"
-"other people in a distributed manner.\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"note\">\n"
-msgstr "<div class=\"note\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>Using <span class=\"application\">keyringer</span> requires previous\n"
-"knowledge of Git and the command line.</span>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "</div>\n"
-msgstr "</div>\n"
-
-#. type: Plain text
-msgid ""
-"To learn how to use *keyringer*, read the [documentation on the *keyringer* "
-"website](https://keyringer.pw/)."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "<div class=\"tip\">\n"
-msgstr "<div class=\"tip\">\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<p>You can use the <span class=\"guilabel\">open</span> command of\n"
-"<span class=\"application\">keyringer</span> to edit, encrypt, and\n"
-"share <span class=\"application\">LibreOffice</span> documents,\n"
-"images, etc.</p>\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"To store your *keyringer* configuration across separate working\n"
-"sessions, you can enable the [[<span class=\"guilabel\">Dotfiles</span>\n"
-"persistence feature|doc/first_steps/persistence/configure/#dotfiles]]\n"
-"and make persistent the files in the <span\n"
-"class=\"filename\">.keyringer</span> folder of your\n"
-"<span class=\"filename\">Home</span> folder.\n"
-msgstr ""
-
-#. type: Plain text
-msgid "For example, if you have a single keyringer named **top-secret**:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" /live/persistence/TailsData_unlocked/dotfiles\n"
-" └── .keyringer\n"
-"    ├── config\n"
-"    └── top-secret\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Make sure to update your *dotfiles* each time you use the **init**, "
-"**teardown**, **destroy**, or **preferences** command of *keyringer*."
-msgstr ""
-
-#. type: Plain text
-msgid "To do so you can execute the following command:"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
-msgstr ""
diff --git a/wiki/src/doc/sensitive_documents/metadata.mdwn b/wiki/src/doc/sensitive_documents/metadata.mdwn
index 1fc342e..c8caadc 100644
--- a/wiki/src/doc/sensitive_documents/metadata.mdwn
+++ b/wiki/src/doc/sensitive_documents/metadata.mdwn
@@ -12,10 +12,6 @@ and company information to texts and spreadsheets.</li>
<p>You can use the <span
class="application"><a href="https://mat.boum.org">MAT</a></span> to
-clean the metadata from your files before publishing them. To redact
-the content of a PDF and strip metadatas from it, you can use <span
-class="application"><a
-href="https://github.com/firstlookmedia/pdf-redact-tools">pdf-redact-tools
-</a></span>.</p>
+clean the metadata from your files before publishing them.</p>
</div>
diff --git a/wiki/src/doc/sensitive_documents/sound_and_video.mdwn b/wiki/src/doc/sensitive_documents/sound_and_video.mdwn
index 9781c6c..7ab487d 100644
--- a/wiki/src/doc/sensitive_documents/sound_and_video.mdwn
+++ b/wiki/src/doc/sensitive_documents/sound_and_video.mdwn
@@ -15,15 +15,9 @@ Tails includes several sound and video applications:
copy, and erase CD and DVD media: audio, video, or data.
See the [official documentation](https://help.gnome.org/users/brasero/stable/).
- - **<span class="application">[Pitivi](http://pitivi.org/)</span>** is a video editor.
- See the [official documentation](http://pitivi.org/manual/).
-
- **<span class="application">[Sound Juicer](https://wiki.gnome.org/Apps/SoundJuicer)</span>** is a CD
ripper application.
- - **<span class="application">[Traverso](http://traverso-daw.org/)</span>** is a multi-track audio recorder and
- editor.
-
These applications can be started from the
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸