Commit ce8de266 authored by anonym's avatar anonym
Browse files

Merge branch 'stable' into testing

parents e24e8c6a 669d3c01
......@@ -75,15 +75,18 @@
<div class="tip">
<p>Search for the user manual of the computer on the website of its
manufacturer to learn how to edit the BIOS settings: [Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers),
[Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/),
[Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/),
[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/),
[HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/),
[Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/),
[Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads),
[Sony](http://esupport.sony.com/US](http://esupport.sony.com/US), or
[Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers).
manufacturer to learn how to edit the BIOS settings:
<ul>
<li>[Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers)</li>
<li>[Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/)</li>
<li>[Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/)</li>
<li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/)</li>
<li>[HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/)</li>
<li>[Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/)</li>
<li>[Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads)</li>
<li>[Sony](http://esupport.sony.com/US](http://esupport.sony.com/US)</li>
<li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers)</li>
</ul>
</p>
</div>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-01-25 19:48+0100\n"
"POT-Creation-Date: 2016-01-26 00:52+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"
......@@ -171,15 +171,18 @@ msgstr ""
msgid ""
" <div class=\"tip\">\n"
" <p>Search for the user manual of the computer on the website of its\n"
" manufacturer to learn how to edit the BIOS settings: [Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers),\n"
" [Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/),\n"
" [Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/),\n"
" [Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/),\n"
" [HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/),\n"
" [Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/),\n"
" [Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads),\n"
" [Sony](http://esupport.sony.com/US](http://esupport.sony.com/US), or\n"
" [Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers).\n"
" manufacturer to learn how to edit the BIOS settings:\n"
" <ul>\n"
" <li>[Acer](http://us.acer.com/ac/en/US/content/drivers](http://us.acer.com/ac/en/US/content/drivers)</li>\n"
" <li>[Asus](https://www.asus.com/us/support/](https://www.asus.com/us/support/)</li>\n"
" <li>[Dell](https://www.dell.com/support/home/us/en/19/Products/](https://www.dell.com/support/home/us/en/19/Products/)</li>\n"
" <li>[Fujitsu](https://www.fujitsu.com/global/support/products/software/manual/](https://www.fujitsu.com/global/support/products/software/manual/)</li>\n"
" <li>[HP](https://support.hp.com/us-en/products/](https://support.hp.com/us-en/products/)</li>\n"
" <li>[Lenovo](http://support.lenovo.com/us/en/](http://support.lenovo.com/us/en/)</li>\n"
" <li>[Samsung](http://www.samsung.com/us/support/downloads](http://www.samsung.com/us/support/downloads)</li>\n"
" <li>[Sony](http://esupport.sony.com/US](http://esupport.sony.com/US)</li>\n"
" <li>[Toshiba](http://support.toshiba.com/support/products?cat=Computers](http://support.toshiba.com/support/products?cat=Computers)</li>\n"
" </ul>\n"
" </p>\n"
" </div>\n"
msgstr ""
......
......@@ -36,3 +36,7 @@ div.note p.pre {
h1:before {
content: counter(step)'/7.';
}
h1 {
margin-left: 30px;
}
\ No newline at end of file
......@@ -203,3 +203,73 @@ img.qrcode {
float: right;
margin-top: -1em;
}
@media print {
/* from http://www.alsacreations.com/astuce/lire/1160-une-feuille-de-styles-de-base-pour-le-media-print.html */
body {
width: auto !important;
margin: auto !important;
font-size: 12pt;
background-color: #fff !important;
color: #000 !important;
}
p, h1, h2, h3, h4, h5, h6, blockquote, ul, ol {
color: #000 !important;
}
.print {
display: block;
}
a {
color: #000 !important;
}
/* Tails specifics */
#content {
padding-left: 0px;
}
.step-image {
position: relative;
height: 200px;
width: 200px;
margin: 2em 0;
}
h1 {
font-size: 25px;
margin-left: 50px !important;
}
/* Scaling images */
img.screenshot {
height: 70%;
width: 70%;
}
img {
page-break-before: auto; /* 'always,' 'avoid,' 'left,' 'inherit,' or 'right' */
page-break-after: auto; /* 'always,' 'avoid,' 'left,' 'inherit,' or 'right' */
page-break-inside: avoid; /* or 'auto' */
}
.toggleable {
display: block !important;
}
.toggleable {
position: relative !important;
width: 90% !important;
margin: 50px !important;
padding: 20px !important;
border: 3px dashed darkgrey !important;
font-size: 0.9em;
}
}
......@@ -1150,11 +1150,12 @@ pre.list-key {
/* "Are you using Tor?" link on /news */
#tor_check {
position: relative;
z-index: 10;
float: left;
margin-right: 4em;
@media all and (min-width: 600px) {
#tor_check {
position: absolute;
z-index: 10;
right: 2em;
}
}
#tor_check a[href="https://check.torproject.org/"] {
......@@ -1167,6 +1168,8 @@ pre.list-key {
border-radius: 0.5em;
display: inline-block;
padding: 0.5em 1em 0.5em 0.5em;
width: 16.5em; /* sidebar - padding */
box-sizing-border-box;
}
#tor_check a img {
......
......@@ -32,8 +32,15 @@ html[dir="rtl"] .sidebar .download a {
}
html[dir="rtl"] #tor_check {
float: right;
margin: 0 0 0 2em;
margin-right: 2em;
}
@media all and (min-width: 600px) {
html[dir="rtl"] #tor_check {
right: auto;
left: 2em;
margin: 0;
}
}
html[dir="rtl"] .pageheader #otherlanguages {
......
......@@ -3,3 +3,18 @@ build-target: i386
channel: alpha
product-name: Tails
product-version: 2.0~rc1
upgrades:
- details-url: https://tails.boum.org/news/version_2.0/
type: major
upgrade-paths:
- target-files:
- sha256: 78167d14bc42080a456789a1f1b91554a819050fdf1aae33dc293f284256bba7
size: 1135089664
url: http://dl.amnesia.boum.org/tails/stable/tails-i386-2.0/tails-i386-2.0.iso
type: full
- target-files:
- sha256: 8ef459080f5c3352e7f700ef8dca79c333e7733950e6e834cf1d67c8c87249be
size: 191508480
url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_2.0~rc1_to_2.0.iuk
type: incremental
version: '2.0'
-----BEGIN PGP SIGNATURE-----
iQIcBAABCgAGBQJWb6k6AAoJEJj+xrx1Kj22uu8P/0QJrmxWtwJTRKqUe9GsVqLp
cel0ldy54xE4ODcOy5mjBqUM15vgejR3UP5kjLQtSnkkDt/iocXzB3H2yz1Wxd7T
GIqO6Jy9egbnAtfiNIjBA7Ikk/gug88DmCQJpXWk3dCDLOho4QIBQvBL99HAp/FR
GjDPgQYpjAj+jB+gPBLTfb7dTw8Gjkviev6/hVwq522MqAd9UVmDiUFstDv4zHft
RUAIdE2TeQpJzCCCIDDbXP3sqQjLEuhpecHyNcsiv41ygU3qsRsADpywnebS4/w9
nUaEPcgcwEuZ6tzawxhQ0kMM9Bs2poCh+1h2UV/fJf0wih0/pjTDOtxRAAGs5+ct
0fKmVLmcdlYXXL188AULQsIRrPrVPN4vCx4nKPw0V0u04VYfravwl0/tPlARbbPa
C4AFPgTo9PnmhPrdpbU59KkQ097OiJUJIGOKsYsUn5/x+fsb8WebYyZDIz7rYKLO
iQWhO9vj87f63yXSlq/XcaBtQ0CMFJHx3NPg6bLKC1KnL5db2t9n1toF6S/BrShH
Qgp7XZHh6Dk0H/zlxK/XxltbUSOi1Tv1wkKuzSfcRgSpGDholrtT0DF9zMtyTJ7O
xAJdSAXEZ2PhcXsFn9pqS6jnPSbFKtEIj8+UxaCYiLhsnLolpA/HncszdiQ8H1Bz
L5DKxoTBdqCOTJBoeBHm
=iWlG
iQIcBAABCgAGBQJWpsK3AAoJEJj+xrx1Kj226mkP/AnN7Mr0yS8GH7VcCOzjeRZC
F5kGN2IkE5NOrU3FtXPNfgJV3M6GphoDdLis6j6LPEijpBNQlznuk3NuA7LFh5HQ
nlxiR5lbuqVEzNouLME8bt6q2piEN9rPP2vrFB4Mu83I0bjG51UANwgvfzogJfop
XfCM2yXnzxzdts+7PeiBr/eaujUnTw/lZe1E7di6DcP+mzvfo30pPpkeChNf/q5n
JdIDoAWDzbS8VDY9g8Dw5pclijuQXuzHcpdtjRMjQ05MdqLcZoCUb+WJ4l/Ixubj
+CBFm4IiCAI93C/9PJa1Gedk0ag/7fVPy7VeFNZyJhFnZzwGorWAhuxjB7HDKKeJ
7Zk4OIxnbAzGMmpBf84amwqFwmyNZTN9puV09JUdeO89zs1kplEfCR7dR3+zSJGO
ZTobZQRHKckArP/NUFbwpx+jNTJBtAWhkxNC7uIrfT4Po6t891bguXh5FrjE38AC
oUw+Ro35ZNHJM7T6OQ43u6TCBHsD7nWBk64XPhipZOdpUcXLlHLk6opWsv6TSiE3
dJ5AnAf3UJX4JWUct/ZXeP6bBuWwFcP6lL8fd5vZo4De9JgNsS9QuPivPYeYRU1f
UbtdBns3+RSo4HgqLwBvwY+MaMUIeBvRMxuvGS2251DrYLwPA0i7WysFRLsqGwqi
tl21d4qdM7QhXX/u5ciW
=AQUr
-----END PGP SIGNATURE-----
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