Commit ce8de266 authored by anonym's avatar anonym
Browse files

Merge branch 'stable' into testing

parents e24e8c6a 669d3c01
......@@ -50,13 +50,14 @@ We currently prefer option C if it's doable, and option D otherwise.
### Option C: 12 cores, upgradable by adding a CPU
This is for 8 VMs with 3 vcpus each.
XXX:
* can we plug one CPU only on a 2-sockets SMP mobo?
=> ask taggart
* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
with 3 real cores each, then we need less RAM (~ $1000 less)
=> depends on the outcome of [[!tails_ticket 10971]]
=> waiting for taggart's answer
Specs:
* 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
* 1 x Intel® E5-2690v3-2.6Ghz/12C, 30M, 135W LGA2011 CPU - $2124
......@@ -71,11 +72,9 @@ Total --- **$5424**
### Option D: 2*6 cores, upgradable by replacing CPUs
XXX:
This is for 8 VMs with 3 vcpus each.
* this is for 8 VMs with 3 vcpus each; if we can instead go for 4 VMs
with 3 real cores each, then we need less RAM (~ $1000 less)
=> depends on the outcome of [[!tails_ticket 10971]]
Specs:
* 1 x Super X10DRi, 2x GB/i350 LAN, 10x SATA3(C612)+R, IPMI, DDR4(1TB) - $390
* 2 x Intel® E5-2643v3, 6C, 3.4GHz, 135 - $3260
......
......@@ -328,24 +328,24 @@ Dancus
./doc/first_steps/start_tails REVISIONATO
./doc/first_steps/startup_option/administration_password
./doc/first_steps/startup_options/bridge_mode
./doc/first_steps/startup_option/administration_password REVISIONATO
./doc/first_steps/startup_options/bridge_mode REVISIONATO
REVISIONATO
./doc/first_steps/startup_options/mac_spoofing
./doc/first_steps/startup_options/network_configuration
./doc/first_steps/startup_options/network_configuration REVISIONATO
./doc/first_steps/startup_options/windows_camouflage
./doc/first_steps/startup_options/windows_camouflage REVISIONATO
-------------------------------------------------------------------
Blackflag
doc/about/tor.it.html REVISIONATO ("Tor ama le compagnie?")
doc/about/tor.it.html REVISIONATO
about/trust.it.po (il file è ok ma sul sito locale sembra ancora da tradurre...)
about/trust.it.po REVISIONATO
about/warning.it.po (manca circa 1/3 della traduzione)
about/warning.it.po REVISIONATO
doc/first_steps/shutdown.it.po REVISIONATO
......
......@@ -15,3 +15,4 @@ Availability and plans for the next weeks
Discussions
===========
- [[!tails_ticket 10781 desc="Investigate how to support the download of ISO images from release candidates"]]
......@@ -15,6 +15,19 @@ TODO: Would a pair of two separate client (XMPP and IRC) also be okay, or are we
## General requirements
### Use cases
The client SHOULD support the following use cases:
1. Contributing to Free Software projects that use IRC chatrooms (and won't switch to anything else any time soon)
2. Contributing to Free Software projects that use XMPP chatrooms
3. One-to-one chat that is compatible with currently widespread practice. That basically means XMPP + OTR, nowadays.
4. Participation in public chatrooms for Tails user support.
The client MAY support the following use cases:
* One-to-one chat that protects metadata end-to-end (that is: "who is chatting with whom")
### Documentation
### Internationalization
......
......@@ -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"
......@@ -24,7 +24,7 @@ msgid ""
"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel=\"stylesheet"
"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
msgstr ""
#. type: Content of: <h1>
......
......@@ -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"
......@@ -24,7 +24,7 @@ msgid ""
"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel=\"stylesheet"
"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
msgstr ""
#. type: Content of: <h1>
......
......@@ -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"
......@@ -24,7 +24,7 @@ msgid ""
"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel=\"stylesheet"
"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
msgstr ""
#. type: Content of: <h1>
......
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/win]]
[[<span class="back">Back</span>|install/debian]]
<h1 class="text-center"><small>Install from Debian or Ubuntu using the</small><br />command line <small> and </small> GnuPG</h1>
......
......@@ -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"
......@@ -24,7 +24,7 @@ msgid ""
"\"\"]] [[!meta stylesheet=\"inc/stylesheets/overview\" rel=\"stylesheet\" "
"title=\"\"]] [[!meta stylesheet=\"inc/stylesheets/expert\" rel=\"stylesheet"
"\" title=\"\"]] [[!inline pages=\"install/inc/tails-installation-assistant."
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/win]]"
"inline\" raw=\"yes\"]] [[<span class=\"back\">Back</span>|install/debian]]"
msgstr ""
#. type: Content of: <h1>
......
(function() {
var chromeSupported = !/\bchrome-unsupported\b/.test((document.getElementById("download-and-verify") || document.documentElement).className);
var chromeSupported = false;
var minVer = {
"firefox": 38,
"chrome": 44,
......@@ -22,7 +22,10 @@
v = navigator.userAgent.match(/\b(Chrome|Firefox)\/(\d+)/)
;
v = v && parseInt(v[2]) || 0;
if (window.InstallTrigger) {
var override = location.search.match(/\boverride=(\w+)/);
if (override) {
browser = override[1];
} else if (window.InstallTrigger) {
if (v >= minVer.firefox || minVer.firefox === 38 && new RegExp("").source) // see Fx 38 RegExp @ https://developer.mozilla.org/it/Firefox/Releases/38
browser = "firefox";
else {
......@@ -33,7 +36,7 @@
}, true);
}
} else {
forId("unsupported-firefox", function(el) { el.style.display = "none"; });
addEventListener("DOMContentLoaded", function() { forId("unsupported-firefox", function(el) { el.style.display = "none"; }); }, true);
if (chromeSupported &&
/\bChrom/.test(navigator.userAgent) && /\bGoogle Inc\./.test(navigator.vendor) &&
v >= minVer.chrome) {
......
......@@ -15,8 +15,8 @@ two techniques to do this verification automatically.</p>
<p>Please wait…</p>
</div>
<div id="download-and-verify">
<div id="extension-version">0.2.7rc1</div>
<div id="download-and-verify" class="chrome-unsupported">
<div id="extension-version">0.2.7rc55</div>
<div id="undetected-browser">
<p>We failed to detect your browser vendor, maybe because JavaScript is disabled.</p>
......
......@@ -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"
......@@ -20,7 +20,7 @@ msgstr ""
#, no-wrap
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
"<h1 class=\"windows linux mac\">Install the final Tails</h1>\n"
"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
......
......@@ -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"
......@@ -20,7 +20,7 @@ msgstr ""
#, no-wrap
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
"<h1 class=\"windows linux mac\">Install the final Tails</h1>\n"
"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
......
......@@ -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"
......@@ -20,7 +20,7 @@ msgstr ""
#, no-wrap
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
"<h1 class=\"windows linux mac\">Install the final Tails</h1>\n"
"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
......
<h1 class="debian expert install-clone mac-clone">Install Tails</h1>
<h1 class="windows linux mac-usb">Install the final Tails</h1>
<h1 class="windows linux mac">Install the final Tails</h1>
<h1 class="mac-dvd">Install Tails on a USB stick</h1>
<h1 class="upgrade">Upgrade your Tails</h1>
......
......@@ -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"
......@@ -20,7 +20,7 @@ msgstr ""
#, no-wrap
msgid ""
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
"<h1 class=\"windows linux mac\">Install the final Tails</h1>\n"
"<h1 class=\"mac-dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
msgstr ""
......
......@@ -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 ""
......
......@@ -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 ""
......
......@@ -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 ""
......
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