Skip to content

GitLab

T
tails
Commit ef8dc7b5 authored by intrigeri's avatar intrigeri
Browse files
Options

Merge branch 'bugfix/17183-seahorse-import-wrapper' into 'stable' 

Fix importing OpenPGP keys from GNOME Files

See merge request !15
parents bc577c4b 543ffcad
Hide whitespace changes
Inline Side-by-side
Showing with 1239 additions and 319 deletions
config/chroot_local-hooks/70-seahorse-tool 0 → 100755
View file @ ef8dc7b5
#!/bin/sh
set -e
echo 'Configuring seahorse-tool'
mkdir -p /usr/lib/seahorse
dpkg-divert --add --rename --divert /usr/lib/seahorse/seahorse-tool \
/usr/bin/seahorse-tool
ln -s /usr/local/lib/seahorse-tool-wrapper /usr/bin/seahorse-tool
config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper 0 → 100755
View file @ ef8dc7b5
#! /usr/bin/env python3
"""
Tails' seahorse-tool wrapper
Due to this bug:
https://gitlab.gnome.org/GNOME/seahorse/-/issues/236
Tails users experience problems when using the GNOME Files integration
of Seahorse to import keys. Basically, `seahorse-tool --import` is
broken for binary (non-armored) keys, so we wrap around it and handle
that situation with `gpg --import`.
"""
import gettext
import gi
import gnupg
import os
import os.path
import subprocess
import sys
gi.require_version('Notify', '0.7')
from gi.repository import Notify
tr = gettext.translation("tails", '/usr/share/locale', fallback=True)
def notify(title, message):
Notify.init(title)
n = Notify.Notification.new(title, message)
n.show()
if __name__ == '__main__':
if len(sys.argv) == 3 and sys.argv[1] == '--import':
key_path = sys.argv[2]
try:
subprocess.run(['/usr/bin/gpg', '--import', key_path],
check=True, capture_output=True)
except subprocess.CalledProcessError as e:
notify(tr.gettext("Import Failed"),
# Translators: Don't translate {path} or {error},
# they are placeholders and will be replaced.
tr.gettext("Failed to import keys from {path}:\n{error}")
.format(path=key_path, error=e.stderr.decode()))
sys.exit(e.returncode)
keys = gnupg.GPG().scan_keys(key_path)
uids = set()
for key in keys:
for uid in key['uids']:
uids.add(uid)
title = tr.ngettext("Key Imported", "Keys Imported", len(keys))
# Translators: Don't translate {uids}, it's a placeholder and
# will be replaced.
message = tr.ngettext("Imported a key for {uids}",
"Imported keys for {uids}",
len(keys)) \
.format(uids=", ".join(uids))
notify(title, message)
else:
os.execv('/usr/lib/seahorse/seahorse-tool',
['/usr/lib/seahorse/seahorse-tool'] + sys.argv[1:])
po/POTFILES.in
View file @ ef8dc7b5
......@@ -19,6 +19,7 @@ tmp/pot/persistence-setup-Setting.pm.pot
tmp/pot/persistence-setup-Setup.pm.pot
tmp/pot/replace-su-with-sudo.pot
tmp/pot/RunningSystem.pm.pot
tmp/pot/seahorse-tool-wrapper.pot
tmp/pot/status-menu-helper-extension.js.pot
tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot
......
po/ar.po
View file @ ef8dc7b5
......@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-21 09:59+0100\n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
"PO-Revision-Date: 2020-05-19 17:56+0000\n"
"Last-Translator: Ilyes Chouia <celyes02@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/"
......@@ -774,7 +774,7 @@ msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:343
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
msgid "Error"
msgstr "خطأ"
......@@ -849,7 +849,7 @@ msgid ""
"You may now close this application."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:19
msgid "su is disabled. Please use sudo instead."
msgstr ""
......@@ -865,6 +865,42 @@ msgid ""
"option?"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
msgid "Import Failed"
msgstr ""
#. Translators: Don't translate {path} or {error},
#. they are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:45
#, python-brace-format
msgid ""
"Failed to import keys from {path}:\n"
"{error}"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
msgid "Lock screen"
msgstr ""
......@@ -1168,7 +1204,7 @@ msgid ""
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:38
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
msgid ""
"\"<b>Not enough memory available to check for upgrades.</b>\n"
"\n"
......@@ -1181,7 +1217,7 @@ msgid ""
"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:75
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
msgid "error:"
msgstr "خطأ:"
......@@ -1284,37 +1320,37 @@ msgstr ""
msgid "{volume_name} – {drive_name}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229
msgid "Wrong passphrase or parameters"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:235
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:337
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:343
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:345
msgid "Locking the volume failed"
msgstr ""
......
po/ca.po
View file @ ef8dc7b5
......@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-21 09:59+0100\n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
"PO-Revision-Date: 2020-03-25 14:52+0000\n"
"Last-Translator: jmontane\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
......@@ -780,7 +780,7 @@ msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:343
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
msgid "Error"
msgstr "Error"
......@@ -855,7 +855,7 @@ msgid ""
"You may now close this application."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:19
msgid "su is disabled. Please use sudo instead."
msgstr ""
......@@ -871,6 +871,34 @@ msgid ""
"option?"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
msgid "Import Failed"
msgstr ""
#. Translators: Don't translate {path} or {error},
#. they are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:45
#, python-brace-format
msgid ""
"Failed to import keys from {path}:\n"
"{error}"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] ""
msgstr[1] ""
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
msgstr[0] ""
msgstr[1] ""
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
msgid "Lock screen"
msgstr ""
......@@ -1187,7 +1215,7 @@ msgstr ""
"Potser preferireu reiniciar el Tails i desactivar el falsejament de l'adreça "
"MAC "
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:38
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
msgid ""
"\"<b>Not enough memory available to check for upgrades.</b>\n"
"\n"
......@@ -1200,7 +1228,7 @@ msgid ""
"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:75
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
msgid "error:"
msgstr "Hi ha hagut un error:"
......@@ -1307,37 +1335,37 @@ msgstr ""
msgid "{volume_name} – {drive_name}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229
msgid "Wrong passphrase or parameters"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:235
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:337
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:343
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:345
msgid "Locking the volume failed"
msgstr ""
......
po/cs.po
View file @ ef8dc7b5
......@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-21 09:59+0100\n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
"PO-Revision-Date: 2020-05-28 20:42+0000\n"
"Last-Translator: David Nowak <user412@secmail.pro>\n"
"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
......@@ -762,7 +762,7 @@ msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:343
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
msgid "Error"
msgstr "Chyba"
......@@ -837,7 +837,7 @@ msgid ""
"You may now close this application."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:19
msgid "su is disabled. Please use sudo instead."
msgstr ""
......@@ -853,6 +853,38 @@ msgid ""
"option?"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
msgid "Import Failed"
msgstr ""
#. Translators: Don't translate {path} or {error},
#. they are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:45
#, python-brace-format
msgid ""
"Failed to import keys from {path}:\n"
"{error}"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
msgid "Lock screen"
msgstr "Zamknout obrazovku"
......@@ -1160,7 +1192,7 @@ msgid ""
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:38
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
msgid ""
"\"<b>Not enough memory available to check for upgrades.</b>\n"
"\n"
......@@ -1173,7 +1205,7 @@ msgid ""
"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:75
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
msgid "error:"
msgstr "chyba:"
......@@ -1276,37 +1308,37 @@ msgstr "{partition_name} na {drive_name}"
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229
msgid "Wrong passphrase or parameters"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:235
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:337
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:343
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:345
msgid "Locking the volume failed"
msgstr ""
......
po/da.po
View file @ ef8dc7b5
......@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-21 09:59+0100\n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
"PO-Revision-Date: 2020-05-07 14:38+0000\n"
"Last-Translator: scootergrisen\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/"
......@@ -883,7 +883,7 @@ msgstr "Opsæt vedvarende diskområde i Tails"
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:343
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
msgid "Error"
msgstr "Fejl"
......@@ -968,7 +968,7 @@ msgstr ""
"\n"
"Du kan nu lukke programmet."
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:19
msgid "su is disabled. Please use sudo instead."
msgstr "su er deaktiveret. Brug venligst sudo i stedet."
......@@ -988,6 +988,35 @@ msgstr ""
"Kan ikke finde drevet som Tails kører fra. Måske bruger du 'toram'-"
"valgmuligheden?"
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
#, fuzzy
msgid "Import Failed"
msgstr "Mislykkedes"
#. Translators: Don't translate {path} or {error},
#. they are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:45
#, python-brace-format
msgid ""
"Failed to import keys from {path}:\n"
"{error}"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] ""
msgstr[1] ""
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
msgstr[0] ""
msgstr[1] ""
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
msgid "Lock screen"
msgstr "Lås skærm"
......@@ -1324,7 +1353,7 @@ msgstr ""
"Fejlgendannelsen mislykkedes også, så al netværk er deaktiveret. \n"
"Du vil måske foretrække at genstarte Tails og deaktivere MAC spoofing."
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:38
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
msgid ""
"\"<b>Not enough memory available to check for upgrades.</b>\n"
"\n"
......@@ -1346,7 +1375,7 @@ msgstr ""
"Eller foretag en manuel opgradering.\n"
"Se https://tails.boum.org/doc/first_steps/upgrade#manual\""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:75
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
msgid "error:"
msgstr "fejl:"
......@@ -1452,17 +1481,17 @@ msgstr "{partition_name} på {drive_name}"
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229
msgid "Wrong passphrase or parameters"
msgstr "Forkert adgangskode eller parametre"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231
msgid "Error unlocking volume"
msgstr "Fejl ved oplåsning af diskområde"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:235
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
......@@ -1471,13 +1500,13 @@ msgstr ""
"Kunne ikke låse op for diskområdet {volume_name}:\n"
"{error_message}"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:337
msgid "One or more applications are keeping the volume busy."
msgstr "En eller flere programmer bruger diskområdet."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:343
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
......@@ -1486,7 +1515,7 @@ msgstr ""
"Kunne ikke låse diskområdet {volume_name}:\n"
"{error_message}"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:345
msgid "Locking the volume failed"
msgstr "Låsning af diskområdet mislykkedes"
......
po/de.po
View file @ ef8dc7b5
......@@ -37,7 +37,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-03-21 09:59+0100\n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
"PO-Revision-Date: 2020-03-26 15:22+0000\n"
"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/"
......@@ -792,7 +792,7 @@ msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:343
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
msgid "Error"
msgstr "Fehler"
......@@ -867,7 +867,7 @@ msgid ""
"You may now close this application."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:19
msgid "su is disabled. Please use sudo instead."
msgstr ""
......@@ -883,6 +883,34 @@ msgid ""
"option?"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42
msgid "Import Failed"
msgstr ""
#. Translators: Don't translate {path} or {error},
#. they are placeholders and will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:45
#, python-brace-format
msgid ""
"Failed to import keys from {path}:\n"
"{error}"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] ""
msgstr[1] ""
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
msgstr[0] ""
msgstr[1] ""
#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
msgid "Lock screen"
msgstr "Sperrbildschirm"
......@@ -1190,7 +1218,7 @@ msgid ""
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:38
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
msgid ""
"\"<b>Not enough memory available to check for upgrades.</b>\n"
"\n"
......@@ -1203,7 +1231,7 @@ msgid ""
"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:75
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
msgid "error:"
msgstr "Fehler:"
......@@ -1310,37 +1338,37 @@ msgstr ""
msgid "{volume_name} – {drive_name}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229
msgid "Wrong passphrase or parameters"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:235
#, python-brace-f