Commit 56323b87 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'devel' into feature/15583-replace-su-with-message-to-use-sudo

parents 6fbcfff3 c293b923
......@@ -10,6 +10,10 @@ Package: b43-fwcutter
Pin: release o=Debian,n=sid
Pin-Priority: 999
Package: enigmail
Pin: origin deb.tails.boum.org
Pin-Priority: -1
Package: firmware-b43-installer
Pin: release o=Debian,n=sid
Pin-Priority: 999
......
......@@ -60,8 +60,18 @@ pref("mailnews.auto_config.guess.timeout", 30);
// We disable Memory Hole for encrypted email until support is more
// mature and widely spread (#15201).
pref("extensions.enigmail.protectedHeaders", 0);
// This setting is a good guess - but not used at the moment
pref("extensions.torbirdy.custom.extensions.enigmail.protectedHeaders", 0);
// Those settings are useless at the moment, just needed to display
// the correct checkmark in torbirdy (#13649#note-31).
pref("extensions.enigmail.protectHeaders", false);
pref("extensions.torbirdy.custom.extensions.enigmail.protectHeaders", false);
// Disable Autocrypt by default for new accounts (#16222).
// This does not change anything for accounts that were created before.
pref("mail.server.default.enableAutocrypt", false);
// Don't decrypt subordinate message parts that otherwise might reveal
// decrypted content to the attacker, i.e. the optional part of the fixes
// for EFAIL.
......
// Place your preferences for xul-ext-torbirdy in this file.
// You can override here the preferences specified in
// /usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
pref("extensions.torbirdy.emailwizard", true);
pref("extensions.torbirdy.gpg_already_torified", true);
......@@ -63,7 +63,7 @@ reconfigure_profile() {
}
thunderbird_profile_is_new() {
[ ! -f "${PROFILE}/extensions.ini" ]
[ ! -f "${PROFILE}/extensions.json" ]
}
initialize_enigmail_configured_version() {
......
From: Cyril Brulebois <cyril@debamax.com>
Date: Tue, 14 Aug 2018 12:53:48 +0200
Subject: Enable the email wizard in the system configuration
There's:
/usr/share/xul-ext/torbirdy/defaults/preferences/000system.js → /etc/xul-ext/torbirdy.js
which is read after:
/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
but setting extensions.torbirdy.emailwizard to true in the former
doesn't seem sufficient, even though strace confirms it's being read.
--- a/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
+++ b/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
@@ -8,6 +8,6 @@
pref("extensions.torbirdy.gpg_already_torified", false);
pref("extensions.torbirdy.timezone", true);
pref("extensions.torbirdy.whonix_run", true);
-pref("extensions.torbirdy.emailwizard", false);
+pref("extensions.torbirdy.emailwizard", true);
pref("extensions.torbirdy.fetchall", false);
pref("extensions.torbirdy.defaultprotocol", 0); // 0 - POP3, 1 - IMAP
From: Cyril Brulebois <cyril@debamax.com>
Date: Tue, 14 Aug 2018 22:48:09 +0200
Subject: Enable the gpg_already_torified setting in the system configuration
There's:
/usr/share/xul-ext/torbirdy/defaults/preferences/000system.js → /etc/xul-ext/torbirdy.js
which is read after:
/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
but setting extensions.torbirdy.gpg_already_torified to true in the former
doesn't seem sufficient, even though strace confirms it's being read.
Without this setting, fetching key from a keyserver doesn't work out of the
box.
--- a/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
+++ b/usr/share/xul-ext/torbirdy/defaults/preferences/prefs.js
@@ -5,7 +5,7 @@
pref("extensions.torbirdy.startup_folder", false);
pref("extensions.torbirdy.enigmail.throwkeyid", false);
pref("extensions.torbirdy.enigmail.confirmemail", false);
-pref("extensions.torbirdy.gpg_already_torified", false);
+pref("extensions.torbirdy.gpg_already_torified", true);
pref("extensions.torbirdy.timezone", true);
pref("extensions.torbirdy.whonix_run", true);
pref("extensions.torbirdy.emailwizard", true);
......@@ -3,6 +3,7 @@ tmp/pot/60-tor-ready.sh.pot
tmp/pot/config.py.pot
tmp/pot/configuration-window.ui.pot
tmp/pot/electrum.pot
tmp/pot/keepassx.pot
tmp/pot/replace-su-with-sudo.pot
tmp/pot/status-menu-helper-extension.js.pot
tmp/pot/tails-about.pot
......
......@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2014-12-05 17:21+0000\n"
"Last-Translator: Osama M. Mneina <o.mneina@gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
......@@ -116,6 +116,27 @@ msgstr "_Launch"
msgid "_Exit"
msgstr "_Exit"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2014-12-30 17:30+0000\n"
"Last-Translator: E <ehuseynzade@gmail.com>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/"
......@@ -109,6 +109,27 @@ msgstr "_Başlat"
msgid "_Exit"
msgstr "_Çıxış"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-03-08 03:22+0000\n"
"Last-Translator: Ivo\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/"
......@@ -123,6 +123,27 @@ msgstr "_Стартиране"
msgid "_Exit"
msgstr "_Изход"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-10-07 00:42+0000\n"
"Last-Translator: Emma Peel\n"
"Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/"
......@@ -119,6 +119,27 @@ msgstr "_Launch"
msgid "_Exit"
msgstr "_Exit"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-10-06 22:54+0000\n"
"Last-Translator: Emma Peel\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/"
......@@ -120,6 +120,27 @@ msgstr "_Launch"
msgid "_Exit"
msgstr "_Exit"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-10-06 22:32+0000\n"
"Last-Translator: Emma Peel\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
......@@ -132,6 +132,27 @@ msgstr "_Executa"
msgid "_Exit"
msgstr "_Surt"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2017-12-07 22:10+0000\n"
"Last-Translator: Michal Vašíček <michalvasicek@icloud.com>\n"
"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
......@@ -119,6 +119,27 @@ msgstr "_Spustit"
msgid "_Exit"
msgstr "_Odejít"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2014-04-30 09:10+0000\n"
"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/"
......@@ -110,6 +110,27 @@ msgstr "_Llwythwch"
msgid "_Exit"
msgstr "_Gadael"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-12-07 13:55+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/"
......@@ -132,6 +132,27 @@ msgstr "_Start"
msgid "_Exit"
msgstr "_Afslut"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -35,7 +35,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-10-24 15:37+0000\n"
"Last-Translator: Traumschule Riebau <traumschuleriebau@riseup.net>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/"
......@@ -147,6 +147,27 @@ msgstr "_Start"
msgid "_Exit"
msgstr "_Beenden"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -28,7 +28,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-11-02 10:29+0000\n"
"Last-Translator: Sofia K.\n"
"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
......@@ -141,6 +141,27 @@ msgstr "_Εκκίνηση"
msgid "_Exit"
msgstr "_Έξοδος"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2017-12-22 12:06+0000\n"
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/"
......@@ -115,6 +115,27 @@ msgstr "_Launch"
msgid "_Exit"
msgstr "_Exit"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
......@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-14 20:21+0100\n"
"POT-Creation-Date: 2019-01-14 21:20+0100\n"
"PO-Revision-Date: 2018-12-07 13:55+0000\n"
"Last-Translator: carolyn <carolyn@anhalt.org>\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/"
......@@ -130,6 +130,27 @@ msgstr "_Iniciar"
msgid "_Exit"
msgstr "_Salir"
#: config/chroot_local-includes/usr/local/bin/keepassx:17
#, sh-format
msgid ""
"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n"
"\n"
"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n"
"\n"
"<i>${filename}</i>\n"
"\n"
"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it "
"automatically in the future."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:25
msgid "Rename"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassx:26
msgid "Keep current name"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
msgid "su is disabled. Please use sudo instead."
msgstr ""
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment