Commit caface10 authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/testing' into feature/8860-tails-installer-improvements

parents e9e9bb64 2593cffc
......@@ -16,6 +16,17 @@ if [ -e config/amnesia.local ] ; then
. config/amnesia.local
fi
if [ -n "${SOURCE_DATE_EPOCH}" ]; then
CURRENT_EPOCH="$(date --utc +%s)"
if [ "${SOURCE_DATE_EPOCH}" -gt "${CURRENT_EPOCH}" ]; then
echo "SOURCE_DATE_EPOCH is set before the current time. Exiting."
exit 1
fi
else
echo "SOURCE_DATE_EPOCH is not set. Exiting."
exit 1
fi
# get git branch or tag so we can set the basename appropriately, i.e.:
# * if we build from a tag: tails-$ARCH-$TAG.iso
# * otherwise: tails-$ARCH-$BRANCH-$VERSION-$TIME-$COMMIT.iso
......
http://torbrowser-archive.tails.boum.org/7.0.4-build1/
http://torbrowser-archive.tails.boum.org/7.0.6-build3/
5ea01a667f0c11e0dc94da77ee83e8c97589ac128f0204f086e37313f48f1f8f tor-browser-linux64-7.0.4_ar.tar.xz
befcdc8a1744844053bdc91a046eedcdfda94dd5abcc4457fc947cef171d38ed tor-browser-linux64-7.0.4_de.tar.xz
7d09fdf1dad4657de16556deecf497253f8564bdbe85a9e7fa00f97bb6351f9e tor-browser-linux64-7.0.4_en-US.tar.xz
78dd846f169b6c77ebdc14dd2ea651b7d48b8809eda99f5bc0d1ac93365e5747 tor-browser-linux64-7.0.4_es-ES.tar.xz
3e6ff11238cb55dd0288d8ab3e1d0c23dc292a002deee5d77f8e38d55858d1bd tor-browser-linux64-7.0.4_fa.tar.xz
96df00deb39ca005ab213b163bb1a7b3bea4250830efa2eeeafedde1d7d843fb tor-browser-linux64-7.0.4_fr.tar.xz
da35fb87b404bfcb0ba99c9dd946db66e2d74715bbf94d3acd66d678fad61191 tor-browser-linux64-7.0.4_it.tar.xz
f62e349ecd9d739ecf2f33418c3470e6e1e36cdc4290ee5a8231db3cffbf3092 tor-browser-linux64-7.0.4_ja.tar.xz
7b91f34f4390c60a91b23649769db40108cd8c93f20e6b61c5ace4419df5dda7 tor-browser-linux64-7.0.4_ko.tar.xz
a87cd08144d7ac49358e7c224e315728ef94b0b4643650965a6cca4d7344981f tor-browser-linux64-7.0.4_nl.tar.xz
8b78759c3da600aa194f01797df3cbed6c9bd273ccd01ea31f2655c76c164852 tor-browser-linux64-7.0.4_pl.tar.xz
ca372a192804284b893bd24311f157178cd1f1b4b5698bf1e6bbfe38274567c9 tor-browser-linux64-7.0.4_pt-BR.tar.xz
48a9091afc8419d1349035e741c56794a0aca781e396aae15f924252af0c4d14 tor-browser-linux64-7.0.4_ru.tar.xz
250d2ea1b24770a2729ecfa3f1750e49020a114bce7ceae5e8ccb8e40e9606d6 tor-browser-linux64-7.0.4_tr.tar.xz
80d2ac7fc9a6ea1cc21fe0276e36f901bcf3fd26ae45f39e8ff88e2ece6439bf tor-browser-linux64-7.0.4_vi.tar.xz
2633037a243bb02b14c7b8b28f145244f741fc4a87efe85edeb6a983cfc041bc tor-browser-linux64-7.0.4_zh-CN.tar.xz
36cd9715021cf6f9dd4915fa898cd15bdf896861ab1012496bfa51c9563b434d tor-browser-linux64-7.0.6_ar.tar.xz
9aded063cb4ad4338098ee0a6fb2ca45d7fe9a0ce541d6bc4c78f2a904fc2faa tor-browser-linux64-7.0.6_de.tar.xz
d5e0b7803902d08868bae59de3f939d390c513cc944c9aa28be8dc730ac8e387 tor-browser-linux64-7.0.6_en-US.tar.xz
46628403f482d2d396bfc8095ed6accd7824efb031a1477a66e0ce111729e3a4 tor-browser-linux64-7.0.6_es-ES.tar.xz
5d0162d7865acc1ce132dabb6cb02d6ebe2ab76dda7512fc48e640f51419378b tor-browser-linux64-7.0.6_fa.tar.xz
b5eb9997472872150edb54edebdf0e79c009d58651bff2bd7db0607c5c0b35d2 tor-browser-linux64-7.0.6_fr.tar.xz
c996d62702479a4d5eed905125303bf9fe4ce4e9f73265932dee73ea5bfa1598 tor-browser-linux64-7.0.6_it.tar.xz
fda12b98b4415e916063c9c12174e7871e7b475be8498b5b092a13358c4b7fd6 tor-browser-linux64-7.0.6_ja.tar.xz
d63231e045fa775ed3335801aecbed230adb3a2c738f73483802c82510f4455f tor-browser-linux64-7.0.6_ko.tar.xz
8728852e82e5da1795cee97eea5357956798ec3db5c19c5bc775aa05127ce8da tor-browser-linux64-7.0.6_nl.tar.xz
b5788645e2e8b0712d5ad13c2beab75002142a0d880a0673978605d9d9db842f tor-browser-linux64-7.0.6_pl.tar.xz
49fc1a3fd865ee33eb5be42b7d3488d69ab388245992379f9e7ec6aabcfa4179 tor-browser-linux64-7.0.6_pt-BR.tar.xz
651a5fed10f9c865af42ca470a28dd74e938b89d0ee883064e08e521fd3d62d4 tor-browser-linux64-7.0.6_ru.tar.xz
90c91b69ce381a7ea11033d16cc27a5573a4b35d7fd86c6cd298b22b4311fad8 tor-browser-linux64-7.0.6_tr.tar.xz
100fee5cc8421add7473b65645c991a23e0fe82437fbae63b62f96fe663cec95 tor-browser-linux64-7.0.6_vi.tar.xz
f5f4accd6a13022ada33d28b9aa17aac2081895c4774a8f5454cc49a90c2aaa6 tor-browser-linux64-7.0.6_zh-CN.tar.xz
......@@ -310,7 +310,15 @@ end
Given /^the Tails desktop is ready$/ do
desktop_started_picture = "GnomeApplicationsMenu#{@language}.png"
@screen.wait(desktop_started_picture, 180)
@screen.wait("DesktopTailsDocumentation.png", 30)
# Workaround #13461 by restarting nautilus-desktop
# if Desktop icons are not visible
begin
@screen.wait("DesktopTailsDocumentation.png", 30)
rescue FindFailed
step 'I kill the process "nautilus-desktop"'
$vm.spawn('nautilus-desktop', user: LIVE_USER)
@screen.wait("DesktopTailsDocumentation.png", 30)
end
# Disable screen blanking since we sometimes need to wait long
# enough for it to activate, which can mess with Sikuli wait():ing
# for some image.
......@@ -717,14 +725,6 @@ When /^I double-click on the (Tails documentation|Report an Error) launcher on t
end
end
When /^I click the blocked video icon$/ do
@screen.wait_and_click("TorBrowserBlockedVideo.png", 30)
end
When /^I accept to temporarily allow playing this video$/ do
@screen.wait_and_click("TorBrowserOkButton.png", 10)
end
When /^I click the HTML5 play button$/ do
@screen.wait_and_click("TorBrowserHtml5PlayButton.png", 30)
end
......
......@@ -223,7 +223,7 @@ When /^I stop the boot at the bootloader menu$/ do
end
When /^I wait for Tails to finish wiping the memory$/ do
@screen.wait("MemoryWipeCompleted.png", 30)
@screen.wait("MemoryWipeCompleted.png", 90)
end
When(/^I fill a (\d+) MiB file with a known pattern on the (persistent|root) filesystem$/) do |size_MiB, fs|
......
......@@ -35,11 +35,15 @@ else
package_members << "org.sikuli.script.Settings"
end
# Note: we can't use anything that starts with "Java" on the right
# side, otherwise the :Java constant is defined and then
# test/unit/assertions will use JRuby-specific code that breaks our
# own code.
translations = Hash[
"org.sikuli.script", "Sikuli",
"org.sikuli.basics", "Sikuli",
"java.lang", "Java::Lang",
"java.io", "Java::Io",
"java.lang", "RJava::Lang",
"java.io", "RJava::Io",
]
for p in package_members
......@@ -61,9 +65,9 @@ end
# Bind Java's stdout to debug_log() via our magical pseudo fifo
# logger.
def bind_java_to_pseudo_fifo_logger
file_output_stream = Java::Io::FileOutputStream.new(DEBUG_LOG_PSEUDO_FIFO)
print_stream = Java::Io::PrintStream.new(file_output_stream)
Java::Lang::System.setOut(print_stream)
file_output_stream = RJava::Io::FileOutputStream.new(DEBUG_LOG_PSEUDO_FIFO)
print_stream = RJava::Io::PrintStream.new(file_output_stream)
RJava::Lang::System.setOut(print_stream)
end
def findfailed_hook(pic)
......
......@@ -57,9 +57,6 @@ Feature: Browsing the web using the Tor Browser
When I start the Tor Browser
And the Tor Browser loads the startup page
And I open the address "https://tails.boum.org/lib/test_suite/test.webm" in the Tor Browser
And I click the blocked video icon
And I see "TorBrowserNoScriptTemporarilyAllowDialog.png" after at most 30 seconds
And I accept to temporarily allow playing this video
Then I see "TorBrowserSampleRemoteWebMVideoFrame.png" after at most 180 seconds
#11592
......
......@@ -143,11 +143,13 @@ The GNOME Documentation Style Guide explains very well the
When using screenshots of full windows, we include the window decoration
and a border of blue background to clarify the context and the nature of
the image. To take such a screenshot in *Gimp* choose **File**&nbsp;▸
**Create**&nbsp;▸ **Screenshot&hellip;**) and select **Include windows
decoration**.
the image. To take such a screenshot:
We also sometimes resize the screenshots to 66%, either when they are
1. In *Gimp* choose **File**&nbsp;▸ **Create**&nbsp;▸ **Screenshot&hellip;**).
2. Select **Include windows decoration**.
3. Make sure the blue border (`0x204a87`) on each side of the screenshot is at least 18px.
We also most of the time resize the screenshots to 66%, either when they are
too big or when they can be confused for the actual application (see
[[!tails_ticket 11527]]).
......
......@@ -122,13 +122,16 @@ systems managed by anyone other than Tails core developers.
Key details
-----------
pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2018-01-11]
pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2019-01-11]
Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F
uid [ full ] Tails developers (offline long-term identity key) <tails@boum.org>
uid [ unknown] Tails developers <tails@boum.org>
sub rsa4096/0x98FEC6BC752A3DB6 2015-01-18 [S] [expires: 2018-01-11]
sub rsa4096/0x3C83DCB52F699C56 2015-01-18 [S] [expires: 2018-01-11]
sub rsa4096/0xAF292B44A0EDAA41 2016-08-30 [S] [expires: 2018-01-11]
sub rsa4096/0xD21DAD38AF281C0B 2017-08-28 [S] [expires: 2019-01-11]
sub rsa4096/0x3020A7A9C2B72733 2017-08-28 [S] [expires: 2019-01-11]
sub ed25519/0x90B2B4BD7AED235F 2017-08-28 [S] [expires: 2019-01-11]
How to get the public key?
--------------------------
......
......@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
"POT-Creation-Date: 2017-09-19 17:29+0200\n"
"PO-Revision-Date: 2013-02-26 14:28-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2017-09-19 16:25+0000\n"
"PO-Revision-Date: 2017-09-19 16:54+0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
"Language: \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.5.4\n"
"X-Generator: Poedit 1.8.11\n"
#. type: Bullet: ' - '
msgid ""
......@@ -26,15 +26,11 @@ msgstr ""
"encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]"
#. type: Bullet: ' - '
#, fuzzy
#| msgid ""
#| "[[!traillink Using_the_virtual_keyboard|encryption_and_privacy/"
#| "virtual_keyboard]]"
msgid ""
"[[!traillink Using_the_screen_keyboard|encryption_and_privacy/"
"virtual_keyboard]]"
msgstr ""
"[[!traillink Utiliser_un_clavier_virtuel|encryption_and_privacy/"
"[[!traillink Utiliser_le_clavier_visuel|encryption_and_privacy/"
"virtual_keyboard]]"
#. type: Bullet: ' - '
......
......@@ -7,20 +7,19 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2017-09-19 17:29+0200\n"
"PO-Revision-Date: 2016-05-31 09:28-0000\n"
"PO-Revision-Date: 2017-09-19 16:25+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\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.6.10\n"
"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Using the virtual keyboard\"]]\n"
#, no-wrap
msgid "[[!meta title=\"Using the screen keyboard\"]]\n"
msgstr "[[!meta title=\"Utiliser le clavier virtuel\"]]\n"
msgstr "[[!meta title=\"Utiliser le clavier visuel\"]]\n"
#. type: Plain text
#, no-wrap
......@@ -36,13 +35,7 @@ msgstr ""
"matériel.\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "You can use the [<span\n"
#| "class=\"application\">Florence</span>](http://florence.sourceforge.net/english.html)\n"
#| "virtual keyboard to protect you against a hardware keylogger when typing\n"
#| "passwords and sensitive text. To display the virtual keyboard, click on\n"
#| "the keyboard icon in the notification area.\n"
#, no-wrap
msgid ""
"You can use the [<span\n"
"class=\"application\">GNOME screen keyboard</span>](https://help.gnome.org/users/gnome-help/stable/keyboard-osk.html.en)\n"
......@@ -50,21 +43,11 @@ msgid ""
"passwords and sensitive text. To display the screen keyboard,\n"
"[[see the corresponding documentation|first_steps/accessibility]].\n"
msgstr ""
"Vous pouvez utiliser le clavier virtuel [<span\n"
"class=\"application\">Florence</span>](http://florence.sourceforge.net/francais.html)\n"
"Vous pouvez utiliser le [<span\n"
"class=\"application\">clavier visuel de GNOME</span>](https://help.gnome.org/users/gnome-help/stable/keyboard-osk.html.fr)\n"
"pour vous protéger des enregistreurs de frappe matériels lorsque vous tapez\n"
"des mots de passe et du texte sensible. Pour afficher le clavier virtuel, cliquez\n"
"sur l'icône de clavier dans la zone de notification.\n"
#~ msgid ""
#~ "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/"
#~ "florence.png link=no]]\n"
#~ msgstr ""
#~ "[[!img doc/first_steps/introduction_to_gnome_and_the_tails_desktop/"
#~ "florence.png link=no]]\n"
#~ msgid "<div class=\"caution\">\n"
#~ msgstr "<div class=\"caution\">\n"
"des mots de passe et du texte sensible. Pour afficher le clavier visuel,\n"
"[[consultez la documentation correspondante|first_steps/accessibility]].\n"
#~ msgid ""
#~ "There is [[!tails_ticket 5563 desc=\"currently\"]] no virtual keyboard "
......
......@@ -154,7 +154,7 @@ If you are running Linux Mint
1. After <span class="application">Tails Installer</span> is installed,
close <span class="application">Software Manager</span>.
[[!inline pages="install/inc/steps/install_final.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/install_final_in_debian.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
......
......@@ -154,7 +154,7 @@ Installer</span>, a program designed specifically for installing Tails.
sudo apt install tails-installer
[[!inline pages="install/inc/steps/install_final.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/install_final_in_debian.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
......
......@@ -36,9 +36,10 @@
<div class="step-image">
[[!img install/inc/infography/plug-usb.png link="no" class="debian" alt="USB stick plugged on the right"]]
[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb install-clone mac-clone" alt="Second USB stick plugged on the right"]]
[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb clone" alt="Second USB stick plugged on the right"]]
[[!img install/inc/infography/plug-tails-usb.png link="no" class="mac-dvd" alt="USB stick plugged on the right"]]
[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-clone upgrade-tails" alt="Second USB stick plugged on the right"]]
[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-tails" alt="Second USB stick plugged on the right"]]
</div>
1. Plug
......@@ -70,14 +71,9 @@
</div>
1. Click on the
<span class="button windows linux mac install-clone">Install by cloning</span>
<span class="button debian expert">Install</span>
<span class="button upgrade">Upgrade by cloning</span>
button.
[[!img install/inc/screenshots/tails_installer_in_tails.png link="no" class="screenshot windows linux mac upgrade install-clone" alt="Tails Installer: 'Install by cloning', 'Upgrade by cloning', 'Upgrade from ISO'"]]
[[!img install/inc/screenshots/tails_installer_in_debian.png link="no" class="screenshot debian expert" alt="Tails Installer: 'Install', 'Upgrade'"]]
[[!img install/inc/screenshots/tails_installer_in_tails.png link="no" class="screenshot windows linux mac install-clone" alt="Tails Installer: 'Clone the current Tails'"]]
[[!img install/inc/screenshots/tails_installer_in_debian.png link="no" class="screenshot debian expert" alt="Tails Installer: 'Use a downloaded Tails ISO image'"]]
[[!img install/inc/screenshots/tails_installer_upgrade_in_tails.png link="no" class="screenshot upgrade" alt="Tails Installer: 'Clone the current Tails'"]]
<div class="step-image">
[[!img install/inc/infography/install-tails.png link="no" class="debian" alt="ISO image installed on USB stick on the right"]]
......@@ -92,20 +88,16 @@
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="debian expert mac-dvd upgrade-clone">your</span>
USB stick in the <span class="guilabel">Target Device</span> drop-down list.
USB stick in the <span class="guilabel">Target USB stick</span> drop-down list.
1. To start the
<span class="debian expert windows linux mac install-clone">installation,</span>
<span class="upgrade">upgrade,</span>
click on the <span class="button">Install Tails</span> button.
<span class="debian expert windows linux mac install-clone">installation, click on the <span class="button">Install</span> button.</span>
<span class="upgrade">upgrade, click on the <span class="button">Upgrade</span> button.</span>
<div class="note upgrade">
<p>If it is impossible to upgrade the USB stick because it was not
installed using <span class="application">Tails Installer</span>, restart
<span class="application">Tails Installer</span> and choose
<span class="guilabel">Install by cloning</span>.</p>
<p>If your Tails USB stick was not installed using
<span class="application">Tails Installer</span>, click on the
<span class="guilabel">Install</span> button instead.</p>
</div>
1. Read the warning message in the confirmation dialog. Click
......
Markdown is supported
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