summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspriver <spriver@autistici.org>2015-05-30 20:50:58 +0200
committerspriver <spriver@autistici.org>2015-05-30 20:50:58 +0200
commitf2fc1e05ce4a0971075b2f44267399422572dbe2 (patch)
treef165f807e8efdda978e203143449477fa110ed05
parent5f6e48813cc1a04fe25df6771f7ea7432fc9a894 (diff)
parent4a9a2f56e24c8063d85896e9b4ae12822e231eec (diff)
Merge branch 'master' of https://git-tails.immerda.ch/tails
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn16
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/autobuild_specs.mdwn11
-rw-r--r--wiki/src/blueprint/evaluate_Docker.mdwn4
-rw-r--r--wiki/src/blueprint/monitor_servers.mdwn319
-rw-r--r--wiki/src/blueprint/report_2015_05.mdwn10
-rw-r--r--wiki/src/blueprint/report_2015_06.mdwn5
-rw-r--r--wiki/src/blueprint/report_2015_07.mdwn66
-rw-r--r--wiki/src/blueprint/report_2015_08.mdwn75
-rw-r--r--wiki/src/blueprint/report_2015_09.mdwn75
-rw-r--r--wiki/src/contribute/build.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.de.po24
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.fr.po22
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.mdwn6
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager.pt.po22
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po4
-rw-r--r--wiki/src/press/media_appearances_2015.de.po13
-rw-r--r--wiki/src/press/media_appearances_2015.fr.po13
-rw-r--r--wiki/src/press/media_appearances_2015.mdwn7
-rw-r--r--wiki/src/press/media_appearances_2015.pt.po13
19 files changed, 669 insertions, 38 deletions
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index d242e5e..a63013c 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -200,3 +200,19 @@ For this to work and to be flexible, mirrors need to respond to \*.amnesia.boum.
Using this approach, giving one mirror more weight than others is very easy: Simply add it's name multiple times to the array of mirrors. :D
+
+# PHP: first draft
+
+
+ // http://stackoverflow.com/questions/4233407/get-random-item-from-array
+
+ $mirrors = Array("alice.amnesia.boum.org","bob.amnesia.boum.org","clark.amnesia.boum.org","deborah.amnesia.boum.org","eric.amnesia.boum.org","freiwuppertal.amnesia.boum.org");
+ $mirror = $mirrors[array_rand($mirrors)];
+ echo "<p><a href=\"http://{$mirror}/tails/stable/tails-i386-1.4/tails-i386-1.4.iso\">Download Tails!</a></p>\n";
+ echo "<p>Selected mirror: {$mirror}</p>";
+
+Try it here:
+http://sandbox.onlinephpfunctions.com/code/54ffcc18e5dbbafc6c7d3c81e0c26f94ce7946fc
+
+Note: I am a horrible coder and basically copied this from the linked StackOverflow page. This page also helped me: http://php.net/manual/de/function.echo.php
+...and that's all. There might be security flaws in this extremely simple concept, so please have a close look at it. :)
diff --git a/wiki/src/blueprint/automated_builds_and_tests/autobuild_specs.mdwn b/wiki/src/blueprint/automated_builds_and_tests/autobuild_specs.mdwn
index 4612707..4d161a6 100644
--- a/wiki/src/blueprint/automated_builds_and_tests/autobuild_specs.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests/autobuild_specs.mdwn
@@ -9,9 +9,8 @@ branches").
Some metrics about the number of branches merged per releases are
available on the [[dedicated statistics page|autobuild_stats]].
-Our Jenkins now has the Global Build Stats plugin live, Tails developers
-[[have access to the metrics|
-https://jenkins.tails.boum.org/plugin/global-build-stats/]]
+Our Jenkins now has the Global Build Stats plugin live, Tails core developers
+[have access to the metrics](https://jenkins.tails.boum.org/plugin/global-build-stats/).
[[!toc levels=2]]
@@ -84,7 +83,7 @@ This locally-merge-before-building process requires [[!tails_ticket
## When to build it
-Define the regularity we want to build topic branches, apart from being build
+Define the regularity we want to build topic branches, apart from being built
on Git push or new Debian package upload.
Note that we will have to plug that in automatic tests when they will be
@@ -105,7 +104,7 @@ Email will be the main interface.
* For topic branches, notify the author of the last commit.
Note that this proposal doesn't take into consideration how to notify
-when the branch is build because of a Debian package upload.
+when the branch is built because of a Debian package upload.
# Scenarios
@@ -223,7 +222,7 @@ might want to consider it in the future.
# Statistics
As of 2015-02-02, there are 26 branches that would be automatically
-build as part of the next 1.3 release, following the for now defined
+built as part of the next 1.3 release, following the for now defined
criterias (above in this blueprint):
* feature/7779-revisit-touchpad-settings
diff --git a/wiki/src/blueprint/evaluate_Docker.mdwn b/wiki/src/blueprint/evaluate_Docker.mdwn
index f310082..2cc3c65 100644
--- a/wiki/src/blueprint/evaluate_Docker.mdwn
+++ b/wiki/src/blueprint/evaluate_Docker.mdwn
@@ -160,8 +160,8 @@ Test run
- Docker now has [container
groups](https://github.com/docker/docker/issues/9694), called
[Docker compose](https://docs.docker.com/compose/) ([[!debbug
- 782170 desc="Debian RFP"]] -- seems that some build-deps are not
- in Debian), that is apparently [Fig](http://www.fig.sh/) rebranded
+ 782170 desc="Debian RFP"]] -- entered NEW on 2015-05-21),
+ that is apparently [Fig](http://www.fig.sh/) rebranded
and better integrated; there's also
[crane](https://github.com/michaelsauter/crane)
- We can build our own similar thing in our own `Makefile`.
diff --git a/wiki/src/blueprint/monitor_servers.mdwn b/wiki/src/blueprint/monitor_servers.mdwn
new file mode 100644
index 0000000..2eef0b9
--- /dev/null
+++ b/wiki/src/blueprint/monitor_servers.mdwn
@@ -0,0 +1,319 @@
+Corresponding parent ticket: [[!tails_ticket 5734]]
+
+[[!toc levels=3]]
+
+# Introduction
+
+## Why?
+
+* Some pieces of our infrastructure are critical to e.g.:
+ - the development process (if the ISO build fails, developers
+ cannot work)
+ - the release process -- which may block us from putting out
+ emergency security fixes
+ - users (if the APT repository is down, the "additional software
+ packages" persistence feature is broken)
+
+* We want to avoid contributors getting used to ignore alerts send by
+ our CI system. The more false positives there are, the more they
+ will "learn" to do so. Here we want to diminish the rate of false
+ positives caused by malfunctioning infrastructure.
+
+* We want to shorten the dev/feedback loop for sysadmins when they
+ deploy changes, and also when changes are automatically applied
+ (e.g. Puppet agent passes, or automatic APT upgrades).
+
+* We want to be notified when a service we run doesn't come back up
+ properly post-reboot, without having to manually test every service.
+
+* We want to minimize the rate of non-sysadmins discovering and
+ reporting problems _first_, that is before we learn about it.
+ This is highly subjective, but replying "we're aware of this problem
+ and are working on it" is much more confidence inspiring than
+ "really, it's broken?"
+
+## Nomenclature
+
+Here, we call:
+
+* _machine_: a computer (be it bare metal or physical) and its
+ operating system
+* _monitored machine_: a machine we monitor
+* _monitoring machine_: the machine(s) that monitors the... _monitored
+ machines_
+* _monitoring system_, or _monitoring setup_: all the software
+ components that we run so that the monitoring machine can monitor
+ the monitored ones, and their configuration
+
+Note that the monitoring machine may very well be, at the same time,
+itself be monitored (be it by itself, or by another monitoring
+machine).
+
+Requirements
+============
+
+## Human interface
+
+The monitoring system:
+
+* MUST send email notifications to the sysadmin(s) in charge, to lower
+ the downtime.
+* MUST offer an overview of the status of our systems, via a web
+ interface that works within Tor Browser with the security slider set
+ to Medium-High.
+* MAY additionally offer a read-only version of this overview, that we
+ might want to make available to selected contributors, or anonymous
+ users. Needless to say, this must be carefully balanced with the
+ security implications of such a system (in other words, a set of
+ exported static HTML pages is totally fine, but a huge dynamic web
+ application is probably a no-starter).
+* MUST support configuring, with a per-check/per-service granularity,
+ a threshold of N failures _in a row_ before an alert is raised.
+ Still, it SHOULD support triggering alerts depending on the
+ frequency of such failures, even when they never fail twice in a row
+ (we don't want to miss the fact that `$service` is down for
+ 5 minutes every day). Implementation details may vary, but you get
+ the idea.
+
+## Threat model
+
+### Compromised monitored machine
+
+* We do not try to avoid the fact that it can report wrong information
+ (this includes missing information) about iself.
+* It MUST NOT result in a compromise of the monitoning machine.
+* It MUST NOT be able to DoS the sysadmin(s) in charge, e.g.
+ by flooding them with alerts.
+* It MUST NOT result in a compromise of the network traffic between
+ other monitored machines and the monitoring machine (e.g. if that
+ traffic is encrypted, the monitored machines MUST NOT use the same
+ private key).
+* It SHOULD NOT be able to alter the information about other
+ monitored machines.
+
+### Compromised monitoring machine
+
+* We do not try to avoid the fact that it can DoS the sysadmin(s) in
+ charge, e.g. by flooding them with alerts.
+* We do not try to avoid the fact that it can report wrong information
+ about the monitored machines.
+* It MUST NOT be able to run arbitrary code as root on any of the
+ monitored machines.
+* It SHOULD NOT be able to run arbitrary code as a non-privileged used
+ on any of the monitored machines.
+
+### Network attacker
+
+Here, we consider an attacker that may be active or passive, and can
+sit at any point they choose on the Internet.
+
+We accept the risk that a network attacker:
+
+* can enumerate the machines and services we monitor;
+* can view the reports, test results, and any such information about
+ monitored services, that the monitoring system needs to learn; this
+ of course implies that we should be careful about what kind of
+ information flows this way: it MUST NOT be a big deal if it leaks
+ into the hands of an adversary;
+* can DoS our monitoring, e.g. by blocking network connections;
+* can spoof the reports, test results and alike about monitored
+ services that a client has no credible means to authenticate.
+
+However, a network attacker:
+
+* SHOULD NOT be able to spoof the reports, test results and alike
+ that monitored machines send about themselves;
+* MUST NOT be able to run arbitrary code on the monitored machines;
+* MUST NOT be able to run arbitrary code on the monitoring machine.
+
+## Availability, sustainability
+
+Here, we assume that the entire monitoring system has both software
+components that run on the monitored machines (that we call the
+"agent"), and software components that run on the monitoring machine
+(that we call the "server"). Below, the _agent_ implicitly includes
+anything needed for basic usage (plugins, checks, whatever); and
+similarly, the _server_ implicitly includes its web interface, and
+anything needed for basic usage (plugins, checks, etc.).
+
+* The agent MUST be usually available in all of Debian oldstable,
+ stable, and testing -- possibly thanks to _pre-existing_ and
+ well-maintained official backports. All these versions of the agent
+ MUST be compatible with the chosen version of the server.
+
+* The server MUST be usually available either in current Debian stable
+ (Jessie), or in current Debian testing (Stretch). We are considering
+ running the version from Debian testing mainly because it might
+ avoid having to go through a costly upgrade process in a couple
+ years, e.g. to switch to the next major, incompatible version of
+ the software.
+
+* Both the agent and the server MUST be actively maintained in all the
+ versions of Debian we care about (see above). Hint: this excludes
+ Nagios 4.
+
+* Both the agent and the server MUST be DFSG-free.
+
+* For all involved software, the upstream project MUST be mature and
+ active. It MUST have a confidence inspiring future. We can't afford
+ having to migrate to a totally different monitoring setup in three
+ years, to the extent that this can be foreseen. Hint: given Nagios 4
+ is not an option (see above), this in turn excludes all older
+ versions of Nagios.
+
+* It SHOULD be realistically possible for external contributors to
+ have patches merged into the upstream codebase of the
+ involved software.
+
+* All the involved software MUST have a not-too-scary security
+ track record.
+
+## Configuration
+
+Here, we have two major desires. One is the ability for humans to
+easily review the monitoring system's configuration, or changes
+proposed to it. The other is the ability to include monitoring aspects
+within the description of the services we run, in a self-contained
+way. Note that a system that satisfies the second requirement has
+great chances to also mostly satisfy the first one as well.
+
+The chosen monitoring system:
+
+* SHOULD allow encoding, in the description of a service (read: in the
+ corresponding Puppet class), how it needs to be monitored.
+ - Additionally, if this optional (but warmly welcome) requirement is
+ satisfied, then the "shared Puppet modules" we use SHOULD already
+ support the chosen monitoring system (hint: in practice, this
+ means something compatible with Nagios).
+ - Note: this gives us for free the ability to review the monitoring
+ configuration for service checks, but it is unrelated to our
+ ability to review the global configuration of the server
+ components, that run on the monitoring machine.
+
+* SHOULD allow humans to easily review the service checks
+ configuration. Really, that's a *strong* SHOULD. A system that
+ doesn't make this possible will need to have very serious advantages
+ in other areas to be attractive to us.
+
+* SHOULD allow humans to review the global configuration of the server
+ components, that run on the monitoring machine. This assumes that
+ said configuration is mostly static, and is unaffected when adding
+ or modifying service checks.
+
+## Adequacy to our resources
+
+Being able to operate the monitoring system for 20-50 monitored
+systems MUST NOT require Tails sysadmins to invest lots of time and
+become experts at hand-holding a complex software stack: the main
+focus of our system and automation engineers shall not become
+monitoring. For example, we won't like a monitoring system that is
+trivial to set up for monitoring 5-10 hosts, but requires adding more
+and more moving parts and complex optional components to be able to
+scale up to 50 hosts.
+
+## Miscellaneous
+
+* We run Tor hidden services, that we want to monitor, so the
+ monitoring system MUST allow using a configured SOCKS proxy for
+ specific checks (worst case, for _all_ checks, but it prevents us
+ from). Wrapping checks with `torsocks` might be an acceptable
+ option, depending on how involved and hackish this would be.
+
+## Hosting of the monitoring machine
+
+* The monitoring machine MUST be a virtual machine.
+* We MUST be enabled to admin the OS of the monitoring machine
+ ourselves: we need to be root, we need to have a Puppet agent that
+ talks to our own puppetmaster, we want to do the initial
+ OS installation.
+* The monitoring machine MUST be hosted on infrastructure managed by
+ people the Tails sysadmins trust quite a bit.
+* The people who manage the underlying hardware and infrastructure
+ MUST be reactive and easy to get in touch with.
+* We MUST be given out-of-band access to the monitoring machine.
+* The monitoring machine MUST have unfiltered access to the Internet,
+ and SHOULD be assigned at least one public IPv4 address.
+* Hosting MUST be affordable (say, max. 20€/month).
+* The monitoring machine SHOULD allow at least some flexibility
+ regarding future "hardware" upgrades (e.g. allocating more disk
+ space, memory, CPU cores).
+* TODO: exact hardware specifications, depending on the chosen
+ monitoring system. Let's keep in mind that collecting exported
+ Puppet resources is expensive.
+
+# Service and system checks
+
+Below, HIGH, MEDIUM and LOW are priority level wrt. the implementation
+of such checks.
+
+For description of individual services, see
+[[contribute/working_together/roles/sysadmins]]
+
+## All systems
+
+* HIGH: up and running!
+* HIGH: disk space usage (bytes and inodes)
+* HIGH: memory usage
+* MEDIUM: Puppet agent last run
+* MEDIUM: APT indices (aka. `apt-get update` was successfully run recently)
+* MEDIUM: `systemctl is-system-running` (see [[!tails_ticket 8262]])
+
+## APT repository
+
+* HIGH: `stable` APT suite over HTTP
+* HIGH: freezable APT repository, once it exists
+
+## Bitcoind
+
+* MEDIUM: compare `getblockcount` with what the Internet says it
+ should be (probably requires exporting the output of `bitcoin-cli
+ getblockcount` to a place that's readable by the monitoring agent)
+
+## BitTorrent
+
+* LOW: last Tails release is seeded
+
+## Gitolite
+
+* MEDIUM: `git pull` or `git clone` a test repository over all
+ supported protocols (currently: `git://` and SSH)
+
+## git-annex
+
+* HIGH: our Tor Browser archive must be reachable over HTTP, and
+ contain directories with tarballs
+
+## Jenkins
+
+* HIGH: the HTTP server must be up, and unauthenticated connection
+ must be forbidden (may require to install its TLS certificate, or to
+ skip certificate validation, or something)
+
+## Nightly builds
+
+* HIGH: <http://nightly.tails.boum.org/> must have directories for
+ the `stable` and `devel` branches, that contain ISO images
+
+## rsync
+
+* HIGH: check, over `rsync://`, that expected directories are there
+
+## Test suite infrastructure
+
+* HIGH: the (fake or limited) SSH and SFTP access used by core
+ contributors and robots when running the test suite must be up
+
+## Website
+
+* HIGH: <https://tails.boum.org/> must be up and working
+
+## WhisperBack relay
+
+* HIGH: SMTP server is up
+* MEDIUM: email is actually relayed (would be truly good to have, but
+ hard to implement, so the cost/benefit ratio is likely to be pretty
+ bad)
+
+## XMPP server
+
+* MEDIUM: responds on the TCP/IP port it is listening on
diff --git a/wiki/src/blueprint/report_2015_05.mdwn b/wiki/src/blueprint/report_2015_05.mdwn
index 7ed4580..911c000 100644
--- a/wiki/src/blueprint/report_2015_05.mdwn
+++ b/wiki/src/blueprint/report_2015_05.mdwn
@@ -28,6 +28,8 @@ Code
* We installed cdrdao to enable byte-to-byte disc copy in Brasero.
+* The complete list of changes is in each release's changelog.
+
* FIXME: initial steps to evaluate Tails on touchscreen devices
FIXME
@@ -61,7 +63,7 @@ Infrastructure
* We improved the test suite to make it a lot more robust.
-* We wrote new tests for Electrum, the "report an error" launcher, ScrambleSuit, etc.
+* We wrote new tests for Electrum, the "report an error" launcher, etc.
* Our test suite covers FIXME scenarios, FIXME more that in April.
@@ -84,6 +86,8 @@ Upcoming events
* People are organizing [[a workshop about Tails|http://www.lacantine-brest.net/event/atelier-datalove-tails-x-tor/]] in Brest, France, in June.
+* Please let us know if you organize an event about Tails, we'll be glad to announce it :)
+
FIXME more ?
On-going discussions
@@ -94,11 +98,13 @@ FIXME
Press and testimonials
======================
-* Many online newpapers covered the 1.4 release, see our [[press]] page.
+* Many online newspapers covered the 1.4 release, see our [[press]] page.
Translation
===========
+* We're planning to change our translation platform, if you're knowledgeable about one or if you want to help testing some, please see the [[!tails_ticket 9049]] and [[blueprint|blueprint/translation_platform]]!
+
FIXME
Metrics
diff --git a/wiki/src/blueprint/report_2015_06.mdwn b/wiki/src/blueprint/report_2015_06.mdwn
index 4ac7eb2..7edb706 100644
--- a/wiki/src/blueprint/report_2015_06.mdwn
+++ b/wiki/src/blueprint/report_2015_06.mdwn
@@ -41,6 +41,8 @@ FIXME
Outreach
========
+* [[A workshop about Tails|http://www.lacantine-brest.net/event/atelier-datalove-tails-x-tor/]] happened in Brest, France, June FIXME_DATE.
+
FIXME
Upcoming events
@@ -71,3 +73,6 @@ Metrics
* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
* FIXME bug reports were received through WhisperBack.
+
+
+-- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_07.mdwn b/wiki/src/blueprint/report_2015_07.mdwn
index e69de29..0020bb5 100644
--- a/wiki/src/blueprint/report_2015_07.mdwn
+++ b/wiki/src/blueprint/report_2015_07.mdwn
@@ -0,0 +1,66 @@
+[[!meta title="Tails report for July, 2015"]]
+
+FIXME Edito
+
+No release this month, the next release (1.5) is [[planned for August 11|https://tails.boum.org/contribute/calendar/]].
+
+
+[[!toc]]
+
+Documentation and Website
+=========================
+
+FIXME
+
+User Experience
+===============
+
+FIXME
+
+Infrastructure
+==============
+
+* Our test suite covers FIXME scenarios, FIXME more that in April.
+
+* FIXME more?
+
+Funding
+=======
+
+FIXME
+
+Outreach
+========
+
+FIXME
+
+Upcoming events
+---------------
+
+FIXME
+
+On-going discussions
+====================
+
+FIXME
+
+Press and testimonials
+======================
+
+FIXME
+
+Translation
+===========
+
+FIXME
+
+Metrics
+=======
+
+* Tails has been started more than FIXME times this month. This makes FIXME boots a day on average.
+
+* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
+
+* FIXME bug reports were received through WhisperBack.
+
+-- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_08.mdwn b/wiki/src/blueprint/report_2015_08.mdwn
index e69de29..a990c9a 100644
--- a/wiki/src/blueprint/report_2015_08.mdwn
+++ b/wiki/src/blueprint/report_2015_08.mdwn
@@ -0,0 +1,75 @@
+[[!meta title="Tails report for August, 2015"]]
+
+FIXME Edito
+
+[[!toc]]
+
+Releases
+========
+
+* [[Tails 1.4 was released on May 12, 2015|news/version_1.4]] (major release).
+
+* The next release (1.4.1) is [[planned for June 30|https://tails.boum.org/contribute/calendar/]].
+
+Code
+====
+
+FIXME
+
+Documentation and Website
+=========================
+
+FIXME
+
+User Experience
+===============
+
+FIXME
+
+Infrastructure
+==============
+
+* Our test suite covers FIXME scenarios, FIXME more that in April.
+
+* FIXME more?
+
+Funding
+=======
+
+FIXME
+
+Outreach
+========
+
+FIXME
+
+Upcoming events
+---------------
+
+FIXME
+
+On-going discussions
+====================
+
+FIXME
+
+Press and testimonials
+======================
+
+FIXME
+
+Translation
+===========
+
+FIXME
+
+Metrics
+=======
+
+* Tails has been started more than FIXME times this month. This makes FIXME boots a day on average.
+
+* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
+
+* FIXME bug reports were received through WhisperBack.
+
+-- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_09.mdwn b/wiki/src/blueprint/report_2015_09.mdwn
index e69de29..c29b862 100644
--- a/wiki/src/blueprint/report_2015_09.mdwn
+++ b/wiki/src/blueprint/report_2015_09.mdwn
@@ -0,0 +1,75 @@
+[[!meta title="Tails report for September, 2015"]]
+
+FIXME Edito
+
+[[!toc]]
+
+Releases
+========
+
+* [[Tails 1.4 was released on May 12, 2015|news/version_1.4]] (major release).
+
+* The next release (1.4.1) is [[planned for June 30|https://tails.boum.org/contribute/calendar/]].
+
+Code
+====
+
+FIXME
+
+Documentation and Website
+=========================
+
+FIXME
+
+User Experience
+===============
+
+FIXME
+
+Infrastructure
+==============
+
+* Our test suite covers FIXME scenarios, FIXME more that in April.
+
+* FIXME more?
+
+Funding
+=======
+
+FIXME
+
+Outreach
+========
+
+FIXME
+
+Upcoming events
+---------------
+
+FIXME
+
+On-going discussions
+====================
+
+FIXME
+
+Press and testimonials
+======================
+
+FIXME
+
+Translation
+===========
+
+FIXME
+
+Metrics
+=======
+
+* Tails has been started more than FIXME times this month. This makes FIXME boots a day on average.
+
+* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
+
+* FIXME bug reports were received through WhisperBack.
+
+-- Report by BitingBird for Tails folks
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index f112790..e5cfd7c 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -243,7 +243,7 @@ Dependencies
The following Debian packages need to be installed:
* our `live-build` 2.x package, adapted for Wheezy. Its version is
- something like *3.0.5+really+is+2.0.12-0.tails1*. One can install it
+ something like *3.0.5+really+is+2.0.12-0.tails2*. One can install it
from:
deb http://deb.tails.boum.org/ builder-wheezy main
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.de.po b/wiki/src/doc/anonymous_internet/networkmanager.de.po
index 1054bf8..d145d52 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.de.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-04-19 12:06+0300\n"
+"POT-Creation-Date: 2015-05-29 20:20+0300\n"
"PO-Revision-Date: 2015-05-23 20:35+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails Translations <tails-l10n@boum.org>\n"
+"Language: de\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"
-"Language: de\n"
#. type: Plain text
#, no-wrap
@@ -37,9 +37,12 @@ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wi
msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
+#| "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgid ""
-"<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
+"<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgstr ""
"Der <span class=\"application\">Netzwerk-Manager</span> erlaubt es Ihnen, sich kabelgebunden\n"
@@ -70,7 +73,9 @@ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
#. type: Plain text
-msgid "After establishing a connection to a local network:"
+#, fuzzy
+#| msgid "After establishing a connection to a local network:"
+msgid "After establishing a connection to a network:"
msgstr "Nachdem eine Verbindung mit einem lokalen Netzwerk hergestellt wurde:"
#. type: Plain text
@@ -116,9 +121,14 @@ msgstr ""
" aktivieren.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you are concerned about being identified as a Tails user on your local "
+#| "network, read our documentation about [[network fingerprinting|doc/about/"
+#| "fingerprint]]."
msgid ""
-"If you are concerned about being identified as a Tails user on your local "
-"network, read our documentation about [[network fingerprinting|doc/about/"
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
"fingerprint]]."
msgstr ""
"Falls Sie Bedenken haben, als Nutzer von Tails in ihrem lokalen Netzwerk "
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.fr.po b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
index 7830394..48007ab 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.fr.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-19 12:06+0300\n"
+"POT-Creation-Date: 2015-05-29 20:20+0300\n"
"PO-Revision-Date: 2014-05-11 13:37-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,9 +37,12 @@ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wi
msgstr ""
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
+#| "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgid ""
-"<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
+"<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgstr ""
"<span class=\"application\">NetworkManager</span> vous permet de vous connecter\n"
@@ -70,7 +73,9 @@ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
msgstr ""
#. type: Plain text
-msgid "After establishing a connection to a local network:"
+#, fuzzy
+#| msgid "After establishing a connection to a local network:"
+msgid "After establishing a connection to a network:"
msgstr "Après établissement d'une connexion à un réseau local :"
#. type: Plain text
@@ -110,9 +115,14 @@ msgstr ""
"la persistance|first_steps/persistence/configure#network_connections]].\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you are concerned about being identified as a Tails user on your local "
+#| "network, read our documentation about [[network fingerprinting|doc/about/"
+#| "fingerprint]]."
msgid ""
-"If you are concerned about being identified as a Tails user on your local "
-"network, read our documentation about [[network fingerprinting|doc/about/"
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
"fingerprint]]."
msgstr ""
"Si vous êtes préoccupé par le fait d'être identifié comme un utilisateur de "
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.mdwn b/wiki/src/doc/anonymous_internet/networkmanager.mdwn
index 1fcb95e..311381e 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.mdwn
+++ b/wiki/src/doc/anonymous_internet/networkmanager.mdwn
@@ -4,7 +4,7 @@
[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wired.png link=no]]
[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]
-<span class="application">NetworkManager</span> allows you to connect to a local
+<span class="application">NetworkManager</span> allows you to connect to a
network using a wired or wireless connection (Wi-Fi, 3G, or GSM):
- If a wired connection is detected,
@@ -16,7 +16,7 @@ network using a wired or wireless connection (Wi-Fi, 3G, or GSM):
[[!img networkmanager/networkmanager.png link=no]]
-After establishing a connection to a local network:
+After establishing a connection to a network:
a. If you can already access the Internet, Tor and
<span class="application">[[Vidalia]]</span> are automatically started.
@@ -34,7 +34,7 @@ configuration or the passwords of encrypted wireless connections across separate
working sessions, you can activate the [[<span class="guilabel">Network connections</span> persistence
feature|first_steps/persistence/configure#network_connections]].
-If you are concerned about being identified as a Tails user on your local
+If you are concerned about being identified as a Tails user on your
network, read our documentation about [[network
fingerprinting|doc/about/fingerprint]].
diff --git a/wiki/src/doc/anonymous_internet/networkmanager.pt.po b/wiki/src/doc/anonymous_internet/networkmanager.pt.po
index ee2ddbc..32d51f7 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager.pt.po
+++ b/wiki/src/doc/anonymous_internet/networkmanager.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-19 12:06+0300\n"
+"POT-Creation-Date: 2015-05-29 20:20+0300\n"
"PO-Revision-Date: 2014-08-26 15:44-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,9 +36,12 @@ msgid "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wi
msgstr "[[!img first_steps/introduction_to_gnome_and_the_tails_desktop/network-wireless.png link=no]]\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
+#| "network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgid ""
-"<span class=\"application\">NetworkManager</span> allows you to connect to a local\n"
+"<span class=\"application\">NetworkManager</span> allows you to connect to a\n"
"network using a wired or wireless connection (Wi-Fi, 3G, or GSM):\n"
msgstr ""
"O <span class=\"application\">NetworkManager</span> permite que você conecte a\n"
@@ -68,7 +71,9 @@ msgid "[[!img networkmanager/networkmanager.png link=no]]\n"
msgstr "[[!img networkmanager/networkmanager.png link=no]]\n"
#. type: Plain text
-msgid "After establishing a connection to a local network:"
+#, fuzzy
+#| msgid "After establishing a connection to a local network:"
+msgid "After establishing a connection to a network:"
msgstr "Após estabelecer uma conexão à rede local:"
#. type: Plain text
@@ -108,9 +113,14 @@ msgstr ""
"rede</span>|first_steps/persistence/configure#network_connections]].\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you are concerned about being identified as a Tails user on your local "
+#| "network, read our documentation about [[network fingerprinting|doc/about/"
+#| "fingerprint]]."
msgid ""
-"If you are concerned about being identified as a Tails user on your local "
-"network, read our documentation about [[network fingerprinting|doc/about/"
+"If you are concerned about being identified as a Tails user on your network, "
+"read our documentation about [[network fingerprinting|doc/about/"
"fingerprint]]."
msgstr ""
"Se você está preocupado/a com ser identificado/a como um usuário de Tails em "
diff --git a/wiki/src/doc/first_steps/startup_options.de.po b/wiki/src/doc/first_steps/startup_options.de.po
index fe2cf04..6dc3ed9 100644
--- a/wiki/src/doc/first_steps/startup_options.de.po
+++ b/wiki/src/doc/first_steps/startup_options.de.po
@@ -93,8 +93,8 @@ msgid ""
"artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'. At the\n"
"bottom, a list of options ending with 'noautologin quiet_'\"]]\n"
msgstr ""
-"[[!img boot-menu-with-options.png link=no alt=\"Schwarzer Bildschirm mit Debian\n"
-"Live Grafik. 'Bootmenü' mit zwei Optionen, 'Live' und 'Live (failsafe)'. Am unteren\n"
+"[[!img boot-menu-with-options.png link=no alt=\"Schwarzer Bildschirm mit Tails\n"
+"Grafik. 'Bootmenü' mit zwei Optionen, 'Live' und 'Live (failsafe)'. Am unteren\n"
"Ende befindet sich eine Liste von Optionen die mit 'noautologin quiet_' endet\"]]\n"
#. type: Bullet: '2. '
diff --git a/wiki/src/press/media_appearances_2015.de.po b/wiki/src/press/media_appearances_2015.de.po
index 7c598f7..3d308aa 100644
--- a/wiki/src/press/media_appearances_2015.de.po
+++ b/wiki/src/press/media_appearances_2015.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-18 16:26+0300\n"
+"POT-Creation-Date: 2015-05-28 14:45+0300\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"
@@ -30,6 +30,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
+"* The release of Tails 1.4 was covered by quite a few interesting articles:\n"
+" * 2015-05-13: [Защищённый Linux-дистрибутив Tails 1.4 получил Tor Browser 4.5 и Paperkey](http://www.nixp.ru/news/13430.html) in Nixp (in Russian).\n"
+" * 2015-05-14: [Disponível Tails 1.4](https://under-linux.org/content.php?r=9503) by Camilla Lemke in Under-Linux (in Portuguese).\n"
+" * 2015-05-15: [La distribution Tails Linux 1.4 embarque le nouveau Tor Browser](http://www.nextinpact.com/news/94093-la-distribution-tails-linux-1-4-embarque-nouveau-tor-browser.htm) by Vincent Hermann in Next INpact (in French).\n"
+" * 2015-05-18: [Tails 1.4 ya está en la calle para utilizar](http://www.linuxadictos.com/tails-1-4-ya-esta-en-la-calle-para-utilizar.html) by Joaquin García in Linux Adictos (in Spanish).\n"
+" * 2015-05-15: [Tails 1.4 polishes up the privacy-obsessed Linux OS trusted by Edward Snowden](http://www.pcworld.com/article/2923013/tails-14-polishes-up-the-privacy-obsessed-linux-os-trusted-by-edward-snowden.html) by Chris Hoffman in PCWorld.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
"* The release of Tails 1.3 was covered by quite a few interesting\n"
" articles:\n"
" * 2015-03-14: [Tails 1.3 : l’OS préféré d’Edward Snowden, testé par\n"
diff --git a/wiki/src/press/media_appearances_2015.fr.po b/wiki/src/press/media_appearances_2015.fr.po
index 7c598f7..3d308aa 100644
--- a/wiki/src/press/media_appearances_2015.fr.po
+++ b/wiki/src/press/media_appearances_2015.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-18 16:26+0300\n"
+"POT-Creation-Date: 2015-05-28 14:45+0300\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"
@@ -30,6 +30,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
+"* The release of Tails 1.4 was covered by quite a few interesting articles:\n"
+" * 2015-05-13: [Защищённый Linux-дистрибутив Tails 1.4 получил Tor Browser 4.5 и Paperkey](http://www.nixp.ru/news/13430.html) in Nixp (in Russian).\n"
+" * 2015-05-14: [Disponível Tails 1.4](https://under-linux.org/content.php?r=9503) by Camilla Lemke in Under-Linux (in Portuguese).\n"
+" * 2015-05-15: [La distribution Tails Linux 1.4 embarque le nouveau Tor Browser](http://www.nextinpact.com/news/94093-la-distribution-tails-linux-1-4-embarque-nouveau-tor-browser.htm) by Vincent Hermann in Next INpact (in French).\n"
+" * 2015-05-18: [Tails 1.4 ya está en la calle para utilizar](http://www.linuxadictos.com/tails-1-4-ya-esta-en-la-calle-para-utilizar.html) by Joaquin García in Linux Adictos (in Spanish).\n"
+" * 2015-05-15: [Tails 1.4 polishes up the privacy-obsessed Linux OS trusted by Edward Snowden](http://www.pcworld.com/article/2923013/tails-14-polishes-up-the-privacy-obsessed-linux-os-trusted-by-edward-snowden.html) by Chris Hoffman in PCWorld.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
"* The release of Tails 1.3 was covered by quite a few interesting\n"
" articles:\n"
" * 2015-03-14: [Tails 1.3 : l’OS préféré d’Edward Snowden, testé par\n"
diff --git a/wiki/src/press/media_appearances_2015.mdwn b/wiki/src/press/media_appearances_2015.mdwn
index 351d09c..151d7af 100644
--- a/wiki/src/press/media_appearances_2015.mdwn
+++ b/wiki/src/press/media_appearances_2015.mdwn
@@ -3,6 +3,13 @@
* 2015-05-10: Joshua Datko blogs about [running Tails from the MinnowBoard Max](http://datko.net/2015/05/10/tails_mbm/),
a cheap open hardware computer.
+* The release of Tails 1.4 was covered by quite a few interesting articles:
+ * 2015-05-13: [Защищённый Linux-дистрибутив Tails 1.4 получил Tor Browser 4.5 и Paperkey](http://www.nixp.ru/news/13430.html) in Nixp (in Russian).
+ * 2015-05-14: [Disponível Tails 1.4](https://under-linux.org/content.php?r=9503) by Camilla Lemke in Under-Linux (in Portuguese).
+ * 2015-05-15: [La distribution Tails Linux 1.4 embarque le nouveau Tor Browser](http://www.nextinpact.com/news/94093-la-distribution-tails-linux-1-4-embarque-nouveau-tor-browser.htm) by Vincent Hermann in Next INpact (in French).
+ * 2015-05-18: [Tails 1.4 ya está en la calle para utilizar](http://www.linuxadictos.com/tails-1-4-ya-esta-en-la-calle-para-utilizar.html) by Joaquin García in Linux Adictos (in Spanish).
+ * 2015-05-15: [Tails 1.4 polishes up the privacy-obsessed Linux OS trusted by Edward Snowden](http://www.pcworld.com/article/2923013/tails-14-polishes-up-the-privacy-obsessed-linux-os-trusted-by-edward-snowden.html) by Chris Hoffman in PCWorld.
+
* The release of Tails 1.3 was covered by quite a few interesting
articles:
* 2015-03-14: [Tails 1.3 : l’OS préféré d’Edward Snowden, testé par
diff --git a/wiki/src/press/media_appearances_2015.pt.po b/wiki/src/press/media_appearances_2015.pt.po
index 7c598f7..3d308aa 100644
--- a/wiki/src/press/media_appearances_2015.pt.po
+++ b/wiki/src/press/media_appearances_2015.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-18 16:26+0300\n"
+"POT-Creation-Date: 2015-05-28 14:45+0300\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"
@@ -30,6 +30,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
+"* The release of Tails 1.4 was covered by quite a few interesting articles:\n"
+" * 2015-05-13: [Защищённый Linux-дистрибутив Tails 1.4 получил Tor Browser 4.5 и Paperkey](http://www.nixp.ru/news/13430.html) in Nixp (in Russian).\n"
+" * 2015-05-14: [Disponível Tails 1.4](https://under-linux.org/content.php?r=9503) by Camilla Lemke in Under-Linux (in Portuguese).\n"
+" * 2015-05-15: [La distribution Tails Linux 1.4 embarque le nouveau Tor Browser](http://www.nextinpact.com/news/94093-la-distribution-tails-linux-1-4-embarque-nouveau-tor-browser.htm) by Vincent Hermann in Next INpact (in French).\n"
+" * 2015-05-18: [Tails 1.4 ya está en la calle para utilizar](http://www.linuxadictos.com/tails-1-4-ya-esta-en-la-calle-para-utilizar.html) by Joaquin García in Linux Adictos (in Spanish).\n"
+" * 2015-05-15: [Tails 1.4 polishes up the privacy-obsessed Linux OS trusted by Edward Snowden](http://www.pcworld.com/article/2923013/tails-14-polishes-up-the-privacy-obsessed-linux-os-trusted-by-edward-snowden.html) by Chris Hoffman in PCWorld.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
"* The release of Tails 1.3 was covered by quite a few interesting\n"
" articles:\n"
" * 2015-03-14: [Tails 1.3 : l’OS préféré d’Edward Snowden, testé par\n"