Commit 22094311 authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/web/9374-iso-size-units' into testing

Fix-committed: #9374
parents a25a7daa 2072609e
......@@ -81,7 +81,7 @@ always generate a new connection => new uuid), I don't see how we can
get around treating all wired networks as the same one and hence
getting the same entry guards for all wired connections.
Hmm. And actually, I guess it would be a problem for eduraom network
Hmm. And actually, I guess it would be a problem for eduroam network
and similar "global" networks where one normally would configure one
NM connection without a BSSID but only an SSID. OTOH, with eduroam
specifically one uses a certificate that's unique per user, but I've
......
......@@ -66,9 +66,9 @@ FIXME
Metrics
=======
* Tails has been started more than FIXME times this month. This makes FIXME boots a day on average.
* Tails has been started more than 546366 times this month. This makes 17625 boots a day on average.
* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
* 35853 downloads of the OpenPGP signature of Tails ISO from our website.
* FIXME bug reports were received through WhisperBack.
......
......@@ -785,12 +785,9 @@ to be released in `inc/*`:
Update the size of the ISO image in `inc/*`:
MB=$(LC_NUMERIC=C ls -l --si $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2B/' | tr -d '\n')
MiB=$(LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' | tr -d '\n')
echo "($MB/$MiB)" > "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
echo "$MiB" > "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size_mib.html"
LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' > \
"$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
Generate the expected signature verification output:
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-22 22:46+0100\n"
"POT-Creation-Date: 2016-01-15 14:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
"stable_i386_iso_size\" raw=\"yes\"]]</small>"
"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
msgid "25 minutes to install"
msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-24 15:03+0100\n"
"POT-Creation-Date: 2016-01-15 14:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
"stable_i386_iso_size\" raw=\"yes\"]]</small>"
"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
msgid "25 minutes to install"
msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-22 22:46+0100\n"
"POT-Creation-Date: 2016-01-15 14:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
"stable_i386_iso_size\" raw=\"yes\"]]</small>"
"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
msgid "25 minutes to install"
msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
......
......@@ -32,8 +32,8 @@
<ul>
<li>1 USB stick <small>(at least 4 GB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>25 minutes to install</li>
<li>1 hour to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>½ hour to install</li>
</ul>
[[
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-22 22:46+0100\n"
"POT-Creation-Date: 2016-01-15 14:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -56,12 +56,12 @@ msgstr ""
#. type: Content of: <div><div><ul><li>
msgid ""
"30&ndash;60 minutes to download Tails <small>[[!inline pages=\"inc/"
"stable_i386_iso_size\" raw=\"yes\"]]</small>"
"1 hour to download Tails <small>[[!inline pages=\"inc/stable_i386_iso_size\" "
"raw=\"yes\"]]</small>"
msgstr ""
#. type: Content of: <div><div><ul><li>
msgid "25 minutes to install"
msgid "½ hour to install"
msgstr ""
#. type: Content of: <div><div>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-22 22:46+0100\n"
"POT-Creation-Date: 2016-01-15 13:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -76,34 +76,11 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"next\"></a>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>To know your version of Ubuntu, open\n"
"<span class=\"application\">System Settings</span> and click on\n"
"<span class=\"guilabel\">Details</span>.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
msgid "Make sure that you are connected to the Internet."
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-24 15:03+0100\n"
"POT-Creation-Date: 2016-01-15 13:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -76,34 +76,11 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"next\"></a>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>To know your version of Ubuntu, open\n"
"<span class=\"application\">System Settings</span> and click on\n"
"<span class=\"guilabel\">Details</span>.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
msgid "Make sure that you are connected to the Internet."
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-22 22:46+0100\n"
"POT-Creation-Date: 2016-01-15 13:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -76,34 +76,11 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"next\"></a>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>To know your version of Ubuntu, open\n"
"<span class=\"application\">System Settings</span> and click on\n"
"<span class=\"guilabel\">Details</span>.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
msgid "Make sure that you are connected to the Internet."
msgstr ""
......
......@@ -15,18 +15,8 @@
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
<a id="next"></a>
[[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
<div class="tip">
<p>To know your version of Ubuntu, open
<span class="application">System Settings</span> and click on
<span class="guilabel">Details</span>.</p>
</div>
1. Make sure that you are connected to the Internet.
1. Start <span class="application">Ubuntu Software Center</span>.
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-22 22:46+0100\n"
"POT-Creation-Date: 2016-01-15 13:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -76,34 +76,11 @@ msgstr ""
msgid "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"next\"></a>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"install/inc/steps/install_tails_installer.inline\" raw=\"yes\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>To know your version of Ubuntu, open\n"
"<span class=\"application\">System Settings</span> and click on\n"
"<span class=\"guilabel\">Details</span>.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr ""
#. type: Bullet: '1. '
msgid "Make sure that you are connected to the Internet."
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-27 22:58+0100\n"
"POT-Creation-Date: 2016-01-14 14:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -41,6 +41,16 @@ msgstr ""
msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-30 21:10+0000\n"
"POT-Creation-Date: 2016-01-14 14:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -33,16 +33,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" "
"title=\"\"]]\n"
msgid "[[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" "
"title=\"\"]]\n"
msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-27 22:58+0100\n"
"POT-Creation-Date: 2016-01-14 14:29+0000\n"
"PO-Revision-Date: 2015-11-12 13:41+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -41,6 +41,17 @@ msgstr ""
msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!inline pages=\"download.inline\" raw=\"yes\"]]\n"
msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr "[[!inline pages=\"download.inline.fr\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
......
......@@ -3,6 +3,8 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/dave" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/dave"]]
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-11-27 22:58+0100\n"
"POT-Creation-Date: 2016-01-14 14:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -41,6 +41,16 @@ msgstr ""
msgid "[[!meta stylesheet=\"install/inc/stylesheets/dave\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"install/inc/stylesheets/steps\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta stylesheet=\"install/inc/stylesheets/download-only\" rel=\"stylesheet\" title=\"\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
......
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