Skip to content

GitLab

Commit c38eb0f0 authored by anonym's avatar anonym
Browse files

Do most of the Icedove → Thunderbird migration. 

This is just a massive 's/Icedove/Thunderbird/' both in terms of
content and filenames. No logic is changed, which should ease
reviewing of this massive commit.

Will-fix: #12242
parent e0b8ef9f
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 133 deletions
config/chroot_apt/preferences
View file @ c38eb0f0
......@@ -23,8 +23,8 @@ Package: firmware-zd1211
Pin: release o=Debian,n=sid
Pin-Priority: 999
Explanation: We ship our custom-built Icedove for now, see #6156
Package: icedove* iceowl* calendar-google-provider
Explanation: We ship our custom-built Thunderbird for now, see #6156
Package: thunderbird* calendar-google-provider
Pin: origin deb.tails.boum.org
Pin-Priority: 999
......
config/chroot_local-hooks/11-enable-icedove-addons → config/chroot_local-hooks/11-enable-thunderbird-addons
View file @ c38eb0f0
......@@ -3,10 +3,10 @@
set -e
set -u
EXT="/usr/lib/icedove/extensions"
EXT="/usr/lib/thunderbird/extensions"
[ -d "$EXT" ] || exit 1
echo "Enabling Torbirdy and Enigmail in Icedove"
echo "Enabling Torbirdy and Enigmail in Thunderbird"
ln -s /usr/share/xul-ext/torbirdy "${EXT}/castironthunderbirdclub@torproject.org"
ln -s /usr/share/xul-ext/enigmail "${EXT}/{847b3a00-7ab1-11d4-8f02-006008948af5}"
config/chroot_local-hooks/53-icedove-menu deleted 100755 → 0
View file @ e0b8ef9f
#!/bin/sh
set -e
echo 'Updating icedove.desktop'
sed -i 's;^Exec=icedove;Exec=/usr/local/bin/icedove;' /usr/share/applications/icedove.desktop
config/chroot_local-hooks/53-thunderbird-menu 0 → 100755
View file @ c38eb0f0
#!/bin/sh
set -e
echo 'Updating thunderbird.desktop'
sed -i --regexp-extended \
's;^Exec=\S+;Exec=/usr/local/bin/thunderbird;' \
/usr/share/applications/thunderbird.desktop
config/chroot_local-includes/etc/dconf/db/local.d/00_Tails_defaults
View file @ c38eb0f0
......@@ -78,4 +78,4 @@ lid-close-battery-action = 'blank'
[org/gnome/shell]
enabled-extensions = ['apps-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'window-list@gnome-shell-extensions.gcampax.github.com', 'florenceIndicator@UshakovVasilii_Github.yahoo.com', 'TopIcons@phocean.net', 'shutdown-helper@tails.boum.org', 'torstatus@tails.boum.org']
favorite-apps=['tor-browser.desktop', 'icedove.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
favorite-apps=['tor-browser.desktop', 'thunderbird.desktop', 'pidgin.desktop', 'keepassx.desktop', 'gnome-terminal.desktop']
config/chroot_local-includes/etc/skel/.local/share/applications/mimeapps.list
View file @ c38eb0f0
......@@ -9,11 +9,11 @@ application/pgp-encrypted=seahorse-pgp-encrypted.desktop
application/pgp-keys=seahorse-pgp-keys.desktop
application/pgp-signature=seahorse-pgp-signature.desktop
application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop
x-scheme-handler/mailto=icedove.desktop
x-scheme-handler/mailto=thunderbird.desktop
[Added Associations]
application/pgp-encrypted=seahorse-pgp-encrypted.desktop
application/pgp-keys=seahorse-pgp-keys.desktop
application/pgp-signature=seahorse-pgp-signature.desktop
application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop
x-scheme-handler/mailto=icedove.desktop
x-scheme-handler/mailto=thunderbird.desktop
config/chroot_local-includes/etc/skel/.icedove/profile.default/chrome/userChrome.css → config/chroot_local-includes/etc/skel/.thunderbird/profile.default/chrome/userChrome.css
View file @ c38eb0f0
......@@ -9,7 +9,7 @@
#torbirdy-anon-settings,
#torbirdy-anonservice,
/* Hide "Chat account" on Icedove's start-up page */
/* Hide "Chat account" on Thunderbird's start-up page */
#CreateAccountChat
{ display: none; }
config/chroot_local-includes/etc/icedove/pref/icedove.js → config/chroot_local-includes/etc/thunderbird/pref/thunderbird.js
View file @ c38eb0f0
......@@ -32,13 +32,13 @@ pref("extensions.enabledScopes", 4);
// Only show the tab bar if there's more than one tab to display
pref("mail.tabs.autoHide", true);
// Try to disable "Would you like to help Icedove Mail/News by automatically reporting memory usage, performance, and responsiveness to Mozilla"
// Try to disable "Would you like to help Thunderbird Mail/News by automatically reporting memory usage, performance, and responsiveness to Mozilla"
pref("toolkit.telemetry.prompted", 2);
pref("toolkit.telemetry.rejected", true);
pref("toolkit.telemetry.enabled", false);
// Only allow Icedove's automatic configuration wizard to use and
// configure secure (SSL/TLS) protocols. This is the Icedove default
// Only allow Thunderbird's automatic configuration wizard to use and
// configure secure (SSL/TLS) protocols. This is the Thunderbird default
// but let's be extra sure!
pref("mailnews.auto_config.ssl_only", true);
// Drop auto-fetched configurations using Oauth2 -- they do not work
......
config/chroot_local-includes/usr/local/bin/icedove → config/chroot_local-includes/usr/local/bin/thunderbird
View file @ c38eb0f0
......@@ -11,27 +11,27 @@ TEXTDOMAIN="tails"
export TEXTDOMAIN
CLAWSMAIL_CONFIG_DIR="${HOME}/.claws-mail"
ICEDOVE_CONFIG_DIR="${HOME}/.icedove"
PROFILE="${ICEDOVE_CONFIG_DIR}/profile.default"
THUNDERBIRD_CONFIG_DIR="${HOME}/.thunderbird"
PROFILE="${THUNDERBIRD_CONFIG_DIR}/profile.default"
claws_mail_config_is_persistent() {
[ "$(findmnt --noheadings --output SOURCE --target "${CLAWSMAIL_CONFIG_DIR}")" = "/dev/mapper/TailsData_unlocked[/claws-mail]" ]
}
icedove_config_is_persistent() {
[ "$(findmnt --noheadings --output SOURCE --target "${ICEDOVE_CONFIG_DIR}")" = "/dev/mapper/TailsData_unlocked[/icedove]" ]
thunderbird_config_is_persistent() {
[ "$(findmnt --noheadings --output SOURCE --target "${THUNDERBIRD_CONFIG_DIR}")" = "/dev/mapper/TailsData_unlocked[/thunderbird]" ]
}
warn_about_claws_mail_persistence() {
local dialog_msg="<b><big>`gettext \"The <b>Claws Mail</b> persistence feature is activated.\"`</big></b>
`gettext \"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your data</a> before starting <b>Icedove</b>.\"`"
`gettext \"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your data</a> before starting <b>Thunderbird</b>.\"`"
if [ -f "${PROFILE}/prefs.js" ]; then
dialog_msg="${dialog_msg}
`gettext \"If you already migrated your emails to <b>Icedove</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to remove this warning.\"`"
`gettext \"If you already migrated your emails to <b>Thunderbird</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to remove this warning.\"`"
fi
local launch="`gettext \"_Launch\"`"
......@@ -43,7 +43,7 @@ warn_about_claws_mail_persistence() {
configure_default_incoming_protocol() {
# For extensions.torbirdy.defaultprotocol, POP = 0, IMAP = 1
local default_protocol
if icedove_config_is_persistent; then
if thunderbird_config_is_persistent; then
default_protocol=0
else
default_protocol=1
......@@ -53,8 +53,8 @@ configure_default_incoming_protocol() {
"${default_protocol}"
}
start_icedove() {
# Give Icedove its own temp directory, similar rationale to a1fd1f0f & #9558.
start_thunderbird() {
# Give Thunderbird its own temp directory, similar rationale to a1fd1f0f & #9558.
TMPDIR="${PROFILE}/tmp"
mkdir --mode=0700 -p "$TMPDIR"
export TMPDIR
......@@ -62,11 +62,11 @@ start_icedove() {
unset SESSION_MANAGER
configure_default_incoming_protocol
/usr/bin/icedove --class "Icedove" -profile "${PROFILE}" "${@}"
/usr/bin/thunderbird --class "Thunderbird" -profile "${PROFILE}" "${@}"
}
if claws_mail_config_is_persistent && [ -f "${CLAWSMAIL_CONFIG_DIR}/accountrc" ]; then
warn_about_claws_mail_persistence || exit 0
fi
start_icedove "${@}"
start_thunderbird "${@}"
config/chroot_local-packageslists/tails-common.list
View file @ c38eb0f0
......@@ -131,8 +131,6 @@ haveged
# needed by laptop-mode-tools to spin-down hard drives
hdparm
hopenpgp-tools
icedove
icedove-l10n-all
inkscape
iptables
# ships isolinux.bin in syslinux 6.x packaging
......@@ -224,6 +222,8 @@ traverso
ttf-dejavu
tcpdump
tcpflow
thunderbird
thunderbird-l10n-all
tor
tor-geoipdb
sound-juicer
......@@ -406,7 +406,8 @@ xdotool
python-qt4
python-trezor
# Provide gnome-open (used to open e.g. URLs in KeePassX, Icedove, Electrum...)
# Provide gnome-open (used to open e.g. URLs in KeePassX, Thunderbird,
# Electrum...)
libgnome2-bin
# onion-grater
......
features/build.feature
View file @ c38eb0f0
......@@ -346,22 +346,22 @@ Feature: custom APT sources to build branches
And I should see the 'feature-7756-reintroduce-whisperback' suite
Scenario: build from a feature branch with overlays based on devel
Given I am working on the feature/icedove branch based on devel
And config/APT_overlays.d contains 'feature-icedove'
Given I am working on the feature/thunderbird branch based on devel
And config/APT_overlays.d contains 'feature-thunderbird'
And config/APT_overlays.d contains 'bugfix-bar'
When I successfully run tails-custom-apt-sources
Then I should see the 'devel' suite
And I should see the 'feature-icedove' suite
And I should see the 'feature-thunderbird' suite
And I should see the 'bugfix-bar' suite
Scenario: build from a feature branch without overlays based on devel
Given I am working on the feature/icedove branch based on devel
Given I am working on the feature/thunderbird branch based on devel
And the config/APT_overlays.d directory is empty
When I successfully run tails-custom-apt-sources
Then I should see only the 'devel' suite
Scenario: build from a feature branch based on devel with no encoded time-based snapshot
Given I am working on the feature/icedove branch based on devel
Given I am working on the feature/thunderbird branch based on devel
And no frozen APT snapshot is encoded in config/APT_snapshots.d
When I successfully run "apt-snapshots-serials prepare-build"
And I successfully run "apt-mirror debian"
......@@ -372,7 +372,7 @@ Feature: custom APT sources to build branches
Then I should see a time-based snapshot
Scenario: build from a feature branch based on devel with encoded time-based snapshots
Given I am working on the feature/icedove branch based on devel
Given I am working on the feature/thunderbird branch based on devel
And frozen APT snapshots are encoded in config/APT_snapshots.d
When I successfully run "apt-snapshots-serials prepare-build"
And I run "apt-mirror debian"
......@@ -392,7 +392,7 @@ Feature: custom APT sources to build branches
And I should see the 'bugfix-bar' suite
Scenario: build from a feature branch without overlays based on feature/jessie
Given I am working on the feature/icedove branch based on feature/jessie
Given I am working on the feature/thunderbird branch based on feature/jessie
And the config/APT_overlays.d directory is empty
When I successfully run tails-custom-apt-sources
Then I should see only the 'feature-jessie' suite
......
features/step_definitions/icedove.rb → features/step_definitions/thunderbird.rb
View file @ c38eb0f0
def icedove_app
Dogtail::Application.new('Icedove')
def thunderbird_app
Dogtail::Application.new('Thunderbird')
end
def icedove_main
def thunderbird_main
# The main window title depends on context so without regexes it
# will be hard to find it, but it so happens that it is always the
# first frame of Icedove, so we do not have to be specific.
icedove_app.child(roleName: 'frame')
# first frame of Thunderbird, so we do not have to be specific.
thunderbird_app.child(roleName: 'frame')
end
def icedove_wizard
icedove_app.child('Mail Account Setup', roleName: 'frame')
def thunderbird_wizard
thunderbird_app.child('Mail Account Setup', roleName: 'frame')
end
def icedove_inbox
folder_view = icedove_main.child($config['Icedove']['address'],
def thunderbird_inbox
folder_view = thunderbird_main.child($config['Thunderbird']['address'],
roleName: 'table row').parent
folder_view.children(roleName: 'table row', recursive: false).find do |e|
e.name.match(/^Inbox( .*)?$/)
end
end
When /^I start Icedove$/ do
When /^I start Thunderbird$/ do
workaround_pref_lines = [
# When we generate a random subject line it may contain one of the
# keywords that will make Icedove show an extra prompt when trying
# keywords that will make Thunderbird show an extra prompt when trying
# to send an email. Let's disable this feature.
'pref("mail.compose.attachment_reminder", false);'
]
workaround_pref_lines.each do |line|
$vm.file_append('/etc/icedove/pref/icedove.js ', line)
$vm.file_append('/etc/thunderbird/pref/thunderbird.js ', line)
end
step 'I start "Icedove" via the GNOME "Internet" applications menu'
try_for(60) { icedove_main }
step 'I start "Thunderbird" via the GNOME "Internet" applications menu'
try_for(60) { thunderbird_main }
end
When /^I have not configured an email account$/ do
conf_path = "/home/#{LIVE_USER}/.icedove/profile.default/prefs.js"
conf_path = "/home/#{LIVE_USER}/.thunderbird/profile.default/prefs.js"
if $vm.file_exist?(conf_path)
icedove_prefs = $vm.file_content(conf_path).chomp
assert(!icedove_prefs.include?('mail.accountmanager.accounts'))
thunderbird_prefs = $vm.file_content(conf_path).chomp
assert(!thunderbird_prefs.include?('mail.accountmanager.accounts'))
end
end
Then /^I am prompted to setup an email account$/ do
icedove_wizard
thunderbird_wizard
end
Then /^I cancel setting up an email account$/ do
icedove_wizard.button('Cancel').click
thunderbird_wizard.button('Cancel').click
end
Then /^I open Icedove's Add-ons Manager$/ do
icedove_main.button('AppMenu').click
icedove_main.child('Add-ons', roleName: 'menu item').click
@icedove_addons = icedove_app.child(
'Add-ons Manager - Icedove Mail/News', roleName: 'frame'
Then /^I open Thunderbird's Add-ons Manager$/ do
thunderbird_main.button('AppMenu').click
thunderbird_main.child('Add-ons', roleName: 'menu item').click
@thunderbird_addons = thunderbird_app.child(
'Add-ons Manager - Thunderbird Mail/News', roleName: 'frame'
)
end
Then /^I click the extensions tab$/ do
@icedove_addons.child('Extensions', roleName: 'list item').click
@thunderbird_addons.child('Extensions', roleName: 'list item').click
end
Then /^I see that only the (.+) addons are enabled in Icedove$/ do |addons|
Then /^I see that only the (.+) addons are enabled in Thunderbird$/ do |addons|
expected_addons = addons.split(/, | and /)
actual_addons =
@icedove_addons.child('TorBirdy', roleName: 'label')
@thunderbird_addons.child('TorBirdy', roleName: 'label')
.parent.parent.children(roleName: 'list item', recursive: false)
.map { |item| item.name }
expected_addons.each do |addon|
......@@ -78,39 +78,39 @@ Then /^I see that only the (.+) addons are enabled in Icedove$/ do |addons|
end
Then /^I see that Torbirdy is configured to use Tor$/ do
icedove_main.child(roleName: 'status bar')
thunderbird_main.child(roleName: 'status bar')
.child('TorBirdy Enabled: Tor', roleName: 'label')
end
When /^I enter my email credentials into the autoconfiguration wizard$/ do
icedove_wizard.child('Email address:', roleName: 'entry')
.typeText($config['Icedove']['address'])
icedove_wizard.child('Password:', roleName: 'entry')
.typeText($config['Icedove']['password'])
icedove_wizard.button('Continue').click
thunderbird_wizard.child('Email address:', roleName: 'entry')
.typeText($config['Thunderbird']['address'])
thunderbird_wizard.child('Password:', roleName: 'entry')
.typeText($config['Thunderbird']['password'])
thunderbird_wizard.button('Continue').click
# This button is shown if and only if a configuration has been found
try_for(120) { icedove_wizard.button('Done') }
try_for(120) { thunderbird_wizard.button('Done') }
end
Then /^the autoconfiguration wizard's choice for the (incoming|outgoing) server is secure (.+)$/ do |type, protocol|
type = type.capitalize + ':'
assert_not_nil(
icedove_wizard.child(type, roleName: 'entry').text
thunderbird_wizard.child(type, roleName: 'entry').text
.match(/^#{protocol},[^,]+, (SSL|STARTTLS)$/)
)
end
When /^I fetch my email$/ do
account = icedove_main.child($config['Icedove']['address'],
account = thunderbird_main.child($config['Thunderbird']['address'],
roleName: 'table row')
account.click
icedove_main = icedove_app.child("#{$config['Icedove']['address']} - Icedove Mail/News", roleName: 'frame')
thunderbird_main = thunderbird_app.child("#{$config['Thunderbird']['address']} - Thunderbird Mail/News", roleName: 'frame')
icedove_main.child('Mail Toolbar', roleName: 'tool bar')
thunderbird_main.child('Mail Toolbar', roleName: 'tool bar')
.button('Get Messages').click
try_for(120) do
begin
icedove_main.child(roleName: 'status bar', retry: false)
thunderbird_main.child(roleName: 'status bar', retry: false)
.child(roleName: 'progress bar', retry: false)
false
rescue
......@@ -126,7 +126,7 @@ When /^I accept the (?:autoconfiguration wizard's|manual) configuration$/ do
begin
# Spam the button, even if it is disabled (while it is still
# testing the password).
icedove_wizard.button('Done').click
thunderbird_wizard.button('Done').click
false
rescue
true
......@@ -147,11 +147,11 @@ When /^I select the autoconfiguration wizard's (IMAP|POP3) choice$/ do |protocol
else
choice = 'POP3 (keep mail on your computer)'
end
icedove_wizard.child(choice, roleName: 'radio button').click
thunderbird_wizard.child(choice, roleName: 'radio button').click
end
When /^I select manual configuration$/ do
icedove_wizard.button('Manual config').click
thunderbird_wizard.button('Manual config').click
end
When /^I alter the email configuration to use (.*) over a hidden services$/ do |protocol|
......@@ -163,23 +163,23 @@ When /^I alter the email configuration to use (.*) over a hidden services$/ do |
else
raise "Unknown mail protocol '#{protocol}'"
end
entry = icedove_wizard.child(entry_name, roleName: 'entry')
entry = thunderbird_wizard.child(entry_name, roleName: 'entry')
entry.text = ''
entry.typeText($config['Icedove']["#{protocol.downcase}_hidden_service"])
entry.typeText($config['Thunderbird']["#{protocol.downcase}_hidden_service"])
end
When /^I send an email to myself$/ do
icedove_main.child('Mail Toolbar', roleName: 'tool bar').button('Write').click
compose_window = icedove_app.child('Write: (no subject)')
thunderbird_main.child('Mail Toolbar', roleName: 'tool bar').button('Write').click
compose_window = thunderbird_app.child('Write: (no subject)')
compose_window.child('To:', roleName: 'autocomplete').child(roleName: 'entry')
.typeText($config['Icedove']['address'])
.typeText($config['Thunderbird']['address'])
# The randomness of the subject will make it easier for us to later
# find *exactly* this email. This makes it safe to run several tests
# in parallel.
@subject = "Automated test suite: #{random_alnum_string(32)}"
compose_window.child('Subject:', roleName: 'entry')
.typeText(@subject)
compose_window = icedove_app.child("Write: #{@subject}")
compose_window = thunderbird_app.child("Write: #{@subject}")
compose_window.child('about:blank', roleName: 'document frame')
.typeText('test')
compose_window.child('Composition Toolbar', roleName: 'tool bar')
......@@ -192,11 +192,11 @@ end
Then /^I can find the email I sent to myself in my inbox$/ do
recovery_proc = Proc.new { step 'I fetch my email' }
retry_tor(recovery_proc) do
icedove_inbox.click
filter = icedove_main.child('Filter these messages <Ctrl+Shift+K>',
thunderbird_inbox.click
filter = thunderbird_main.child('Filter these messages <Ctrl+Shift+K>',
roleName: 'entry')
filter.typeText(@subject)
hit_counter = icedove_main.child('1 message')
hit_counter = thunderbird_main.child('1 message')
inbox_view = hit_counter.parent
message_list = inbox_view.child(roleName: 'table')
the_message = message_list.child(@subject, roleName: 'table cell')
......@@ -207,11 +207,11 @@ Then /^I can find the email I sent to myself in my inbox$/ do
end
end
Then /^my Icedove inbox is non-empty$/ do
icedove_inbox.click
Then /^my Thunderbird inbox is non-empty$/ do
thunderbird_inbox.click
# The button is located on the first row in the message list, the
# one that shows the column labels (Subject, From, ...).
message_list = icedove_main.child('Select columns to display',
message_list = thunderbird_main.child('Select columns to display',
roleName: 'push button')
.parent.parent
visible_messages = message_list.children(recursive: false,
......
features/icedove.feature → features/thunderbird.feature
View file @ c38eb0f0
#11465
@product @check_tor_leaks
Feature: Icedove email client
Feature: Thunderbird email client
As a Tails user
I may want to use an email client
Background:
Given I have started Tails from DVD and logged in and the network is connected
And I have not configured an email account
When I start Icedove
When I start Thunderbird
Then I am prompted to setup an email account
Scenario: Only the expected addons are installed
Given I cancel setting up an email account
When I open Icedove's Add-ons Manager
When I open Thunderbird's Add-ons Manager
And I click the extensions tab
Then I see that only the Enigmail and TorBirdy addons are enabled in Icedove
Then I see that only the Enigmail and TorBirdy addons are enabled in Thunderbird
Scenario: Torbirdy is configured to use Tor
Given I cancel setting up an email account
......@@ -22,14 +22,14 @@ Feature: Icedove email client
#11890
@fragile
Scenario: Icedove's autoconfiguration wizard defaults to IMAP and secure protocols
Scenario: Thunderbird's autoconfiguration wizard defaults to IMAP and secure protocols
When I enter my email credentials into the autoconfiguration wizard
Then the autoconfiguration wizard's choice for the incoming server is secure IMAP
Then the autoconfiguration wizard's choice for the outgoing server is secure SMTP
#11890
@fragile
Scenario: Icedove can send emails, and receive emails over IMAP
Scenario: Thunderbird can send emails, and receive emails over IMAP
When I enter my email credentials into the autoconfiguration wizard
Then the autoconfiguration wizard's choice for the incoming server is secure IMAP
When I accept the autoconfiguration wizard's configuration
......@@ -39,11 +39,11 @@ Feature: Icedove email client
#11890
@fragile
Scenario: Icedove can download the inbox with POP3
Scenario: Thunderbird can download the inbox with POP3
When I enter my email credentials into the autoconfiguration wizard
Then the autoconfiguration wizard's choice for the incoming server is secure IMAP
When I select the autoconfiguration wizard's POP3 choice
Then the autoconfiguration wizard's choice for the incoming server is secure POP3
When I accept the autoconfiguration wizard's configuration
And I fetch my email
Then my Icedove inbox is non-empty
Then my Thunderbird inbox is non-empty
po/POTFILES.in
View file @ c38eb0f0
......@@ -2,7 +2,6 @@
tmp/pot/60-tor-ready.sh.pot
tmp/pot/config.py.pot
tmp/pot/electrum.pot
tmp/pot/icedove.pot
tmp/pot/shutdown-helper-extension.js.pot
tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot
......@@ -11,6 +10,7 @@ tmp/pot/tails-security-check.pot
tmp/pot/tails-spoof-mac.pot
tmp/pot/tails-upgrade-frontend-wrapper.pot
tmp/pot/tails-virt-notify-user.pot
tmp/pot/thunderbird.pot
tmp/pot/tor-browser.pot
tmp/pot/unsafe-browser.pot
......
po/ar.po
View file @ c38eb0f0
......@@ -83,31 +83,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
#: config/chroot_local-includes/usr/local/bin/icedove:37
#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Launch"
#: config/chroot_local-includes/usr/local/bin/electrum:24
#: config/chroot_local-includes/usr/local/bin/icedove:38
#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Exit"
#: config/chroot_local-includes/usr/local/bin/icedove:27
#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/icedove:29
#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
"data</a> before starting <b>Icedove</b>."
"data</a> before starting <b>Thunderbird</b>."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/icedove:34
#: config/chroot_local-includes/usr/local/bin/thunderbird:34
msgid ""
"If you already migrated your emails to <b>Icedove</b>, you should <a "
"If you already migrated your emails to <b>Thunderbird</b>, you should <a "
"href='https://tails.boum.org/doc/anonymous_internet/"
"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
"remove this warning."
......
po/az.po
View file @ c38eb0f0
......@@ -76,31 +76,31 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:23
#: config/chroot_local-includes/usr/local/bin/icedove:37
#: config/chroot_local-includes/usr/local/bin/thunderbird:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "_Başlat"
#: config/chroot_local-includes/usr/local/bin/electrum:24
#: config/chroot_local-includes/usr/local/bin/icedove:38
#: config/chroot_local-includes/usr/local/bin/thunderbird:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "_Çıxış"
#: config/chroot_local-includes/usr/local/bin/icedove:27
#: config/chroot_local-includes/usr/local/bin/thunderbird:27
msgid "The <b>Claws Mail</b> persistence feature is activated."
msgstr ""
#: config/chroot_local-includes/usr/local/bin/icedove:29
#: config/chroot_local-includes/usr/local/bin/thunderbird:29
msgid ""
"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
"tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
"data</a> before starting <b>Icedove</b>."