summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-10-22 12:51:48 +0000
committersajolida <sajolida@pimienta.org>2015-10-22 12:51:48 +0000
commit8f2e846c554948c19b956219fe7ff911b27259b8 (patch)
tree736dbb323604a2d194bf2a0ad35b12ee846cabdf
parentc9eca212bb2f865f9067a86b5d82252e0b907b3c (diff)
parent1f41d6a13ca16d48cad490410713ff87f21a77e0 (diff)
Merge remote-tracking branch 'origin/stable' into web/9559-small-buttonsweb/9559-small-buttons
-rwxr-xr-xauto/build2
-rwxr-xr-xbuild-website (renamed from build-wiki)0
-rw-r--r--config/chroot_apt/preferences6
-rw-r--r--config/chroot_local-packageslists/tails-common.list3
-rw-r--r--debian/changelog6
-rw-r--r--features/support/extra_hooks.rb1
-rwxr-xr-xvagrant/provision/assets/build-tails2
-rw-r--r--wiki/src/blueprint/Debian_Stretch.mdwn76
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn151
-rw-r--r--wiki/src/blueprint/Return_of_Icedove__63__.mdwn5
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2015_09.mdwn296
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2015_10.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2015_11.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2015_12.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_01.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_02.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_03.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_04.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_05.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_06.mdwn2
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_07.mdwn2
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/automated_tests_specs.mdwn25
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn298
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/resources.mdwn140
-rw-r--r--wiki/src/blueprint/bootstrapping/assistant/infography/2nd_iteration/infography-sajolida-20150327.svg1095
-rw-r--r--wiki/src/blueprint/bootstrapping/assistant/overview/2nd_iteration/overview-20150324.odgbin99337 -> 0 bytes
-rw-r--r--wiki/src/blueprint/bootstrapping/assistant/windows.mdwn518
-rw-r--r--wiki/src/blueprint/bootstrapping/assistant/windows/tails_boum_org_blueprint_bootstrapping_assistant_windows.pngbin490 -> 0 bytes
-rw-r--r--wiki/src/blueprint/bootstrapping/assistant/windows/uui.pngbin32336 -> 0 bytes
-rw-r--r--wiki/src/blueprint/derivatives.mdwn5
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn113
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn58
-rw-r--r--wiki/src/blueprint/lizard_failover.mdwn60
-rw-r--r--wiki/src/blueprint/monitor_servers.mdwn14
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn2
-rw-r--r--wiki/src/blueprint/report_2015_08.mdwn40
-rw-r--r--wiki/src/contribute.de.po18
-rw-r--r--wiki/src/contribute.fr.po4
-rw-r--r--wiki/src/contribute.mdwn2
-rw-r--r--wiki/src/contribute.pt.po18
-rw-r--r--wiki/src/contribute/build/website.mdwn86
-rw-r--r--wiki/src/contribute/build/website/languages.inline.mdwn5
-rw-r--r--wiki/src/contribute/build/website/src.inline.mdwn4
-rw-r--r--wiki/src/contribute/calendar.mdwn43
-rw-r--r--wiki/src/contribute/design.mdwn3
-rw-r--r--wiki/src/contribute/git.mdwn2
-rw-r--r--wiki/src/contribute/how/code.mdwn2
-rw-r--r--wiki/src/contribute/how/documentation.mdwn13
-rw-r--r--wiki/src/contribute/how/translate/team/fr.mdwn2
-rw-r--r--wiki/src/contribute/how/translate/with_Git.mdwn2
-rw-r--r--wiki/src/contribute/l10n_tricks.mdwn8
-rw-r--r--wiki/src/contribute/meetings.mdwn2
-rw-r--r--wiki/src/contribute/meetings/201510.mdwn42
-rw-r--r--wiki/src/contribute/release_process.mdwn14
-rw-r--r--wiki/src/contribute/release_process/liveusb-creator.mdwn227
-rw-r--r--wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn68
-rw-r--r--wiki/src/contribute/release_process/test.mdwn46
-rw-r--r--wiki/src/doc/about/features.de.po4
-rw-r--r--wiki/src/doc/about/features.fr.po4
-rw-r--r--wiki/src/doc/about/features.mdwn2
-rw-r--r--wiki/src/doc/about/features.pt.po4
-rw-r--r--wiki/src/doc/about/requirements.de.po16
-rw-r--r--wiki/src/doc/about/tor.fr.po27
-rw-r--r--wiki/src/doc/about/warning.de.po248
-rw-r--r--wiki/src/doc/about/warning.fr.po248
-rw-r--r--wiki/src/doc/about/warning.mdwn84
-rw-r--r--wiki/src/doc/about/warning.pt.po240
-rw-r--r--wiki/src/doc/anonymous_internet/electrum.de.po4
-rw-r--r--wiki/src/doc/anonymous_internet/electrum.fr.po16
-rw-r--r--wiki/src/doc/anonymous_internet/electrum.mdwn2
-rw-r--r--wiki/src/doc/anonymous_internet/electrum.pt.po4
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser.de.po59
-rw-r--r--wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.de.po4
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.de.po17
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.fr.po17
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.mdwn2
-rw-r--r--wiki/src/doc/first_steps/bug_reporting.pt.po13
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.de.po149
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po271
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.de.po17
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.fr.po26
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.mdwn11
-rw-r--r--wiki/src/doc/first_steps/persistence/configure.pt.po20
-rw-r--r--wiki/src/doc/first_steps/persistence/warnings.de.po75
-rw-r--r--wiki/src/doc/first_steps/reset/mac.de.po54
-rw-r--r--wiki/src/doc/first_steps/start_tails.de.po125
-rw-r--r--wiki/src/doc/get/signing_key_transition.inline.de.po21
-rw-r--r--wiki/src/doc/get/trusting_tails_signing_key.de.po193
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po87
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.de.po63
-rw-r--r--wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po93
-rw-r--r--wiki/src/inc/release_notes/1.6.de.po31
-rw-r--r--wiki/src/lib/download_stable_i386_iso_sig.de.html4
-rw-r--r--wiki/src/lib/download_tails_signing_key.de.html4
-rw-r--r--wiki/src/lib/trophy-gold.pngbin0 -> 3359 bytes
-rw-r--r--wiki/src/local.css9
-rw-r--r--wiki/src/news/version_0.2.fr.po23
-rw-r--r--wiki/src/news/version_0.3.fr.po25
-rw-r--r--wiki/src/news/version_0.4.1.fr.po60
-rw-r--r--wiki/src/news/version_1.6.de.po48
-rw-r--r--wiki/src/news/version_1.6.fr.po47
-rw-r--r--wiki/src/press/media_appearances_2011.fr.po29
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.5.1.de.po39
-rw-r--r--wiki/src/security/Numerous_security_holes_in_1.5.1.fr.po37
-rw-r--r--wiki/src/support/faq.fr.po7
-rw-r--r--wiki/src/support/known_issues.de.po4
-rw-r--r--wiki/src/support/known_issues.fr.po38
-rw-r--r--wiki/src/support/known_issues.mdwn2
-rw-r--r--wiki/src/support/known_issues.pt.po4
-rw-r--r--wiki/src/support/learn.fr.po53
-rw-r--r--wiki/src/support/learn/intro.inline.fr.po12
-rw-r--r--wiki/src/support/talk/languages.inline.de.po22
-rw-r--r--wiki/src/support/talk/languages.inline.fr.po20
113 files changed, 3392 insertions, 2893 deletions
diff --git a/auto/build b/auto/build
index 390ef3c..d464959 100755
--- a/auto/build
+++ b/auto/build
@@ -128,7 +128,7 @@ if [ -n "$JENKINS_URL" ] && [ -z "$GIT_TAG" ] \
fi
# build the doc wiki
-./build-wiki
+./build-website
# refresh translations of our programs
./refresh-translations || fatal "refresh-translations failed ($?)."
diff --git a/build-wiki b/build-website
index bb1590b..bb1590b 100755
--- a/build-wiki
+++ b/build-website
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 5b04851..f9b0c05 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -66,6 +66,10 @@ Package: poedit
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
+Package: firmware-amd-graphics
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
Package: firmware-atheros
Pin: release o=Debian,a=unstable
Pin-Priority: 999
@@ -106,7 +110,7 @@ Package: firmware-linux-nonfree
Pin: release o=Debian,a=unstable
Pin-Priority: 999
-Package: firmware-ralink
+Package: firmware-misc-nonfree
Pin: release o=Debian,a=unstable
Pin-Priority: 999
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 9cefd5e..558e2f1 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -250,6 +250,7 @@ xserver-xorg-input-vmmouse
#endif
### Firmwares
+firmware-amd-graphics
firmware-atheros
firmware-brcm80211
firmware-ipw2x00
@@ -258,7 +259,7 @@ firmware-libertas
firmware-linux
firmware-linux-free
firmware-linux-nonfree
-firmware-ralink
+firmware-misc-nonfree
firmware-realtek
firmware-zd1211
b43-fwcutter
diff --git a/debian/changelog b/debian/changelog
index 6e28019..7f39fea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tails (1.7) UNRELEASED; urgency=medium
+
+ * Dummy entry for next major release.
+
+ -- intrigeri <intrigeri@debian.org> Sat, 22 Sep 2015 18:54:32 +0200
+
tails (1.6) unstable; urgency=medium
* Security fixes
diff --git a/features/support/extra_hooks.rb b/features/support/extra_hooks.rb
index a3422fc..4deccd1 100644
--- a/features/support/extra_hooks.rb
+++ b/features/support/extra_hooks.rb
@@ -87,6 +87,7 @@ module ExtraFormatters
def debug_log(message)
@io.puts(format_string(message, :blue))
+ @io.flush
end
end
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index cc1c37d..5ff9425 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -83,7 +83,7 @@ if [ "$TAILS_CLEAN_BUILD" ]; then
fi
if [ -z "$JENKINS_URL" ]; then
- ./build-wiki
+ ./build-website
fi
BUILD_DIR=$(mktemp -d /tmp/tails-build.XXXXXXXX)
diff --git a/wiki/src/blueprint/Debian_Stretch.mdwn b/wiki/src/blueprint/Debian_Stretch.mdwn
new file mode 100644
index 0000000..0e2e9af
--- /dev/null
+++ b/wiki/src/blueprint/Debian_Stretch.mdwn
@@ -0,0 +1,76 @@
+[[!meta title="Porting Tails to Debian Stretch"]]
+
+This is about the effort to create [Tails
+3.0](https://labs.riseup.net/code/projects/tails/issues?query_id=198),
+based on Debian Stretch.
+
+[[!toc levels=2]]
+
+# Big picture
+
+When porting to Wheezy, our main problem has been that we started the
+work too late, which made us discover Debian bugs too late (after the
+Debian Wheezy freeze, or even after its release), and in the end we
+had to workaround lots of problems on our side.
+
+So we started much earlier the porting work to Jessie, which indeed
+essentially avoided the aforementioned problem. But we didn't allocate
+enough focused resources to this effort, and as a result the total
+duration of the porting to Jessie work is lasting too much, and we're
+spending too much time just keeping our feature/jessie branch
+up-to-date wrt. the changes we were making in our Wheezy
+production branches.
+
+For Stretch we'd like to avoid both problems. We want to start early,
+in order to fix problems directly in Debian Stretch before it's
+released. And, we want the porting work to fit into a shorter time
+span, so as soon as we start we'll allocate more resources to it, and
+in a better organized, team-based and focused way.
+
+Additionally, we would like to use this process as an opportunity to
+evaluate the idea of basing Tails on snapshots of Debian testing.
+
+# Schedule
+
+* 2016Q1 — Tails 2.0 is out
+* April or May 2016 — start working on Tails 3.0 (1 week sprint with
+ all involved people) :intrigeri:anonym:kytv:
+ - get feature/stretch to build and boot
+ - update the automated test suite to test Tails/Stretch ISO images
+* May 2016 to April 2017 — have one dedicated half-time, 1-week sprint
+ every 6 weeks.
+ - Schedule these sprints in advance, announce them
+ publicly, and invite other contributors (e.g. doc writers).
+ - Most of these sprints will probably be attended remotely, but at
+ least some could happen face-to-face.
+ - At the beginning of each Stretch sprint, we import a new snapshot
+ of Debian testing into our freezable APT repository, so that:
+ * during the sprint we update our stuff as required by changes
+ that happened in Debian since the last sprint;
+ * our stuff is not broken by changes in Debian neither during
+ sprints, nor between them;
+ * we get a feeling of how "being based on snapshots of Debian
+ testing" would work.
+* December 5 2016 — Debian Stretch freeze starts
+* April 2017 (???) — Debian Stretch is released
+* April-June 2017 — Tails 3.0 is released
+
+# Let's go rolling
+
+Let's use this porting cycle to evaluate how being based on snapshots
+of Debian testing would feel like. During the entire cycle:
+
+* Keep the automated test suite up-to-date on feature/stretch :kytv:
+* Keep the documentation up-to-date on feature/stretch :doc_writer:
+* Take notes of issues we see from the perspective of "how would it go
+ if we were based on testing already?". E.g.:
+ - How to deal with ongoing transitions that block migration of
+ security updates from sid to testing?
+
+Note that during half of the cycle, we'll be based on a frozen Debian
+testing, so the changes rate coming from Debian won't be crazy.
+Of course there will be changes coming from our own porting efforts.
+
+And then, once Tails 3.0 is out: we're not lagging behind anymore, and
+are thus in a position to decide whether we want to base Tails on
+snapshots of Debian testing.
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index a63013c..6a5fafd 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -1,5 +1,38 @@
**Ticket**: [[!tails_ticket 7161]]
+[[!toc levels=3]]
+
+# The plan
+
+## Big picture
+
+We decided to implement a two-way strategy for this feature:
+
+* Use JavaScript to modify the link on the download page, so that each
+ user is pointed to random mirror.
+ - Vanilla JS (no frameworks)
+ - Store the JS code and its configuration file in two dedicated
+ ikiwiki overlays, for finer-grained access control possibilities
+ to it (e.g. we may want to let people who don't have commit access
+ to Git maintain the mirrors pool).
+ - Configuration for the JS is loaded from JSON file. It attaches
+ a weight to each mirror. Weight 0 means that the mirror is
+ currently disabled, and will never be redirected to. We're using
+ JSON and not YAML to avoid the need to use a third-party parser.
+
+* Keep using DNS to point to 3-5 fast and reliable mirrors. This will
+ be the fallback for people who do not use JS. So we still need a DNS
+ dynamic update system; we can simply re-purpose the one we already
+ have (`dl.amnesia.boum.org`).
+
+* The ISO verification extension also needs to use mirrors. So, we'll
+ be providing library code for it to do the same, internally, as
+ a web browser would do when visiting the Tails download page, that
+ is replacing the hostname, in a ISO download URL, with a suitable
+ mirror's hostname (using the JSON mirror pool configuration file).
+
+# Initial research
+
The idea I had was to let the server(s) send a reduced list of hosts. Not
only it would allow to work-around Tor DNS limitations, but also to have
some weighted round robin, in order to prioritize some high bandwidth
@@ -9,9 +42,7 @@ If I had to mention the ideal design goals for such changes, I would say
that the more straightforward would be the better for implementation and
also for maintainability.
-[[!toc levels=2]]
-
-# Using DNS
+## Using DNS
Using DNS seems to be an easy way to do some round robin in low level. It
allows some kind of transparency to the upper layers protocols and
@@ -24,7 +55,7 @@ The following ways are available to implement it:
* NS Hacks
* Modified DNS servers
-## CNAME Hacks
+### CNAME Hacks
As mention by ToBeFree something that can be done is to have different
pools of servers like:
@@ -55,7 +86,7 @@ that has not been ported to bind 9. Neither NSD nor PowerDNS seem to
support it, and their is no actual data about how resolvers would
handle this case, so I don't think it is the best option.
-## NS Hacks
+### NS Hacks
Following the same idea the dl amnesia.boum.org could be delegated to a
few different DNS servers, and those servers may have different versions
@@ -82,7 +113,7 @@ CNAME hacks, almost as the NS servers will not receive 50% of requests
because of [[!rfc 5452]]). However, I am not sure that playing with DNS
inconsistency will be a so good idea, for example for maintainability :)
-## Using modified DNS servers
+### Using modified DNS servers
Interestingly Tails is not the first project to be looking how to use DNS
for load distribution. People already wrote some DNS software designed to
@@ -102,7 +133,7 @@ Deploying such software would solve the problem in a more elegant way than
CNAME or NS hacks. It would require a bit of system administration that
maybe can be done using some puppet templates in a few Virtal Machines.
-# Using HTTP(s)
+## Using HTTP(s)
DNS is not the only way to do some load balancing. It is mostly used for
low level protocols that don't allow redirects (for example: NTP). As
@@ -147,13 +178,13 @@ Thus, if I may, I would like to recommend considering the HTTP(s) option,
even if it means that I have to write the PHP script by myself or to create
an easy task entry on the ticket tracker and follow it :)
-# Proof of concept: JavaScript + multiple DNS pools / named mirrors
+## Proof of concept: JavaScript + multiple DNS pools / named mirrors
This method can either be used with multiple DNS pools (dl1.amnesia.boum.org, dl2.amnesia.boum.org etc.) or with named mirrors (freiwuppertal.dl.amnesia.boum.org, othermirror.dl.amnesia.boum.org, ...). Using named mirrors allows you to use a huge, unlimited list of completely equally used mirrors; using multiple DNS pools leads to effects described under "CNAME hacks".
These POCs should be 1:1 usable on the Tails [[download]] page. All that would be needed is setting up the DNS pools and/or named mirrors, and telling the mirror owners to configure their servers to respond to \*.amnesia.boum.org (the wildcard is important).
-## JavaScript POC (multiple DNS pools)
+### JavaScript POC (multiple DNS pools)
<script src="//code.jquery.com/jquery.min.js"></script>
<script type="text/javascript">//<![CDATA[
@@ -171,12 +202,12 @@ For this to work and to be flexible, mirrors need to respond to \*.amnesia.boum.
At least nginx is unable to use a wildcard like dl\*.amnesia.boum.org, so \*.amnesia.boum.org has to be used. This is more flexible anyway.
-### Example webpage (see the webpage source there too)
+#### Example webpage (see the webpage source there too)
<http://freiwuppertal.de/tails-mirror-example-dns.htm>
-## JavaScript POC (named mirrors)
+### JavaScript POC (named mirrors)
<script src="//code.jquery.com/jquery.min.js"></script>
<script type="text/javascript">//<![CDATA[
@@ -192,16 +223,108 @@ At least nginx is unable to use a wildcard like dl\*.amnesia.boum.org, so \*.amn
For this to work and to be flexible, mirrors need to respond to \*.amnesia.boum.org. Just responding to a fixed name would make this an unflexible solution, so the wildcard is needed.
-### Example webpage (see the webpage source there too)
+#### Example webpage (see the webpage source there too)
<http://freiwuppertal.de/tails-mirror-example-named.htm>
-### Giving mirrors higher or lower weight
+#### Giving mirrors higher or lower weight
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
+### Vanilla JavaScript POC and JSON
+
+ <a href="http://dl.amnesia.boum.org/tails/stable/tails-i386-1.6/tails-i386-1.6.iso" id="dllink">download link</a>
+
+ <script type="text/javascript">
+ function fetchJSONdata(path, callback) {
+ var xhr = new XMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState === 4) {
+ if (xhr.status === 200 || xhr.status === 0) {
+ var data = JSON.parse(xhr.responseText);
+ if (callback) callback(data);
+ } else {
+ console.log( "Error: " + xhr.statusText);
+ }
+ }
+ };
+ xhr.open('GET', path, true);
+ xhr.send();
+ }
+
+ function getRandomInt(min, max) {
+ return Math.floor(Math.random() * (max - min +1)) + min;
+ }
+
+ function isJSON(str) {
+ try {
+ JSON.parse(str);
+ } catch (e) {
+ return false;
+ }
+ return true;
+ }
+
+ function replaceDownloadURL(updatedURL) {
+ var URLMarker = "/tails/stable";
+ // todo check that url is a correct url
+ var linkDOMElem = document.getElementById('dllink');
+ var linkHREF = linkDOMElem.href.split( '//' );
+ var linkToISO = linkHREF[1].split( URLMarker );
+ // fixme http or https
+ linkDOMElem.href = '//' + updatedURL + URLMarker + linkToISO[1];
+ return true;
+ }
+
+ fetchJSONdata('./mirrors.json', function(data){
+ //console.log(data);
+ if( data == "undefined" ) {
+ console.log( "Error: mirror data not loaded.");
+ } else if( !isJSON( JSON.stringify(data) ) ) {
+ console.log( "Error: mirror data is not JSON.");
+ } else {
+ //console.log(data.mirrors);
+ // todo delete all mirrors with weight 0 before choosing one
+ if(data.mirrors.length > 0 ) {
+ var activeMirrors = new Array();
+ for ( i = 0; i < data.mirrors.length; i++ ) {
+ if ( data.mirrors[i].weight != 0 ) {
+ // add mirror as many times as its weight, max weight is 5
+ if ( parseInt(data.mirrors[i].weight ) > 5) {
+ var max_weight = 5;
+ } else {
+ var max_weight = parseInt( data.mirrors[i].weight );
+ }
+ for ( w = 0; w < max_weight; w++ ) {
+ activeMirrors.push( data.mirrors[i] );
+ }
+ }
+ }
+ console.log(activeMirrors);
+
+ var randomMirror = getRandomInt(0, activeMirrors.length-1);
+ //console.log(randomMirror);
+ //console.log(data.mirrors[randomMirror]);
+ replaceDownloadURL(activeMirrors[randomMirror].url);
+ }
+ }
+ });
+ </script>
+
+The mirrors.json file contains:
+<pre>
+ {
+ "mirrors": [
+ { "url": "1.dl.amnesia.boum.org", "weight": "10" },
+ { "url": "5.dl.amnesia.boum.org", "weight": "5" },
+ { "url": "6.dl.amnesia.boum.org", "weight": "6" },
+ { "url": "3.dl.amnesia.boum.org", "weight": "0" }
+ ]
+ }
+</pre>
+
-# PHP: first draft
+## PHP: first draft
// http://stackoverflow.com/questions/4233407/get-random-item-from-array
diff --git a/wiki/src/blueprint/Return_of_Icedove__63__.mdwn b/wiki/src/blueprint/Return_of_Icedove__63__.mdwn
index a55a4e5..8d0fbe6 100644
--- a/wiki/src/blueprint/Return_of_Icedove__63__.mdwn
+++ b/wiki/src/blueprint/Return_of_Icedove__63__.mdwn
@@ -117,19 +117,18 @@ Basic configuration & integration
* Don't display the "Adblock Plus installation complete" tab.
* Don't prompt whether one wants to report usage and performance
information to Mozilla.
-* Disable FoxyProxy.
* Enable "Only use secure protocols" by default (one may still
uncheck it when needed).
* Don't check updates for Add-ons.
* Add launcher to the GNOME panel.
-* More generally: have a look at our Iceweasel prefs and copy all
+* More generally: have a look at our Tor Browser prefs and copy all
those that exist and make sense for Icedove.
* The [[security/IP_address_leak_with_icedove]] can be fixed by
setting `mail.smtpserver.default.hello_argument` to "localhost".
See [this Tor wiki
entry](https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO/EMail#ExperimentalSuggestionsforpossiblymakingthunderbirdandorclawsstopleakinginfoExperimental)
for other goodies. By applying those configurations I think both
- claws and icedove comes to an equal level security-wise.
+ claws and icedove comes to an equal level security-wise. (Note: This will be set by TorBirdy)
* Disable by default the indexer from
`Preferences -> Advanced -> General -> Enable Global Search and Indexer`.
Otherwise pinentry dialogs can appear while checking email in the
diff --git a/wiki/src/blueprint/SponsorS/reports/2015_09.mdwn b/wiki/src/blueprint/SponsorS/reports/2015_09.mdwn
index d47aecb..315503b 100644
--- a/wiki/src/blueprint/SponsorS/reports/2015_09.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2015_09.mdwn
@@ -14,28 +14,308 @@ This reports covers the activity of Tails in September 2015.
Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
-tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+tracker which contain more technical details and timeline. For example,
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
-## A.n. description of subsection
+- A.1.3. Integrate Icedove into Tails
-- A.n.m. description of deliverable: ticket numbers
+ We amended the strategy we had in mind initially and made it more
+ incremental. If time allows, a first stage will be to include
+ Icedove in Tails 1.7 (2015-11-03), but without the Icedove account
+ setup wizard. During this first stage, Torbirdy's own account setup
+ wizard will be used. And the second stage will be about securing
+ Icedove's wizard (#6154). If this works out as we hope, Tails users
+ will be able to start using Icedove two months earlier than what we
+ planned initially, and the transition period from Claws Mail will be
+ longer, and thus smoother, for users.
- status summary:
+ We started implementing this plan (#10285), set up team coordination
+ tools, and triaged what is a blocker for the first stage, from what is
+ not.
- * what was done
- * what is the outcome (how it makes Tails better)
- * what was not done, and why
+ Then we worked on the "Torbirdy uses Arabic as a default locale"
+ bug, submitted a pull request upstream, that was accepted (#9821).
+
+- A.1.4. Provide a migration path for our users from Claws Mail to Icedove
+
+ We decided how long to keep Claws Mails once we have Icedove
+ (#10010), and initiated work on the migration for users of Tails
+ persistence feature (#9498).
# B. Improve our quality assurance process
+## B.2. Continuously run our entire test suite on all those ISO images once they are built
+
+- B.2.1. Adjust our infrastructure to run tests in parallel
+
+ Great progress was made on this front, and more specifically on the
+ last remaining chunk of it: firing up a clean test runner virtual
+ machine before each test suite run. It was tricky to implement this in
+ a way that prevented race conditions, but we now have a working
+ prototype that we are confident fixes the issues we have seen earlier
+ (#9486, #10215). Along the way we encouraged a few Debian developers
+ to take care of a package we rely on (`jenkins-job-builder`), and one
+ of them promptly took it over and updated it to the version we need
+ (#9646).
+
+- B.2.2. Decide what kind of ISO images qualify for testing and when,
+ how to process, advertise, and store the results (#8667)
+
+ Early in September, we reached an agreement on all discussion topics
+ that were left pending in August, such as how to archive videos from
+ test suite runs. As can be seen in the "Help Jenkins integration"
+ section below, our test suite team promptly started adjusting their
+ code to match what we will need on the Jenkins deployment.
+
+ <https://tails.boum.org/blueprint/automated_builds_and_tests/automated_tests_specs/>
+
+- B.2.3. Research and design a solution to generate a set of Jenkins ISO test jobs
+
+ Some research and experiments were done for sending ISO images that
+ shall be tested to the test suite runner virtual machines (#9597), and
+ major blockers were removed in the underlying infrastructure. Some of
+ our Puppet code saw a nice refactoring in this process. On the same
+ topic, we reached a consensus regarding what "old" ISO image to use
+ for tests that require two images, such as upgrade tests (#10117). And
+ here as well, test suite developers promptly implemented what we
+ needed (#10147).
+
+ <https://tails.boum.org/blueprint/automated_builds_and_tests/jenkins/>
+
+## B.3 Extend the coverage of our test suite
+
+### General improvements
+
+- Filesystem shares are incompatible with QEMU snapshots: #5571
+
+ We have come up with a short-term strategy that will work well with
+ our current workflow. In addition we have our eyes on a long-term
+ technical solution that will require adding a small feature into
+ upstream QEMU. This is, however, out of the scope of this
+ deliverable.
+
+### Help Jenkins integration
+
+These changes, on the test suite side, were prompted by the ongoing
+work on "B.2. Continuously run our entire test suite on all those ISO
+images once they are built".
+
+It should be noted that many of the things mentioned here also greatly
+assist developers when debugging the automated test suite.
+
+- Leverage Cucumber's formatter system for debug logging: #9491
+
+ This makes it easier to have clean console logging while still
+ keeping the full debug log in a separate file. Consequently it will
+ be easier to get an overview of how a test is currently running.
+
+- Capture individual videos for failed scenarios only: #10148
+
+ This will both make these video artifacts more manageable and useful
+ for the developers (more focused, better granularity), and will save
+ a lot of disk space on our servers by excluding videos of tests that
+ succeeded and hence aren't very interesting.
+
+- Make the old Tails ISO default to the "new" ISO: #10147
+
+ This compromise will test 90% of what we want to test, and simplify
+ the Jenkins setup by eliminating the need to share multiple ISO
+ artifacts to the test suite context.
+
+### B.3.6. Fix newly identified issues to make our test suite more robust and faster
+
+#### Performance improvements
+
+- Snapshot improvements: #6094, #8008
+
+ The proof-of-concept that was written as part of B.3.4 has matured
+ into a reliable implementation and
+ it is basically done; only fine-tuning and style improvements
+ remain. It is expected to be ready for the Jenkins deployment in
+ Milestone III, and will allow us to run 33% more tests. It will add
+ less overhead for new tests using persistence in the future, and
+ thus complete "B.3.9. Optimize tests that need a persistent volume"
+ three months in advance.
+
+- Use the more efficient x264 encoding when capturing videos: #10001
+
+ This will reduce the CPU load on the host running the automated test
+ suite, as well as reduce its runtime with a few percent.
+
+- Optimize IRC test using waitAny: #9653
+
+ In case there are connection issues, this may save several minutes
+ per instance by waiting for both the failure and success condition
+ in parallel, instead of serially.
+
+#### Robustness improvements
+
+Some of what follows was part of a project we have with
+another sponsor.
+
+- Avoid nested FindFailed exceptions in waitAny()/findAny(): #9633
+
+ This works around a race condition due to a bug in Rjb that made
+ these helpers fail with some probability depending on the host
+ hardware.
+
+- Import logging module in otr-bot.py: #9375
+
+ Without this fix, the bot may occasionally fail due to it wanting to
+ use the logging facility when it is not in place.
+
+- Force new Tor circuit and reload web site on browser
+ timeouts: #10116
+
+ Given the inherent instability of Tor circuits, this will
+ drastically improve the robustness of all Tor Browser tests.
+
+- Pidgin's multi-window GUI sometimes causes unexpected behaviour
+ (e.g. one window covering the window we want to interact with):
+
+ * Focus Pidgin's buddy list before trying to access the tools
+ menu: #10217
+
+ * Wait for (and focus if necessary) Pidgin's Certificate windows: #10222
+
+- Develop a strategy for dealing with newly discovered fragile tests: #10288
+
+ By leveraging our Jenkins instance, following this strategy will
+ isolate individual robustness issues into individual branches while
+ keeping all other branches functional. Consequently it will be
+ easier to track and deal with future robustness issues.
+
+- Escape regexp used to match nick in CTCP replies: #10219
+
+ Due to how we randomize the nick name for the default Pidgin
+ accounts, there was a 10% chance to generate one with characters
+ that would have a special meaning when used inside regular
+ expressions, causing failures.
+
+### Writing more automated tests
+
+- B.3.8. Automatically test that udev-watchdog is monitoring the
+ right device: #9890.
+
+ This was completed and merged almost four months ahead of schedule.
# C. Scale our infrastructure
+## C.1. Change in depth the infrastructure of our pool of mirrors
+
+We started working on this project, and decided to handle the
+redirection on the client's side (for the record, the original plan
+was to do it server-side). We quickly put together a very rough
+proof-of-concept, and then moved on to update our plans for the next
+steps, accordingly to our new technological choice.
+
+The big picture is described on the corresponding blueprint:
+<https://tails.boum.org/blueprint/HTTP_mirror_pool/>
+
+- C.1.1. Specify a way of describing the pool of mirrors
+
+ We picked a serialization format (JSON) that matches our
+ implementation choices, and started researching what would be the
+ best naming scheme for mirrors, taking into account future HTTPS
+ hardening we have in mind, and support in various popular web
+ servers (#10294).
+
+- C.1.3. Design and implement the mirrors pool administration process and tools
+
+ We settled on ikiwiki overlays for integration into our website, and
+ on using Git and SSH to store and convey the configuration (#8637).
+
+- C.1.2. Write & audit the code that makes the redirection decision
+
+ We did some prototyping work (#8639), and then started refactoring
+ it so that the code can be reused by other components that will need
+ to implement the same redirection scheme client-side (#10284).
+
+## C.2. Be able to detect within hours failures and malfunction on our services
+
+This deliverable is technically due for January 15, but we kept on
+working on it.
+
+- C.2.1. Research and decide what monitoring solution to use: #8645
+
+ We completed experiments and comparisons between monitoring systems,
+ and settled on Icinga 2. We started looking for solutions regarding
+ the single requirement of ours that it does not satisfy.
+
+ <https://tails.boum.org/blueprint/monitor_servers/>
+
+- C.2.2. Set up the monitoring software and the underlying
+ infrastructure: #8646, #8647
+
+ We found hosting for our monitoring setup, got access to the
+ machine, and installed an operating system on it.
+
+## C.4. Maintain our already existing services
+
+This covers "C.4.3. Administer our services upto milestone III" until
+the end of September.
+
+Aside of the usual security updates and taking care of daily requests
+coming from the Tails development community, we did some resources
+planning, and updated the system requirements for the VM that will be
+used as a failover for our critical services (#10243) and looked for
+hosting that would meet our needs (#10244). We have an initial
+agreement with a hosting organization, and will follow-up on
+this shortly.
# D. Migration to Debian Jessie
+## D.1. Adjust to the change of desktop environment to GNOME Shell
+
+- D.1.1. Adjust to the change of desktop environment to GNOME Shell
+
+ We completed the work started on our "Shutdown helper" applet for
+ Jessie (#8302): visually impaired users can now use it, and we made
+ sure it is integrated with our translation system.
+
+ We cleaned up the desktop Applications menu (#8505).
+
+## D.6. Upgrade Tails-specific tools to Debian Jessie technologies
+
+- D.6.1. Port Tails-specific tools from udisks 1 to udisks 2
+
+ We followed up on the persistent volume assistant's porting to
+ udisks 2, and made sure it does not trigger spurious GNOME
+ notifications that could confuse users (#9280).
+
+- D.6.3. Port WhisperBack, our integrated bug reporting tool, to Python 3
+
+ Native SOCKS support was completed, which was the only missing piece
+ to make WhisperBack work great on Jessie and Python 3 (#9412).
+
+## Additional improvements that were not planned
+
+- When starting Tails in a virtual machine that runs with non-free
+ technology (and does not hide this fact), users are now warned about
+ the risks (#5315).
+
+- Simplify printers administration: it can now be done without having
+ to set an administration password, just like it was back when Tails
+ was based on Debian Squeeze (#8443). This removes a usability
+ pain-point, namely the need to restart Tails when one realizes too
+ late they need to print a document, and should have set an
+ administration password. In passing, we noticed that AppArmor
+ blocked adding a printer on Jessie, and fixed it (#10210).
# E. Release management
+
+- Tails 1.6 was released on 2015-09-22 [1]:
+
+ * Upgrade Tor Browser to version 5.0.3 (based on Firefox 38.3.0 ESR).
+ * Upgrade I2P to version 0.9.22 and enable its AppArmor profile.
+ * Fix several issues related to MAC address spoofing:
+ - If MAC address spoofing fails on a network interface and this
+ interface cannot be disabled, then all networking is now
+ completely disabled.
+ - A notification is displayed if MAC address spoofing causes
+ network issues, for example if a network only allows
+ connections from a list of authorized MAC addresses.
+
+ [1] <https://tails.boum.org/news/version_1.6/>
diff --git a/wiki/src/blueprint/SponsorS/reports/2015_10.mdwn b/wiki/src/blueprint/SponsorS/reports/2015_10.mdwn
index 00c9e5f..02e83cc 100644
--- a/wiki/src/blueprint/SponsorS/reports/2015_10.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2015_10.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2015_11.mdwn b/wiki/src/blueprint/SponsorS/reports/2015_11.mdwn
index 0786212..641aea1 100644
--- a/wiki/src/blueprint/SponsorS/reports/2015_11.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2015_11.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2015_12.mdwn b/wiki/src/blueprint/SponsorS/reports/2015_12.mdwn
index 78bc89a..2f0b005 100644
--- a/wiki/src/blueprint/SponsorS/reports/2015_12.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2015_12.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
index 6f53f65..6ef80aa 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_02.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_02.mdwn
index 0f3a2f2..bae0400 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_02.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_02.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_03.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_03.mdwn
index 5ae6ea8..537075f 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_03.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_03.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_04.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_04.mdwn
index 6b576a0..cb781d7 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_04.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_04.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_05.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_05.mdwn
index a67279e..4b92d63 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_05.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_05.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_06.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_06.mdwn
index 3f90919..6ff6f7b 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_06.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_06.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_07.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_07.mdwn
index 8331a57..4f1bb0f 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_07.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_07.mdwn
@@ -15,7 +15,7 @@ Everything in this report can be made public.
Note: the numbers preceded with a `#` correspond to tickets in our bug
tracker which contains more technical details and timeline. For example,
-ticket #6938 can been seed on https://labs.riseup.net/code/issues/6938.
+ticket #6938 can be seen on <https://labs.riseup.net/code/issues/6938>.
# A. Replace Claws Mail with Icedove
diff --git a/wiki/src/blueprint/automated_builds_and_tests/automated_tests_specs.mdwn b/wiki/src/blueprint/automated_builds_and_tests/automated_tests_specs.mdwn
index 7b832d0..5df035b 100644
--- a/wiki/src/blueprint/automated_builds_and_tests/automated_tests_specs.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests/automated_tests_specs.mdwn
@@ -128,26 +128,19 @@ The test suite produces different kind of artifacts: logfiles, screen
captures for failing steps, snapshots of the test VM, and also videos of
the running test session.
-Videos may be a bit too much to keep, given they slow down the test
-suite and might take quite a bit of disk space to store. If we want to
-keep them, we may want to do so only for failing test suite runs. If we
-decide to still use them, then we probably have to wait for
-[[!tails_ticket 10001]] too be resolved.
+We can keep the video captures in the build artifacts, now that
+[[!tails_ticket 10001]] is resolved.
-Proposal for a first iteration:
+Decision:
* For green test suite run: keep the test logs (Jenkins natively do
- that) and video captures
- * For red test suite run: keep the screen and video captures and the
- logs.
+ that).
+ * For red test suite run: keep the screenshots and video captures, the
+ logs and the pcap files.
-On the second iteration, we will keep video capture only for the red
-tests.
-
-The retention strategy should be the same than for the automatically
-built ISOs. In particular, we will have to pay attention to the rotation
-of videos capture (given they'll quickly bloat our storage space).
-Keeping them only for 7 days sounds reasonnable.
+In [[!tails_ticket 10155]] we calculated that we can probably keep the
+video captures for a full release cycle. This will be refine is reality
+claims the contrary after an evaluation.
# Scenarios
diff --git a/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn b/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn
index c53d05b..0e9902c 100644
--- a/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn
+++ b/wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn
@@ -1,152 +1,41 @@
-[[!meta title="Jenkins"]]
+[[!meta title="Automated tests implementation details"]]
+
+For Jenkins resources, see [[blueprint/automated_builds_and_tests/resources]].
[[!toc levels=2]]
-Resources
-=========
-
-Miscellaneous
--------------
-
-- [Jenkins Best
- Practices](https://wiki.jenkins-ci.org/display/JENKINS/Jenkins+Best+Practices)
-- [plugins](https://wiki.jenkins-ci.org/display/JENKINS/Plugins)
- * [Git plugin](https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin)
- * [Copy Artifact
- plugin](https://wiki.jenkins-ci.org/display/JENKINS/Copy+Artifact+Plugin)
- can be used to run a test job against the result of a build job,
- e.g. for Debian packages (think Lintian) or Tails ISO images; see
- [grml's setup
- documentation](http://jenkins-debian-glue.org/getting_started/manual/)
- that uses it.
-- the [jenkins](http://jujucharms.com/charms/precise/jenkins) and
- [jenkins-slave](http://jujucharms.com/charms/precise/jenkins-slave)
- JuJu charms may be good sources of inspiration for deployment
-- [[!cpan Net-Jenkins]] (not in Debian) allows to interact with
- a Jenkins server: create and start jobs, get information about
- builds etc.
-
-Jobs management
----------------
-
-- [Job builder](http://ci.openstack.org/jenkins-job-builder/) provides
- one-way (Git to Jenkins) jobs synchronization; it's in Debian sid.
- * [configuration documentation](http://ci.openstack.org/jenkins-job-builder/configuration.html)
- * Debian uses it in their `update_jdn.sh`: it runs `jenkins-jobs
- update $config` after importing updated YAML job config files
- from Git.
- * Tor [use
- it](https://gitweb.torproject.org/project/jenkins/jobs.git/tree) too.
-- jenkins.debian.net uses the [SCM
- Sync](https://wiki.jenkins-ci.org/display/JENKINS/SCM+Sync+configuration+plugin)
- plugin, that apparently handles committing to the VCS on
- configuration changes done in the web interface, and maybe more.
-- [jenkins-yaml](https://github.com/varnish/jenkins-yaml) might make
- it easy to generate a large number of similar Jenkins jobs, e.g.
- one per branch
-- [jenkins_jobs puppet module](http://tradeshift.com/blog/tstech-managing-jenkins-job-configurations-by-puppet/)
-
-Web setup
----------
-
-### Visible read-only on the web
-
-We'd like our Jenkins instance to be visible read-only on the web.
-We'd rather not rely on Jenkins authentication / authorization to
-enforce this read-only policy. We'd rather see the frontend reverse
-proxy take care of this.
-
-The
-[`getUnprotectedRootActions()`](http://javadoc.jenkins-ci.org/jenkins/model/Jenkins.html#getUnprotectedRootActions())
-method should return the list of URL prefixes that we want to allow.
-And we could forbid anything else.
-
-The [Reverse Proxy
-Auth](https://wiki.jenkins-ci.org/display/JENKINS/Reverse+Proxy+Auth+Plugin)
-Jenkins plugin can be useful to display [an example
-usage](https://github.com/jenkinsci/reverse-proxy-auth-plugin/commit/72567a974960be2363107614ba3f705ec6e9b695)
-of this method.
-
-### Miscellaneous
-
-- [sample nginx configuration](https://wiki.jenkins-ci.org/display/JENKINS/Installing+Jenkins+on+Ubuntu)
-
-Notifications
--------------
-
-- [IRC plugin](https://wiki.jenkins-ci.org/display/JENKINS/IRC+Plugin),
- but I'm told that the jenkins email notifications are way nicer
- than what this plugin can do, so see [a better way to do
- it](http://jenkins.debian.net/userContent/setup.html#_installing_kgb_client)
-- [[!cpan Jenkins-NotificationListener]] is a server that listens to
- messages from Jenkins [Notification
- plugin](https://wiki.jenkins-ci.org/display/JENKINS/Notification+Plugin).
-
-### Notifying different people depending on what triggered the build
-
-At least the obvious candidate (Email-ext plugin) doesn't seem able to
-email different recipients depending on what triggered the build
-out-of-the-box. But apparently, one can set up two 'Script - After
-Build' email triggers in the Email-ext configuration: one emails the
-culprit, the other emails the RM. And then, they do something or not
-depending on a variable we set during the build, based on what
-triggered the build. Likely the cleaner and simpler solution.
-
-Otherwise, we could have Jenkins email some pipe script that will
-forward to the right person depending on 1. whether it's a base
-branch; and 2. whether the build was triggered by a push or by
-something else. This should work if we can get the email notification
-to pass the needed info in it. E.g. the full console output currently
-has "Started by timer" or "Started by an SCM change", but this is not
-part of the email notification. Could work, but a bit hackish and all
-kinds of things can go wrong.
-
-Also, I've seen lots of people documenting crazy similar things with
-some of these plugins: "Run Condition", "Conditional BuildStep",
-"Flexible Publish" and "Any Build step". But then it gets too
-complicated for me to dive into it right now.
-
-How others use Jenkins
-----------------------
-
-- jenkins.debian.net's:
- * [setup documentation](http://jenkins.debian.net/userContent/setup.html)
- * configuration: `git://git.debian.org/git/users/holger/jenkins.debian.net.git`
-- [Tor's jobs](https://gitweb.torproject.org/project/jenkins/jobs.git/blob/HEAD:/jobs.yaml)
-- [Ubuntu QA Jenkins instance](https://jenkins.qa.ubuntu.com/)
-- grml's Michael Prokop talks about autotesting in KVM during his
- [talk at DebConf
- 10](http://penta.debconf.org/dc10_schedule/events/547.en.html);
- they use Jenkins:
- * [Jenkins instance](http://jenkins.grml.org/)
- * [unittests](https://github.com/grml/grml-unittests)
- * [debian-glue Jenkins plugin](https://github.com/mika/jenkins-debian-glue)
- * [kantan](https://github.com/mika/kantan): simple test suite for
- autotesting using Grml and KVM
- * [Jenkins server setup documentation](https://github.com/grml/grml-server-setup/blob/master/jenkins.asciidoc)
-- [jenkinstool](http://git.gitano.org.uk/personal/liw/jenkinstool.git/)
- has the tools Lars Wirzenius uses to manage his CI (Python projects
- test suite, Debian packages, importing into reprepro, VM setup of
- all needed stuff); the whole thing is very ad-hoc but many bits
- could be used as inspiration sources.
-
-Jenkins for Perl projects
--------------------------
-
-* [a collection of links](https://wiki.jenkins-ci.org/display/JENKINS/Perl+Projects)
- on the Jenkins wiki
-* an overview of the available tools: [[!cpan Task::Jenkins]]
-* [a tutorial](https://logiclab.jira.com/wiki/display/OPEN/Continuous+Integration)
-* [another tutorial](http://alexandre-masselot.blogspot.com/2011/12/perl-hudson-continuous-testing.html)
-* use [[!cpan TAP::Formatter::JUnit]] (in Wheezy) rather than the Jenkins TAP plugin
-* use `prove --timer` to know how long each test takes
+Generating jobs
+===============
+
+We use code that lay in three different Git repositories to generate
+automatically the list of Jenkins jobs for branches that are active in
+the Tails main Git repo.
+
+The first brick is the Tails
+[[!tails_gitweb_repo pythonlib]], which extracts the list of
+active branches and output the needed informations. This list is parsed
+by the `generate_tails_iso_jobs` script run by a cronjob and deployed by
+our [[!tails_gitweb_repo puppet-tails]]
+`tails::jenkins::iso_jobs_generator` manifest.
+
+This script output yaml files compatible with
+[jenkins-job-builder](http://docs.openstack.org/infra/jenkins-job-builder).
+It creates one `project` for each active branches, which in turn uses
+three JJB `job templates` to create the three jobs for each branch: the
+ISO build one, and wrapper job that is used to start the ISO test jobs.
+
+This changes are pushed to our [[!tails_gitweb_repo jenkins-jobs]] git
+repo by the cronjob, and thanks to their automatic deployment in our
+`tails::jenkins::master` and `tails::gitolite::hooks::jenkins_jobs`
+manifests in our [[!tails_gitweb_repo puppet-tails]] repo, this new
+changes are applied automatically to our Jenkins instance.
Restarting slave VMs between jobs
----------------------------------
+=================================
This question is tracked in [[!tails_ticket 9486]].
-When we tackle [[!tails_ticket 5288]], if the test suite doesn't
+For [[!tails_ticket 5288]] to be robust enough, if the test suite doesn't
_always_ clean between itself properly (e.g. when tests simply hang
and timeout), we might want to restart `isotesterN.lizard` between
each each ISO testing job.
@@ -164,44 +53,35 @@ This was discussed at least there:
* <http://jenkins-ci.361315.n4.nabble.com/How-to-reboot-a-slave-during-a-build-td4628820.html>
* <https://stackoverflow.com/questions/5543413/reconfigure-and-reboot-a-hudson-jenkins-slave-as-part-of-a-build>
-That would maybe be the way to go, with 3 chained jobs:
+We achieve this VM reboot by using 3 chained jobs:
* First one is a wrapper and trigger 2 other jobs. It is executed on the
isotester the test job is supposed to be assigned to. It puts the
isotester in offline mode and starts the second job, blocking while
waiting for it to complete. This way this isotester is left reserved
- for the second job, and the isotester name can be passed as a build
+ while the second job run, and the isotester name can be passed as a build
parameter to the second job. This job is low prio so it waits for
other second and third type of jobs to be completed before starting its
own.
-* The second job is executed on the master (which has two build
+* The second job is executed on the master (which has 4 build
executors). This job ssh into the said isotester and issue the
- reboot. It waits a bit and put the node back online again. This jobs
- is higher prio so that it is not lagging behind other wrapper jobs in
- the queue.
+ reboot. It needs to wait a reasonable amount of time for the Jenkins
+ slave to be stopped by the shutdown process so that no jobs gets assigned
+ to this isotester meanwhile. Stoping this Jenkins slave daemon usually
+ takes a few seconds. During testing, 5 seconds proved to be enough of
+ a delay for that, and more would mean unnecessary lagging time. It then
+ put the node back online again. This job is higher prio so that it is
+ not lagging behind other wrapper jobs in the queue.
* The third job is the test job, run on the freshly started isotester.
This one is high prio too to get executed before any other wrapper
- jobs.
-
-Using some kind of queue sorting is necessary. Unfortunately, the
-[PrioritySorter
-plugin](https://wiki.jenkins-ci.org/display/JENKINS/Priority+Sorter+Plugin)
-is not well supported by the current version of JJB in Debian. We'll
-have to push upstream a fix, and meanwhile use the `raw` option trick in
-the yaml files (which itself isn't supported by JJB in Debian yet,
-hopefully the new one will leave the NEW queue soon).
-
-Another tested but non-working option was to use the Jenkins [PostBuildScript
-plugin](https://wiki.jenkins-ci.org/display/JENKINS/PostBuildScript%20Plugin)
-to issue a `shutdown -r` command at the end of the job. There are
-indications that [people are using it like
-this](https://stackoverflow.com/questions/11160363/execute-shell-script-after-post-build-in-jenkins)
-already. It's supported by JJB.
+ jobs. These jobs are set to run concurrently, so that if a first one is
+ already running, a more recent one triggered by a new build will still
+ be able to run and not be blocked by the first running one.
<a id="chain"></a>
Chaining jobs
--------------
+=============
There are several plugins that allow to chain jobs that we might use to
run the test suite job following a build job of a branch.
@@ -228,33 +108,11 @@ run the test suite job following a build job of a branch.
These are all supported by JJB v0.9+.
-One solution that could work and won't require more additionnal plugins
-to manage could be to make an extensive use of the EnvInject plugin in
-the same way we already use it to configure the notification. Then we
-would be able to simply use Jenkins' native way of chaining jobs:
-
- * At the beginning of the build job, a script (in our jenkins-tools
- repo) is collecting every necessary parameters defined in the
- automated test blueprin and outputing them in a file in the
- /build-artifacts/ directory.
- * This file is the one used by the build job, to setup the variables it
- needs (currently only $NOTIFY_TO).
- * At the end of the build job, this file is archived with the other
- artifacts.
- * At the beginning of the chained test job, this file is imported in
- the workspace along with the build artifacts. The EnvInject pre-build
- step uses it to setup the necessary variables.
-
-Where I'm not sure is that the Jenkins's native way can collaborate
-smoothly with the EnvInject plugin. Maybe the different steps we are
-talking about don't happen in an order that would fit this scenario.
-Might be that we'll have to use the ParameterizedTrigger plugin. Might
-also be that we don't need the EnvInject plugin in the test job, but
-just import the variables in the environment in the test suite wrapper
-script.
+As we'll have to pass some parameters, the ParameterizedTrigger plugin
+is the best candidate for us.
Passing parameters through jobs
--------------------------------
+===============================
We already specified what kind of informations we want to pass from the
build job to the test job.
@@ -262,14 +120,62 @@ build job to the test job.
The ParameterizedTiggerPlugin is the one usually used for that kind of
work.
-An other way that seem to be possible/used with the Jenkins native job
-chaining ability is to put the wanted parameters in a file that is
-archived with the artifacts of the upstream job. Then the downstream job
-can be configured with then EnvInject plugin we already use to set the
-necessary variables in the job environment.
+We'll use it for some basic parameter passing through jobs, but given
+the test jobs will need to know a lot of them from the build job, we'll
+also use the EnvInject plugin we're already using:
+
+ * In the build job, a script will collect every necessary parameters
+ defined in the automated test blueprint and outputing them in a file
+ in the /build-artifacts/ directory.
+ * This file is the one used by the build job, to setup the variables it
+ needs (currently only $NOTIFY_TO).
+ * At the end of the build job, this file is archived with the other
+ artifacts.
+ * At the beginning of the chained test job, this file is imported in
+ the workspace along with the build artifacts. The EnvInject pre-build
+ step uses it to setup the necessary variables.
+
+Define which $OLD_ISO to test against
+=====================================
+
+It appeared in [[!tails_ticket 10117]] that this question is not so
+obvious and easy to address.
+
+The most obvious answer would be to use the previous release for all the
+branches **but** feature/jessie, which would use the previously built
+ISO of the same branch.
+
+But in some occasions, an ISO can't be tested this way, because it
+contains changes that affects the "set up an old Tails", like changes in
+the Persistence Assistant, the Greeter, the Tails Installer or in
+syslinux.
+
+So we may need a way to encode in the Git repo that a given branch needs
+to use the same value than $ISO rather than the last release as $OLD_ISO.
+We could use the same kind of trick than for the APT_overlay feature:
+having a file in `config/ci.d/` that if present shows that this is the
+case. OTOH, we may need something a bit more complex than a simple
+boolean flag. So we may rather want to check the content of a file.
+
+But this brings concerns about the merge of the base branch in the
+feature branch and how to handle conflicts. Note that at testing time,
+we'll have to merge the base branch before we look at that config
+setting (because for some reason the base branch might itself require
+old ISO = same).
+
+Another option that could be considered, using existing code in the repo: use the
+`OLD_TAILS_ISO` flag present in `config/default.yml`: when we release we
+set its value to the released ISO, and for some branch that need it we
+empty this variable so that the test use the same ISO for both
+`--old-iso` and `--iso`.
+
+In the end, we will by default use the same ISO for both `--old-iso` and
+`--iso`, except for the branches used to prepare releases (`devel` and
+`stable`), so that we know if the upgrades are broken long before the
+next release.
Retrieving the ISOs for the test
---------------------------------
+================================
We'll need a way to retrieve the different ISO needed for the test.
@@ -284,4 +190,4 @@ For the last release ISO, we have several means:
vhost for the isotesters.
* Using the git-annex repo directly.
-The former is probably the most simple to use.
+We'll use the first one, as it's easier to implement.
diff --git a/wiki/src/blueprint/automated_builds_and_tests/resources.mdwn b/wiki/src/blueprint/automated_builds_and_tests/resources.mdwn
new file mode 100644
index 0000000..0368eb6
--- /dev/null
+++ b/wiki/src/blueprint/automated_builds_and_tests/resources.mdwn
@@ -0,0 +1,140 @@
+[[!meta title="Jenkins resources"]]
+
+[[!toc levels=2]]
+
+Miscellaneous
+=============
+
+- [Jenkins Best
+ Practices](https://wiki.jenkins-ci.org/display/JENKINS/Jenkins+Best+Practices)
+- [plugins](https://wiki.jenkins-ci.org/display/JENKINS/Plugins)
+ * [Git plugin](https://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin)
+ * [Copy Artifact
+ plugin](https://wiki.jenkins-ci.org/display/JENKINS/Copy+Artifact+Plugin)
+ can be used to run a test job against the result of a build job,
+ e.g. for Debian packages (think Lintian) or Tails ISO images; see
+ [grml's setup
+ documentation](http://jenkins-debian-glue.org/getting_started/manual/)
+ that uses it.
+- the [jenkins](http://jujucharms.com/charms/precise/jenkins) and
+ [jenkins-slave](http://jujucharms.com/charms/precise/jenkins-slave)
+ JuJu charms may be good sources of inspiration for deployment
+- [[!cpan Net-Jenkins]] (not in Debian) allows to interact with
+ a Jenkins server: create and start jobs, get information about
+ builds etc.
+
+Jobs management
+===============
+
+- [Job builder](http://ci.openstack.org/jenkins-job-builder/) provides
+ one-way (Git to Jenkins) jobs synchronization; it's in Debian sid.
+ * [configuration documentation](http://ci.openstack.org/jenkins-job-builder/configuration.html)
+ * Debian uses it in their `update_jdn.sh`: it runs `jenkins-jobs
+ update $config` after importing updated YAML job config files
+ from Git.
+ * Tor [use
+ it](https://gitweb.torproject.org/project/jenkins/jobs.git/tree) too.
+- jenkins.debian.net uses the [SCM
+ Sync](https://wiki.jenkins-ci.org/display/JENKINS/SCM+Sync+configuration+plugin)
+ plugin, that apparently handles committing to the VCS on
+ configuration changes done in the web interface, and maybe more.
+- [jenkins-yaml](https://github.com/varnish/jenkins-yaml) might make
+ it easy to generate a large number of similar Jenkins jobs, e.g.
+ one per branch
+- [jenkins_jobs puppet module](http://tradeshift.com/blog/tstech-managing-jenkins-job-configurations-by-puppet/)
+
+Web setup
+=========
+
+### Visible read-only on the web
+
+We'd like our Jenkins instance to be visible read-only on the web.
+We'd rather not rely on Jenkins authentication / authorization to
+enforce this read-only policy. We'd rather see the frontend reverse
+proxy take care of this.
+
+The
+[`getUnprotectedRootActions()`](http://javadoc.jenkins-ci.org/jenkins/model/Jenkins.html#getUnprotectedRootActions())
+method should return the list of URL prefixes that we want to allow.
+And we could forbid anything else.
+
+The [Reverse Proxy
+Auth](https://wiki.jenkins-ci.org/display/JENKINS/Reverse+Proxy+Auth+Plugin)
+Jenkins plugin can be useful to display [an example
+usage](https://github.com/jenkinsci/reverse-proxy-auth-plugin/commit/72567a974960be2363107614ba3f705ec6e9b695)
+of this method.
+
+### Miscellaneous
+
+- [sample nginx configuration](https://wiki.jenkins-ci.org/display/JENKINS/Installing+Jenkins+on+Ubuntu)
+
+Notifications
+=============
+
+- [IRC plugin](https://wiki.jenkins-ci.org/display/JENKINS/IRC+Plugin),
+ but I'm told that the jenkins email notifications are way nicer
+ than what this plugin can do, so see [a better way to do
+ it](http://jenkins.debian.net/userContent/setup.html#_installing_kgb_client)
+- [[!cpan Jenkins-NotificationListener]] is a server that listens to
+ messages from Jenkins [Notification
+ plugin](https://wiki.jenkins-ci.org/display/JENKINS/Notification+Plugin).
+
+### Notifying different people depending on what triggered the build
+
+At least the obvious candidate (Email-ext plugin) doesn't seem able to
+email different recipients depending on what triggered the build
+out-of-the-box. But apparently, one can set up two 'Script - After
+Build' email triggers in the Email-ext configuration: one emails the
+culprit, the other emails the RM. And then, they do something or not
+depending on a variable we set during the build, based on what
+triggered the build. Likely the cleaner and simpler solution.
+
+Otherwise, we could have Jenkins email some pipe script that will
+forward to the right person depending on 1. whether it's a base
+branch; and 2. whether the build was triggered by a push or by
+something else. This should work if we can get the email notification
+to pass the needed info in it. E.g. the full console output currently
+has "Started by timer" or "Started by an SCM change", but this is not
+part of the email notification. Could work, but a bit hackish and all
+kinds of things can go wrong.
+
+Also, I've seen lots of people documenting crazy similar things with
+some of these plugins: "Run Condition", "Conditional BuildStep",
+"Flexible Publish" and "Any Build step". But then it gets too
+complicated for me to dive into it right now.
+
+How others use Jenkins
+======================
+
+- jenkins.debian.net's:
+ * [setup documentation](http://jenkins.debian.net/userContent/setup.html)
+ * configuration: `git://git.debian.org/git/users/holger/jenkins.debian.net.git`
+- [Tor's jobs](https://gitweb.torproject.org/project/jenkins/jobs.git/blob/HEAD:/jobs.yaml)
+- [Ubuntu QA Jenkins instance](https://jenkins.qa.ubuntu.com/)
+- grml's Michael Prokop talks about autotesting in KVM during his
+ [talk at DebConf
+ 10](http://penta.debconf.org/dc10_schedule/events/547.en.html);
+ they use Jenkins:
+ * [Jenkins instance](http://jenkins.grml.org/)
+ * [unittests](https://github.com/grml/grml-unittests)
+ * [debian-glue Jenkins plugin](https://github.com/mika/jenkins-debian-glue)
+ * [kantan](https://github.com/mika/kantan): simple test suite for
+ autotesting using Grml and KVM
+ * [Jenkins server setup documentation](https://github.com/grml/grml-server-setup/blob/master/jenkins.asciidoc)
+- [jenkinstool](http://git.gitano.org.uk/personal/liw/jenkinstool.git/)
+ has the tools Lars Wirzenius uses to manage his CI (Python projects
+ test suite, Debian packages, importing into reprepro, VM setup of
+ all needed stuff); the whole thing is very ad-hoc but many bits
+ could be used as inspiration sources.
+
+Jenkins for Perl projects
+=========================
+
+* [a collection of links](https://wiki.jenkins-ci.org/display/JENKINS/Perl+Projects)
+ on the Jenkins wiki
+* an overview of the available tools: [[!cpan Task::Jenkins]]
+* [a tutorial](https://logiclab.jira.com/wiki/display/OPEN/Continuous+Integration)
+* [another tutorial](http://alexandre-masselot.blogspot.com/2011/12/perl-hudson-continuous-testing.html)
+* use [[!cpan TAP::Formatter::JUnit]] (in Wheezy) rather than the Jenkins TAP plugin
+* use `prove --timer` to know how long each test takes
+
diff --git a/wiki/src/blueprint/bootstrapping/assistant/infography/2nd_iteration/infography-sajolida-20150327.svg b/wiki/src/blueprint/bootstrapping/assistant/infography/2nd_iteration/infography-sajolida-20150327.svg
deleted file mode 100644
index d1787b2..0000000
--- a/wiki/src/blueprint/bootstrapping/assistant/infography/2nd_iteration/infography-sajolida-20150327.svg
+++ /dev/null
@@ -1,1095 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="646.42462"
- height="260.05408"
- id="svg3449"
- version="1.1"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="infography-sajolida-20150327.svg">
- <defs
- id="defs3451">
- <path
- id="path-1"
- d="M 5.8863643,3.0005748 C -0.13642709,3.0615313 -5,7.9627911 -5,14 -5,20.075132 -0.07513255,25 6,25 L 6,24 C 0.47715225,24 -4,19.522848 -4,14 -4,8.4963397 0.44609729,4.0311216 5.9424757,4.000162 L 4.2928932,5.6497444 5,6.3568512 7.8284271,3.5284241 5,0.69999695 4.2928932,1.4071037 5.8863643,3.0005748 z"
- inkscape:connector-curvature="0" />
- <path
- id="path-1-7"
- d="M 5.8863643,3.0005748 C -0.13642709,3.0615313 -5,7.9627911 -5,14 -5,20.075132 -0.07513255,25 6,25 L 6,24 C 0.47715225,24 -4,19.522848 -4,14 -4,8.4963397 0.44609729,4.0311216 5.9424757,4.000162 L 4.2928932,5.6497444 5,6.3568512 7.8284271,3.5284241 5,0.69999695 4.2928932,1.4071037 5.8863643,3.0005748 z"
- inkscape:connector-curvature="0" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.86220698"
- inkscape:cx="324.71886"
- inkscape:cy="163.19068"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1024"
- inkscape:window-height="681"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <metadata
- id="metadata3454">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-376.17182,-855.26956)">
- <g
- style="fill:#000000;fill-opacity:1"
- id="Captions-0"
- transform="matrix(0,-0.07092847,0.05562694,0.0458562,531.76326,893.17244)" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="Captions-7-1"
- transform="matrix(0.28457047,0,0,0.28457047,546.30591,859.79114)" />
- <g
- style="fill:#000000;fill-opacity:1"
- id="Your_Icon-4"
- transform="matrix(0.28457047,0,0,0.28457047,532.88171,906.69785)" />
- <text
- xml:space="preserve"
- style="font-size:9.06930542px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="517.85468"
- y="913.69794"
- id="text6902"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan6904"
- x="517.85468"
- y="913.69794" /></text>
- <g
- id="g14032"
- transform="matrix(0.50587079,0,0,0.50587079,543.02156,618.93655)">
- <path
- d="m 204.07369,567.04654 -30.0517,-0.14345 c -7.07099,-0.0338 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10"
- id="path4152-4-1-32" />
- <rect
- id="rect4154-4-7-9"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="470.59338"
- x="172.10887"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <g
- id="g13759">
- <g
- id="g4156-7-9-0"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1" />
- </g>
- </g>
- <path
- sodipodi:nodetypes="cscc"
- inkscape:connector-curvature="0"
- d="m 198.83483,485.78333 c 0.031,4.18563 -4.38849,6.53271 -9.31446,6.53271 -4.92401,0 -9.42093,-2.6759 -9.42948,-6.53271 2.01684,0 16.95283,0 18.74394,0 z"
- id="path4818-2-4-3-6-1-0-4"
- style="fill:#000000;fill-opacity:1" />
- </g>
- <g
- id="g14041"
- transform="matrix(0.50587079,0,0,0.50587079,542.00981,618.93655)">
- <path
- d="m 301.5747,566.4861 -30.0517,-0.14345 c -7.07099,-0.0338 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10"
- id="path4152-4-1" />
- <rect
- id="rect4154-4-7"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="469.56754"
- x="269.60611"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <path
- inkscape:connector-curvature="0"
- d="m 300.72986,549.73132 -28.18282,0 c -0.86313,0 -1.55809,-0.74461 -1.54731,-1.66072 l 0.21872,-18.56457 c 0.0135,-0.91525 0.71395,-1.65986 1.57709,-1.65986 l 3.54795,0 0,-5.80177 c 0.001,-6.22198 4.82143,-11.20417 10.64493,-11.20417 5.82216,0 10.49791,5.01611 10.44199,11.20417 l 0,5.80177 3.54795,0 c 0.86273,0 1.55768,0.74461 1.54704,1.65986 l -0.21872,18.56422 c -0.0135,0.91802 -0.71422,1.66107 -1.57682,1.66107 z M 292.4664,522.3761 c 0.0297,-3.27502 -2.44548,-5.92979 -5.5269,-5.92979 -3.08235,0 -5.60451,2.65477 -5.63403,5.92979 l 9.5e-4,5.47007 11.16133,0 -9.5e-4,-5.47007 z"
- id="path5189-4-8-1-2-2-0-5-7"
- style="fill:#ffffff;fill-opacity:1" />
- <g
- id="g13759-1"
- transform="translate(97.608432,0.232262)">
- <g
- id="g4156-7-9-0-4"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-9" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-1" />
- </g>
- </g>
- <path
- sodipodi:nodetypes="cscc"
- inkscape:connector-curvature="0"
- d="m 296.44325,486.01559 c 0.031,4.18563 -4.38849,6.53271 -9.31446,6.53271 -4.92401,0 -9.42093,-2.6759 -9.42948,-6.53271 2.01684,0 16.95283,0 18.74394,0 z"
- id="path4818-2-4-3-6-1-0-4-2"
- style="fill:#000000;fill-opacity:1" />
- </g>
- <g
- id="g14024"
- transform="matrix(0.50587079,0,0,0.50587079,542.00981,618.93655)">
- <path
- d="m 111.07874,568.33943 -30.0517,-0.14345 c -7.07098,-0.0338 -12.93534,-5.95437 -13.0482,-13.17337 l 0.41101,-55.24138 55.97864,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10"
- id="path4152-4-1-32-8" />
- <rect
- id="rect4154-4-7-9-8"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="472.33014"
- x="79.12117"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <g
- id="g13759-0"
- transform="translate(-92.994948,1.292888)">
- <g
- id="g4156-7-9-0-41"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-5" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-3" />
- </g>
- </g>
- </g>
- <g
- id="g22288"
- transform="matrix(0.50587079,0,0,0.50587079,411.49512,618.93655)">
- <path
- id="path4152-4-1-3"
- d="m 271.73055,566.76226 -30.0517,-0.14345 c -7.07099,-0.0338 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10" />
- <rect
- id="rect4154-4-7-7"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="469.98615"
- x="239.76363"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <text
- transform="matrix(0.01414842,-0.99989991,0.99989991,0.01414842,0,0)"
- sodipodi:linespacing="125%"
- id="text5311-7-6"
- y="277.49564"
- x="-556.10962"
- style="font-size:32.15980148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- xml:space="preserve"><tspan
- y="277.49564"
- x="-556.10962"
- id="tspan5313-5-2"
- sodipodi:role="line">ISO</tspan></text>
- <path
- sodipodi:nodetypes="cscc"
- inkscape:connector-curvature="0"
- d="m 266.57856,486.23883 c 0.031,4.18563 -4.38849,6.53271 -9.31446,6.53271 -4.92401,0 -9.42093,-2.6759 -9.42948,-6.53271 2.01684,0 16.95283,0 18.74394,0 z"
- id="path4818-2-4-3-6-1-0-4-2-4"
- style="fill:#000000;fill-opacity:1" />
- <g
- id="g13759-1-9"
- transform="translate(67.92871,0.39555892)">
- <g
- id="g4156-7-9-0-4-3"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-9-3" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-1-1" />
- </g>
- </g>
- </g>
- <g
- id="g14062"
- transform="matrix(0.50587079,0,0,0.50587079,493.44622,618.93655)">
- <g
- style="stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- transform="translate(92.05259,-38.571071)"
- id="g7473">
- <path
- inkscape:connector-curvature="0"
- d="m 371.15628,569.29509 2.04755,1.25278 c 0.34545,0 0.51979,-0.14275 0.51979,-0.42827 0,-0.18256 -0.0833,-0.43651 -0.24433,-0.76366 l -4.52384,-8.49722 -10.02592,0.24525 c -0.4484,0.021 -0.67214,0.25485 -0.67214,0.70279 0,0.10204 0.14229,0.24434 0.4278,0.42782 l 2.07867,1.25278 -2.20083,3.42251 c -0.61084,0.9787 -0.91648,1.78491 -0.91648,2.41587 0,0.57195 0.20224,1.21344 0.61084,1.92585 l 6.81618,11.88908 c -0.16336,-0.75314 -0.24434,-1.46692 -0.24434,-2.13998 0,-1.20016 0.37565,-2.3834 1.13015,-3.54513 l 5.1969,-8.16047 0,0 z"
- id="path7422"
- style="fill:#00e300;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- d="m 373.78493,562.3572 5.6238,-8.7109 c -2.10017,-4.78785 -4.33121,-7.1836 -6.69402,-7.1836 -1.42711,0 -2.38294,0.39853 -2.87206,1.19192 l -5.31953,8.49815 9.26181,6.20443 0,0 z"
- id="path7424"
- style="fill:#00e300;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- d="m 369.20024,585.95234 h 10.85044 V 574.67455 H 369.5974 c -1.2839,1.83341 -2.08919,3.07842 -2.41451,3.72907 -0.53077,1.03864 -0.79432,2.09971 -0.79432,3.1777 0,2.91508 0.93616,4.37102 2.81167,4.37102 l 0,0 z"
- id="path7426"
- style="fill:#00e300;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- d="m 391.54351,560.27853 4.82856,-8.13073 c 0.16243,-0.28414 0.24434,-0.58063 0.24434,-0.88582 0,-0.36696 -0.12217,-0.55044 -0.36604,-0.55044 0.0385,0 -0.12263,0.0614 -0.48913,0.18348 l -2.20084,1.00845 -2.01689,-4.00359 c -0.89772,-1.7927 -2.68996,-2.68996 -5.37992,-2.68996 H 373.6019 c 1.52778,0.46945 2.56643,0.92746 3.11686,1.37541 1.28436,1.01943 2.59799,2.93429 3.94275,5.74595 l 2.50693,5.25775 -1.86544,0.88674 c -0.18302,0.0824 -0.27453,0.24434 -0.27453,0.48867 0,0.30565 0.19262,0.48043 0.58063,0.51978 l 9.93441,0.79431 0,0 z"
- id="path7428"
- style="fill:#00e300;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- d="m 396.37162,584.2722 7.0303,-12.77628 c -1.03909,1.18278 -2.17017,1.97755 -3.3923,2.38432 -0.97824,0.32669 -2.37607,0.48912 -4.18844,0.48912 H 387.997 v -1.62065 c 0,-0.63097 -0.15328,-0.9476 -0.45892,-0.9476 -0.22466,0 -0.38847,0.0833 -0.48866,0.24479 l -4.95074,8.58875 5.13467,7.88639 c 0.38755,0.59116 0.72248,0.82497 1.00845,0.7019 0.28414,-0.081 0.42827,-0.23291 0.42827,-0.45756 v -2.69042 h 4.3399 c 1.58954,0 2.70963,-0.60031 3.36165,-1.80276 l 0,0 z"
- id="path7430"
- style="fill:#00e300;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- d="m 393.31561,572.74871 h 4.67712 c 1.11963,0 2.2809,-0.48868 3.48382,-1.46646 1.28389,-1.01852 1.92583,-2.09881 1.92583,-3.24086 0,-0.52802 -0.17478,-1.04825 -0.52024,-1.55843 l -5.56201,-8.49677 -9.56837,5.56386 5.56385,9.19866 0,0 z"
- id="path7432"
- style="fill:#00e300;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <path
- id="path4152-4-1-3-7"
- d="m 487.39455,564.90082 -30.0517,-0.14345 C 450.27186,564.72362 444.4075,558.803 444.29464,551.584 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10" />
- <rect
- id="rect4154-4-7-7-7"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="467.09534"
- x="455.41632"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <g
- id="g13759-1-9-0"
- transform="translate(283.46781,-1.604441)">
- <g
- id="g4156-7-9-0-4-3-8"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-9-3-6" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-1-1-4" />
- </g>
- </g>
- </g>
- <g
- id="g14077"
- transform="matrix(0.50587079,0,0,0.50587079,209.14683,618.93655)">
- <path
- id="path4152-4-1-3-1"
- d="m 575.4326,565.02572 -30.0517,-0.14345 c -7.07099,-0.0337 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10" />
- <rect
- id="rect4154-4-7-7-1"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="466.79996"
- x="543.45392"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <g
- id="g13759-1-9-0-2"
- transform="translate(372.4247,-1.4831207)">
- <g
- id="g4156-7-9-0-4-3-8-0"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-9-3-6-6" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-1-1-4-5" />
- </g>
- </g>
- </g>
- <g
- style="fill:#00ff00;display:inline"
- inkscape:label="emblem-important"
- transform="matrix(8.2887493,0,0,8.2887493,-2447.4609,-7185.4419)"
- id="g17779" />
- <path
- inkscape:connector-curvature="0"
- d="m 400.62439,1039.9422 a 1.7119602,1.7119602 0 0 0 -1.39083,1.7118 l 0,22.2533 a 1.7119602,1.7119602 0 0 0 1.71179,1.7117 l 17.1179,0 a 1.7119602,1.7119602 0 0 0 1.71178,-1.7117 l 0,-16.155 a 1.7119602,1.7119602 0 0 0 -0.48144,-1.2304 l -6.09825,-6.0982 a 1.7119602,1.7119602 0 0 0 -1.23034,-0.4815 l -11.01965,0 a 1.7119602,1.7119602 0 0 0 -0.16039,0 1.7119602,1.7119602 0 0 0 -0.1604,0 z m 2.03275,3.4236 8.55894,0 0,5.1354 5.13538,0 0,13.6943 -13.69432,0 0,-18.8297 z"
- id="path1234"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- <text
- xml:space="preserve"
- style="font-size:5.02514458px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="420.11722"
- y="1048.1885"
- id="text5311-7-6-4"
- sodipodi:linespacing="125%"
- transform="matrix(0.99989991,0.01414844,-0.01414844,0.99989991,0,0)"><tspan
- sodipodi:role="line"
- id="tspan5313-5-2-3"
- x="420.11722"
- y="1048.1885">ISO</tspan></text>
- <path
- inkscape:connector-curvature="0"
- d="m 418.61251,1055.5715 c -3.29755,0 -5.9628,2.6928 -5.9628,6.0128 0,3.3201 2.66525,6.0129 5.9628,6.0129 3.29746,0 5.98779,-2.6928 5.98779,-6.0129 0,-0.334 -0.0481,-0.6578 -0.10024,-0.977 l -5.52626,4.9507 -3.48163,-3.4832 1.82585,-1.7917 1.65655,1.7689 4.34799,-4.1756 c -1.09288,-1.406 -2.79942,-2.3049 -4.71005,-2.3049 z"
- id="path74"
- sodipodi:nodetypes="ssssccccccs"
- style="fill:#00aa00;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
- <path
- inkscape:connector-curvature="0"
- d="m 424.50006,1060.6073 -5.52626,4.9507 -3.48163,-3.4832 1.82585,-1.7917 1.65655,1.7689 4.34799,-4.1756 c 0.52397,0.733 1.01365,1.6371 1.1775,2.7309 z"
- id="path74-5"
- sodipodi:nodetypes="ccccccc"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
- <g
- transform="matrix(0.22673265,0,0,0.22673265,327.71856,1021.4365)"
- id="g18376-5">
- <path
- id="path3978-0"
- d="m 501.08191,278.17762 c -7.21715,-13.9489 -14.06128,-28.08879 -21.39661,-41.97333 -3.73599,-7.06836 -5.80633,-15.24365 -13.12689,-20.35459 5.41537,-4.7453 6.07435,-10.74843 6.06327,-17.14198 -0.0718,-40.55881 -0.13243,-81.11551 0.0216,-121.669045 0.0464,-11.512935 -7.81863,-19.188576 -19.08306,-19.140036 -63.10508,0.290184 -126.20384,0.299154 -189.30153,-0.0016 -11.65486,-0.0554 -19.31942,7.967409 -19.26244,19.332085 0.22951,40.914946 0.12187,81.826726 0.0644,122.740616 -0.0143,5.95194 1.03886,11.37153 5.43014,15.34917 -2.53569,3.52073 -5.24706,6.45898 -7.02036,9.88157 -8.41693,16.26246 -16.16379,32.89267 -24.97854,48.92404 -5.47288,9.93486 -5.58368,19.86866 -3.65316,30.40446 0.98135,5.3758 4.14067,8.83427 9.05112,10.53053 2.74356,0.95444 5.79841,1.40766 8.71397,1.40766 84.09755,0.0765 168.18824,0.0638 252.27841,0.0638 0.84206,0 1.67621,0.0164 2.51088,-0.0143 8.26287,-0.25747 13.97951,-4.80334 15.51959,-12.88418 0.77348,-4.06733 0.9096,-8.26868 1.13172,-12.41304 0.25009,-4.59916 -0.81357,-8.88281 -2.96252,-13.04194 z M 255.01081,77.482921 c 0,-7.736317 2.21332,-9.910589 10.09315,-9.910589 31.23914,-0.0016 62.48567,0 93.7322,0 31.24283,0 62.48567,-0.0016 93.72481,0 7.86558,0 10.10369,2.192211 10.10369,9.915865 0,41.026273 0,82.043573 0,123.068263 0,7.59808 -2.37054,9.92642 -10.11055,9.92642 -62.4862,0.002 -124.97187,0.002 -187.46123,0 -7.75057,0 -10.08207,-2.29985 -10.08207,-9.93223 0,-41.02627 0,-82.04884 0,-123.067729 z M 485.50534,295.0405 c -42.21391,0.0105 -84.4273,0.01 -126.63383,0.01 -41.97702,0 -83.95405,-0.15776 -125.9279,0.13084 -7.91887,0.0538 -11.71554,-5.06503 -7.81862,-12.52541 9.23736,-17.71075 18.06213,-35.63201 27.15651,-53.42453 2.99048,-5.85223 8.05868,-8.49713 14.56989,-8.49713 33.63185,0 67.25683,0 100.88129,0 27.42823,0 54.8496,0.0433 82.27783,-0.029 7.57171,-0.0153 12.76495,3.15246 16.17488,10.0235 8.69973,17.58095 17.67909,35.02526 26.51494,52.54132 3.52812,7.00399 0.6057,11.77093 -7.19499,11.77093 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- <path
- id="path3980-3"
- d="m 394.57369,260.00786 c -0.81674,-3.51387 -2.85806,-5.19378 -6.57611,-5.18217 -19.4413,0.0712 -38.87891,0.0681 -58.31651,0 -3.70381,-0.007 -5.77362,1.63453 -6.58297,5.16581 -1.27523,5.56046 -2.5647,11.11565 -3.91116,16.6587 -1.51845,6.2933 -0.19363,8.04391 6.35715,8.06026 11.08557,0.0238 22.17748,0.005 33.27043,0.005 11.44699,-0.003 22.89397,0.0507 34.34834,-0.029 5.07876,-0.0322 6.74441,-2.20751 5.61639,-7.00188 -1.38286,-5.89655 -2.83009,-11.78149 -4.20556,-17.67698 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- </g>
- <g
- id="g18446"
- transform="matrix(0.22673265,0,0,0.22673265,254.27277,1137.0465)">
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- id="path1234-9"
- d="m 644.83491,-667.25727 a 7.5505678,7.5505678 0 0 0 -6.13422,7.54981 l 0,98.14758 a 7.5505678,7.5505678 0 0 0 7.54981,7.54981 l 75.49814,0 a 7.5505678,7.5505678 0 0 0 7.54981,-7.54981 l 0,-71.25137 a 7.5505678,7.5505678 0 0 0 -2.12338,-5.42643 l -26.89621,-26.89621 a 7.5505678,7.5505678 0 0 0 -5.42643,-2.12338 l -48.60193,0 a 7.5505678,7.5505678 0 0 0 -0.70741,0 7.5505678,7.5505678 0 0 0 -0.70742,0 z m 8.96541,15.09963 37.74906,0 0,22.64943 22.64945,0 0,60.39851 -60.39851,0 0,-83.04794 z"
- inkscape:connector-curvature="0" />
- <text
- transform="matrix(0.99989991,0.01414844,-0.01414844,0.99989991,0,0)"
- sodipodi:linespacing="125%"
- id="text5311-7-6-4-5"
- y="-613.24182"
- x="656.78455"
- style="font-size:22.16330338px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- xml:space="preserve"><tspan
- y="-613.24182"
- x="656.78455"
- id="tspan5313-5-2-3-0"
- sodipodi:role="line">ISO</tspan></text>
- </g>
- <path
- inkscape:connector-curvature="0"
- d="m 409.58941,1031.7121 -9.4797,-9.4068 4.73985,0 0,-6.8545 9.40679,0 0,6.8545 4.73983,0 z"
- id="rect7040"
- style="fill:#00aa00;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new"
- sodipodi:nodetypes="cccccccc" />
- <g
- transform="matrix(0.22673265,0,0,0.22673265,480.96081,1020.7307)"
- id="g18376-2">
- <path
- id="path3978-8"
- d="m 501.08191,278.17762 c -7.21715,-13.9489 -14.06128,-28.08879 -21.39661,-41.97333 -3.73599,-7.06836 -5.80633,-15.24365 -13.12689,-20.35459 5.41537,-4.7453 6.07435,-10.74843 6.06327,-17.14198 -0.0718,-40.55881 -0.13243,-81.11551 0.0216,-121.669045 0.0464,-11.512935 -7.81863,-19.188576 -19.08306,-19.140036 -63.10508,0.290184 -126.20384,0.299154 -189.30153,-0.0016 -11.65486,-0.0554 -19.31942,7.967409 -19.26244,19.332085 0.22951,40.914946 0.12187,81.826726 0.0644,122.740616 -0.0143,5.95194 1.03886,11.37153 5.43014,15.34917 -2.53569,3.52073 -5.24706,6.45898 -7.02036,9.88157 -8.41693,16.26246 -16.16379,32.89267 -24.97854,48.92404 -5.47288,9.93486 -5.58368,19.86866 -3.65316,30.40446 0.98135,5.3758 4.14067,8.83427 9.05112,10.53053 2.74356,0.95444 5.79841,1.40766 8.71397,1.40766 84.09755,0.0765 168.18824,0.0638 252.27841,0.0638 0.84206,0 1.67621,0.0164 2.51088,-0.0143 8.26287,-0.25747 13.97951,-4.80334 15.51959,-12.88418 0.77348,-4.06733 0.9096,-8.26868 1.13172,-12.41304 0.25009,-4.59916 -0.81357,-8.88281 -2.96252,-13.04194 z M 255.01081,77.482921 c 0,-7.736317 2.21332,-9.910589 10.09315,-9.910589 31.23914,-0.0016 62.48567,0 93.7322,0 31.24283,0 62.48567,-0.0016 93.72481,0 7.86558,0 10.10369,2.192211 10.10369,9.915865 0,41.026273 0,82.043573 0,123.068263 0,7.59808 -2.37054,9.92642 -10.11055,9.92642 -62.4862,0.002 -124.97187,0.002 -187.46123,0 -7.75057,0 -10.08207,-2.29985 -10.08207,-9.93223 0,-41.02627 0,-82.04884 0,-123.067729 z M 485.50534,295.0405 c -42.21391,0.0105 -84.4273,0.01 -126.63383,0.01 -41.97702,0 -83.95405,-0.15776 -125.9279,0.13084 -7.91887,0.0538 -11.71554,-5.06503 -7.81862,-12.52541 9.23736,-17.71075 18.06213,-35.63201 27.15651,-53.42453 2.99048,-5.85223 8.05868,-8.49713 14.56989,-8.49713 33.63185,0 67.25683,0 100.88129,0 27.42823,0 54.8496,0.0433 82.27783,-0.029 7.57171,-0.0153 12.76495,3.15246 16.17488,10.0235 8.69973,17.58095 17.67909,35.02526 26.51494,52.54132 3.52812,7.00399 0.6057,11.77093 -7.19499,11.77093 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- <path
- id="path3980-4"
- d="m 394.57369,260.00786 c -0.81674,-3.51387 -2.85806,-5.19378 -6.57611,-5.18217 -19.4413,0.0712 -38.87891,0.0681 -58.31651,0 -3.70381,-0.007 -5.77362,1.63453 -6.58297,5.16581 -1.27523,5.56046 -2.5647,11.11565 -3.91116,16.6587 -1.51845,6.2933 -0.19363,8.04391 6.35715,8.06026 11.08557,0.0238 22.17748,0.005 33.27043,0.005 11.44699,-0.003 22.89397,0.0507 34.34834,-0.029 5.07876,-0.0322 6.74441,-2.20751 5.61639,-7.00188 -1.38286,-5.89655 -2.83009,-11.78149 -4.20556,-17.67698 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- </g>
- <path
- style="fill:none;stroke:#000000;stroke-width:0.94471931;stroke-miterlimit:10"
- inkscape:connector-curvature="0"
- stroke-miterlimit="10"
- d="m 510.25311,1070.7005 3.1821,-6.0251 c 0.74872,-1.4177 2.55406,-1.9751 4.01686,-1.2403 l 11.05996,5.8789 -5.9274,11.2233 -11.09118,-5.8199 c -1.43161,-0.7939 -1.97511,-2.5541 -1.24034,-4.0169 z"
- id="path4152-4-1-3-13" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:0.94471025;stroke-miterlimit:10"
- x="700.61798"
- y="-972.86499"
- transform="matrix(-0.4670074,0.88425341,-0.88425341,-0.4670074,0,0)"
- stroke-miterlimit="10"
- width="8.9275131"
- height="6.1406169"
- id="rect4154-4-7-7-2" />
- <g
- transform="matrix(-0.10492761,0.20099227,-0.20099227,-0.10492761,645.47288,1089.1654)"
- id="g13759-1-9-2">
- <g
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)"
- id="g4156-7-9-0-4-3-88">
- <line
- id="line4158-7-8-0-9-3-63"
- y2="13.948482"
- x2="39.013733"
- y1="12.348352"
- x1="40.6609"
- stroke-miterlimit="10"
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10" />
- <line
- id="line4160-1-9-1-1-1-1"
- y2="8.9484825"
- x2="34.013733"
- y1="7.3483534"
- x1="35.6609"
- stroke-miterlimit="10"
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10" />
- </g>
- </g>
- <path
- inkscape:connector-curvature="0"
- d="m 553.24865,1038.9575 a 1.7119602,1.7119602 0 0 0 -1.39085,1.7118 l 0,22.2533 a 1.7119602,1.7119602 0 0 0 1.71179,1.7118 l 17.1179,0 a 1.7119602,1.7119602 0 0 0 1.71179,-1.7118 l 0,-16.155 a 1.7119602,1.7119602 0 0 0 -0.48144,-1.2304 l -6.09825,-6.0982 a 1.7119602,1.7119602 0 0 0 -1.23034,-0.4815 l -11.01966,0 a 1.7119602,1.7119602 0 0 0 -0.16039,0 1.7119602,1.7119602 0 0 0 -0.16039,0 z m 2.03275,3.4236 8.55893,0 0,5.1354 5.13538,0 0,13.6943 -13.69431,0 0,-18.8297 z"
- id="path1234-1"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- <text
- xml:space="preserve"
- style="font-size:5.02514458px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="572.71222"
- y="1045.0447"
- id="text5311-7-6-4-9"
- sodipodi:linespacing="125%"
- transform="matrix(0.99989991,0.01414844,-0.01414844,0.99989991,0,0)"><tspan
- sodipodi:role="line"
- id="tspan5313-5-2-3-5"
- x="572.71222"
- y="1045.0447">ISO</tspan></text>
- <path
- inkscape:connector-curvature="0"
- d="m 571.23676,1054.5868 c -3.29756,0 -5.9628,2.6928 -5.9628,6.0129 0,3.32 2.66524,6.0128 5.9628,6.0128 3.29746,0 5.98778,-2.6928 5.98778,-6.0128 0,-0.334 -0.0481,-0.658 -0.10024,-0.9771 l -5.52627,4.9507 -3.48161,-3.4832 1.82585,-1.7917 1.65653,1.769 4.34801,-4.1757 c -1.09287,-1.406 -2.79942,-2.3049 -4.71005,-2.3049 z"
- id="path74-6"
- sodipodi:nodetypes="ssssccccccs"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
- <path
- inkscape:connector-curvature="0"
- d="m 577.1243,1059.6226 -5.52627,4.9507 -3.48161,-3.4832 1.82585,-1.7917 1.65653,1.769 4.34801,-4.1757 c 0.52396,0.733 1.01365,1.6371 1.17749,2.7309 z"
- id="path74-5-0"
- sodipodi:nodetypes="ccccccc"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
- <path
- inkscape:connector-curvature="0"
- d="m 525.00531,1059.8237 -1.55303,-5.4034 c -0.21428,-0.7455 -0.99252,-1.1762 -1.73806,-0.962 -0.7455,0.2143 -1.17626,0.9925 -0.96196,1.7381 l 2.48971,8.6622 0,0 c 0.0257,0.089 0.0606,0.1749 0.10289,0.2573 0.0174,0.033 0.0404,0.063 0.0598,0.094 0.0288,0.046 0.0552,0.093 0.0893,0.1361 0.0278,0.035 0.0605,0.063 0.0911,0.095 0.033,0.034 0.0632,0.071 0.10006,0.1019 0.0559,0.047 0.11711,0.087 0.17937,0.1242 0.0166,0.01 0.0298,0.023 0.047,0.032 0.0191,0.01 0.0396,0.015 0.0587,0.025 0.063,0.031 0.12644,0.062 0.1941,0.083 0.0487,0.016 0.0979,0.023 0.14731,0.033 0.0404,0.01 0.0795,0.021 0.1206,0.025 0.0585,0.01 0.11738,0 0.17576,0 0.0323,-3e-4 0.0651,0 0.0982,0 0.0937,-0.01 0.18601,-0.024 0.2759,-0.051 l 8.65995,-2.489 c 0.37274,-0.1072 0.66702,-0.3553 0.8411,-0.6699 0.17418,-0.3146 0.22798,-0.6954 0.12088,-1.0685 -0.21424,-0.7455 -0.99248,-1.1762 -1.7377,-0.9618 l -5.40309,1.5532 z"
- id="path6172-3"
- sodipodi:nodetypes="csssccccccccccccccccsscccc"
- style="fill:#00aa00;fill-opacity:1" />
- <path
- style="fill:#ff6600;stroke:#000000;stroke-width:0.22673266px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0"
- d="m 558.07917,1044.7351 -33.89653,17.5718"
- id="path22569"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#00aa00;stroke-width:3.40098977;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 525.16455,1062.4406 c 9.54411,-16.6032 15.85271,-26.2893 32.68788,-15.2114"
- id="path22571"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- <g
- transform="matrix(0.22673265,0,0,0.22673265,767.46682,1023.4135)"
- id="g18376-2-5">
- <path
- id="path3978-8-9"
- d="m 501.08191,278.17762 c -7.21715,-13.9489 -14.06128,-28.08879 -21.39661,-41.97333 -3.73599,-7.06836 -5.80633,-15.24365 -13.12689,-20.35459 5.41537,-4.7453 6.07435,-10.74843 6.06327,-17.14198 -0.0718,-40.55881 -0.13243,-81.11551 0.0216,-121.669045 0.0464,-11.512935 -7.81863,-19.188576 -19.08306,-19.140036 -63.10508,0.290184 -126.20384,0.299154 -189.30153,-0.0016 -11.65486,-0.0554 -19.31942,7.967409 -19.26244,19.332085 0.22951,40.914946 0.12187,81.826726 0.0644,122.740616 -0.0143,5.95194 1.03886,11.37153 5.43014,15.34917 -2.53569,3.52073 -5.24706,6.45898 -7.02036,9.88157 -8.41693,16.26246 -16.16379,32.89267 -24.97854,48.92404 -5.47288,9.93486 -5.58368,19.86866 -3.65316,30.40446 0.98135,5.3758 4.14067,8.83427 9.05112,10.53053 2.74356,0.95444 5.79841,1.40766 8.71397,1.40766 84.09755,0.0765 168.18824,0.0638 252.27841,0.0638 0.84206,0 1.67621,0.0164 2.51088,-0.0143 8.26287,-0.25747 13.97951,-4.80334 15.51959,-12.88418 0.77348,-4.06733 0.9096,-8.26868 1.13172,-12.41304 0.25009,-4.59916 -0.81357,-8.88281 -2.96252,-13.04194 z M 255.01081,77.482921 c 0,-7.736317 2.21332,-9.910589 10.09315,-9.910589 31.23914,-0.0016 62.48567,0 93.7322,0 31.24283,0 62.48567,-0.0016 93.72481,0 7.86558,0 10.10369,2.192211 10.10369,9.915865 0,41.026273 0,82.043573 0,123.068263 0,7.59808 -2.37054,9.92642 -10.11055,9.92642 -62.4862,0.002 -124.97187,0.002 -187.46123,0 -7.75057,0 -10.08207,-2.29985 -10.08207,-9.93223 0,-41.02627 0,-82.04884 0,-123.067729 z M 485.50534,295.0405 c -42.21391,0.0105 -84.4273,0.01 -126.63383,0.01 -41.97702,0 -83.95405,-0.15776 -125.9279,0.13084 -7.91887,0.0538 -11.71554,-5.06503 -7.81862,-12.52541 9.23736,-17.71075 18.06213,-35.63201 27.15651,-53.42453 2.99048,-5.85223 8.05868,-8.49713 14.56989,-8.49713 33.63185,0 67.25683,0 100.88129,0 27.42823,0 54.8496,0.0433 82.27783,-0.029 7.57171,-0.0153 12.76495,3.15246 16.17488,10.0235 8.69973,17.58095 17.67909,35.02526 26.51494,52.54132 3.52812,7.00399 0.6057,11.77093 -7.19499,11.77093 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- <path
- id="path3980-4-3"
- d="m 394.57369,260.00786 c -0.81674,-3.51387 -2.85806,-5.19378 -6.57611,-5.18217 -19.4413,0.0712 -38.87891,0.0681 -58.31651,0 -3.70381,-0.007 -5.77362,1.63453 -6.58297,5.16581 -1.27523,5.56046 -2.5647,11.11565 -3.91116,16.6587 -1.51845,6.2933 -0.19363,8.04391 6.35715,8.06026 11.08557,0.0238 22.17748,0.005 33.27043,0.005 11.44699,-0.003 22.89397,0.0507 34.34834,-0.029 5.07876,-0.0322 6.74441,-2.20751 5.61639,-7.00188 -1.38286,-5.89655 -2.83009,-11.78149 -4.20556,-17.67698 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- </g>
- <path
- style="fill:#ff6600;stroke:#000000;stroke-width:0.22673266px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0"
- d="m 844.58519,1047.4179 -33.89652,17.5717"
- id="path22569-4"
- inkscape:connector-curvature="0" />
- <g
- id="g14024-0"
- transform="matrix(-0.10510031,-0.20090201,0.20090201,-0.10510031,794.55332,1149.3104)">
- <path
- d="m 111.07874,568.33943 -30.0517,-0.14345 c -7.07098,-0.0338 -12.93534,-5.95437 -13.0482,-13.17337 l 0.41101,-55.24138 55.97864,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10"
- id="path4152-4-1-32-8-7" />
- <rect
- id="rect4154-4-7-9-8-4"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="472.33014"
- x="79.12117"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <g
- id="g13759-0-6"
- transform="translate(-92.994948,1.292888)">
- <g
- id="g4156-7-9-0-41-3"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-5-6" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-3-0" />
- </g>
- </g>
- </g>
- <g
- transform="matrix(-0.11080185,0.19781467,-0.19781467,-0.11080185,940.10468,1081.3902)"
- id="g22288-2">
- <path
- id="path4152-4-1-3-79"
- d="m 271.73055,566.76226 -30.0517,-0.14345 c -7.07099,-0.0338 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10" />
- <rect
- id="rect4154-4-7-7-25"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="469.98615"
- x="239.76363"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <text
- transform="matrix(0.01414842,-0.99989991,0.99989991,0.01414842,0,0)"
- sodipodi:linespacing="125%"
- id="text5311-7-6-8"
- y="277.49564"
- x="-556.10962"
- style="font-size:32.15980148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- xml:space="preserve"><tspan
- y="277.49564"
- x="-556.10962"
- id="tspan5313-5-2-7"
- sodipodi:role="line">ISO</tspan></text>
- <path
- sodipodi:nodetypes="cscc"
- inkscape:connector-curvature="0"
- d="m 266.57856,486.23883 c 0.031,4.18563 -4.38849,6.53271 -9.31446,6.53271 -4.92401,0 -9.42093,-2.6759 -9.42948,-6.53271 2.01684,0 16.95283,0 18.74394,0 z"
- id="path4818-2-4-3-6-1-0-4-2-4-6"
- style="fill:#000000;fill-opacity:1" />
- <g
- id="g13759-1-9-3"
- transform="translate(67.92871,0.39555892)">
- <g
- id="g4156-7-9-0-4-3-6"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-9-3-8" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-1-1-3" />
- </g>
- </g>
- </g>
- <path
- inkscape:connector-curvature="0"
- d="m 899.11604,1085.4203 6.53454,2.4382 c 0.90159,0.3364 1.90534,-0.1219 2.24172,-1.0235 0.33643,-0.9016 -0.12192,-1.9054 -1.02346,-2.2418 l -10.47564,-3.9086 0,0 c -0.10745,-0.04 -0.21901,-0.069 -0.33247,-0.087 -0.0464,-0.01 -0.0922,-0.01 -0.138,-0.01 -0.067,-0.01 -0.13361,-0.014 -0.2016,-0.011 -0.055,0 -0.1077,0.014 -0.16191,0.021 -0.0585,0.01 -0.11713,0.011 -0.17545,0.024 -0.0882,0.021 -0.17271,0.053 -0.25621,0.087 -0.022,0.01 -0.045,0.013 -0.0671,0.023 -0.0249,0.011 -0.0445,0.028 -0.0685,0.04 -0.0776,0.04 -0.15472,0.081 -0.22595,0.1324 -0.0515,0.037 -0.0946,0.081 -0.14118,0.1229 -0.0381,0.034 -0.0789,0.064 -0.11395,0.1018 -0.0499,0.053 -0.0914,0.1135 -0.13336,0.1725 -0.0235,0.032 -0.0516,0.062 -0.0735,0.097 -0.0616,0.099 -0.11317,0.2034 -0.15335,0.3124 l -3.90752,10.4727 c -0.16817,0.4509 -0.13786,0.9274 0.0474,1.3332 0.18517,0.4058 0.52526,0.7404 0.97637,0.9089 0.90154,0.3364 1.90534,-0.1219 2.24138,-1.0233 l 2.43774,-6.5343 z"
- id="path6172-3-1"
- sodipodi:nodetypes="csssccccccccccccccccsscccc"
- style="fill:#00aa00;fill-opacity:1" />
- <path
- style="fill:none;stroke:#00aa00;stroke-width:3.40098977;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 895.89354,1083.8468 c 24.7634,42.0036 -93.33751,37.5591 -91.21859,-0.7267"
- id="path22571-4"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- <text
- xml:space="preserve"
- style="font-size:9.06930542px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="760.54181"
- y="767.6051"
- id="text24183"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan24185"
- x="760.54181"
- y="767.6051" /></text>
- <g
- id="g24139-6"
- transform="matrix(0.22673265,0,0,0.22673265,412.54863,1077.8342)">
- <g
- id="g18376-2-5-2"
- transform="translate(1556.6223,-573.3313)">
- <path
- style="fill:#000000;fill-rule:evenodd"
- inkscape:connector-curvature="0"
- clip-rule="evenodd"
- d="m 501.08191,278.17762 c -7.21715,-13.9489 -14.06128,-28.08879 -21.39661,-41.97333 -3.73599,-7.06836 -5.80633,-15.24365 -13.12689,-20.35459 5.41537,-4.7453 6.07435,-10.74843 6.06327,-17.14198 -0.0718,-40.55881 -0.13243,-81.11551 0.0216,-121.669045 0.0464,-11.512935 -7.81863,-19.188576 -19.08306,-19.140036 -63.10508,0.290184 -126.20384,0.299154 -189.30153,-0.0016 -11.65486,-0.0554 -19.31942,7.967409 -19.26244,19.332085 0.22951,40.914946 0.12187,81.826726 0.0644,122.740616 -0.0143,5.95194 1.03886,11.37153 5.43014,15.34917 -2.53569,3.52073 -5.24706,6.45898 -7.02036,9.88157 -8.41693,16.26246 -16.16379,32.89267 -24.97854,48.92404 -5.47288,9.93486 -5.58368,19.86866 -3.65316,30.40446 0.98135,5.3758 4.14067,8.83427 9.05112,10.53053 2.74356,0.95444 5.79841,1.40766 8.71397,1.40766 84.09755,0.0765 168.18824,0.0638 252.27841,0.0638 0.84206,0 1.67621,0.0164 2.51088,-0.0143 8.26287,-0.25747 13.97951,-4.80334 15.51959,-12.88418 0.77348,-4.06733 0.9096,-8.26868 1.13172,-12.41304 0.25009,-4.59916 -0.81357,-8.88281 -2.96252,-13.04194 z M 255.01081,77.482921 c 0,-7.736317 2.21332,-9.910589 10.09315,-9.910589 31.23914,-0.0016 62.48567,0 93.7322,0 31.24283,0 62.48567,-0.0016 93.72481,0 7.86558,0 10.10369,2.192211 10.10369,9.915865 0,41.026273 0,82.043573 0,123.068263 0,7.59808 -2.37054,9.92642 -10.11055,9.92642 -62.4862,0.002 -124.97187,0.002 -187.46123,0 -7.75057,0 -10.08207,-2.29985 -10.08207,-9.93223 0,-41.02627 0,-82.04884 0,-123.067729 z M 485.50534,295.0405 c -42.21391,0.0105 -84.4273,0.01 -126.63383,0.01 -41.97702,0 -83.95405,-0.15776 -125.9279,0.13084 -7.91887,0.0538 -11.71554,-5.06503 -7.81862,-12.52541 9.23736,-17.71075 18.06213,-35.63201 27.15651,-53.42453 2.99048,-5.85223 8.05868,-8.49713 14.56989,-8.49713 33.63185,0 67.25683,0 100.88129,0 27.42823,0 54.8496,0.0433 82.27783,-0.029 7.57171,-0.0153 12.76495,3.15246 16.17488,10.0235 8.69973,17.58095 17.67909,35.02526 26.51494,52.54132 3.52812,7.00399 0.6057,11.77093 -7.19499,11.77093 z"
- id="path3978-8-9-1" />
- <path
- style="fill:#000000;fill-rule:evenodd"
- inkscape:connector-curvature="0"
- clip-rule="evenodd"
- d="m 394.57369,260.00786 c -0.81674,-3.51387 -2.85806,-5.19378 -6.57611,-5.18217 -19.4413,0.0712 -38.87891,0.0681 -58.31651,0 -3.70381,-0.007 -5.77362,1.63453 -6.58297,5.16581 -1.27523,5.56046 -2.5647,11.11565 -3.91116,16.6587 -1.51845,6.2933 -0.19363,8.04391 6.35715,8.06026 11.08557,0.0238 22.17748,0.005 33.27043,0.005 11.44699,-0.003 22.89397,0.0507 34.34834,-0.029 5.07876,-0.0322 6.74441,-2.20751 5.61639,-7.00188 -1.38286,-5.89655 -2.83009,-11.78149 -4.20556,-17.67698 z"
- id="path3980-4-3-9" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path22569-4-9"
- d="m 1896.7513,-467.46056 -149.5,77.5"
- style="fill:#ff6600;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0" />
- <g
- transform="matrix(-0.4635429,-0.88607448,0.88607448,-0.4635429,1676.0867,-18.065512)"
- id="g14024-0-6">
- <path
- id="path4152-4-1-32-8-7-0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10"
- inkscape:connector-curvature="0"
- stroke-miterlimit="10"
- d="m 111.07874,568.33943 -30.0517,-0.14345 c -7.07098,-0.0338 -12.93534,-5.95437 -13.0482,-13.17337 l 0.41101,-55.24138 55.97864,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10"
- x="79.12117"
- y="472.33014"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- stroke-miterlimit="10"
- width="39.374622"
- height="27.083073"
- id="rect4154-4-7-9-8-4-5" />
- <g
- transform="translate(-92.994948,1.292888)"
- id="g13759-0-6-0">
- <g
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)"
- id="g4156-7-9-0-41-3-6">
- <line
- id="line4158-7-8-0-5-6-5"
- y2="13.948482"
- x2="39.013733"
- y1="12.348352"
- x1="40.6609"
- stroke-miterlimit="10"
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10" />
- <line
- id="line4160-1-9-1-3-0-8"
- y2="8.9484825"
- x2="34.013733"
- y1="7.3483534"
- x1="35.6609"
- stroke-miterlimit="10"
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10" />
- </g>
- </g>
- </g>
- <g
- id="g22288-2-3"
- transform="matrix(-0.48868944,0.87245781,-0.87245781,-0.48868944,2318.0382,-317.6264)">
- <path
- style="fill:none;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10"
- inkscape:connector-curvature="0"
- stroke-miterlimit="10"
- d="m 271.73055,566.76226 -30.0517,-0.14345 c -7.07099,-0.0338 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- id="path4152-4-1-3-79-1" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10"
- x="239.76363"
- y="469.98615"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- stroke-miterlimit="10"
- width="39.374622"
- height="27.083073"
- id="rect4154-4-7-7-25-3" />
- <text
- xml:space="preserve"
- style="font-size:32.15980148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="-556.10962"
- y="277.49564"
- id="text5311-7-6-8-1"
- sodipodi:linespacing="125%"
- transform="matrix(0.01414842,-0.99989991,0.99989991,0.01414842,0,0)"><tspan
- sodipodi:role="line"
- id="tspan5313-5-2-7-3"
- x="-556.10962"
- y="277.49564">ISO</tspan></text>
- <path
- style="fill:#000000;fill-opacity:1"
- id="path4818-2-4-3-6-1-0-4-2-4-6-5"
- d="m 266.57856,486.23883 c 0.031,4.18563 -4.38849,6.53271 -9.31446,6.53271 -4.92401,0 -9.42093,-2.6759 -9.42948,-6.53271 2.01684,0 16.95283,0 18.74394,0 z"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscc" />
- <g
- transform="translate(67.92871,0.39555892)"
- id="g13759-1-9-3-8">
- <g
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)"
- id="g4156-7-9-0-4-3-6-2">
- <line
- id="line4158-7-8-0-9-3-8-9"
- y2="13.948482"
- x2="39.013733"
- y1="12.348352"
- x1="40.6609"
- stroke-miterlimit="10"
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10" />
- <line
- id="line4160-1-9-1-1-1-3-6"
- y2="8.9484825"
- x2="34.013733"
- y1="7.3483534"
- x1="35.6609"
- stroke-miterlimit="10"
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10" />
- </g>
- </g>
- </g>
- </g>
- <path
- inkscape:connector-curvature="0"
- d="m 882.49189,987.91532 -5.02278,-1.57042 c -0.693,-0.2167 -1.43062,0.16956 -1.64723,0.86257 -0.21681,0.69297 0.16953,1.4306 0.86252,1.64725 l 8.05213,2.51759 0,0 c 0.0826,0.0256 0.16783,0.0427 0.25401,0.0521 0.0352,0.003 0.0697,4.9e-4 0.10437,0.001 0.0507,10e-4 0.10124,0.005 0.15237,2.2e-4 0.0416,-0.004 0.0806,-0.0147 0.12114,-0.0222 0.044,-0.008 0.0878,-0.0129 0.13121,-0.0256 0.0656,-0.0195 0.12793,-0.0469 0.18948,-0.0762 0.0161,-0.008 0.0332,-0.0116 0.0496,-0.02 0.0181,-0.009 0.0327,-0.0228 0.05,-0.0328 0.0569,-0.0331 0.11326,-0.0671 0.16484,-0.10894 0.0376,-0.0299 0.068,-0.0649 0.10133,-0.0983 0.0274,-0.0274 0.0569,-0.0516 0.0817,-0.0813 0.0357,-0.0422 0.064,-0.0893 0.0935,-0.13541 0.0166,-0.0253 0.0362,-0.049 0.0512,-0.0763 0.042,-0.0772 0.0769,-0.15785 0.1029,-0.24156 l 2.51689,-8.04994 c 0.10838,-0.34649 0.066,-0.7043 -0.09,-1.00249 -0.15599,-0.29818 -0.42588,-0.53644 -0.77267,-0.64495 -0.69295,-0.21672 -1.43057,0.16952 -1.64693,0.86236 l -1.57019,5.02262 z"
- id="path6172-3-1-2"
- sodipodi:nodetypes="csssccccccccccccccccsscccc"
- style="fill:#00aa00;fill-opacity:1" />
- <path
- style="fill:none;stroke:#00aa00;stroke-width:3.40098977;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 884.33685,988.60395 c -7.31333,-6.38658 0.0347,-58.38708 -33.1102,-13.72065"
- id="path22571-4-7"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- <text
- xml:space="preserve"
- style="font-size:9.06930542px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="837.26477"
- y="983.53394"
- id="text24274"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan24276"
- x="837.26477"
- y="983.53394">Tails</tspan></text>
- <g
- id="g24462"
- transform="matrix(0.05534768,0,0,0.05534768,559.71708,1037.1234)">
- <g
- transform="translate(844.34482,-9.2785145)"
- id="g24392">
- <path
- id="path4597"
- d="m 2016.5308,231.207 c 0.9912,-0.42169 1.9551,-0.9074 2.8839,-1.453 5.1896,-2.45892 9.4836,-6.75908 11.9352,-11.95214 2.4514,-5.19301 3.0424,-11.24128 1.6425,-16.81073 l -9.3191,-41.25679 30.95,-40.71681 35.1446,-7.93862 c 6.4002,-1.44637 12.1657,-5.51824 15.6692,-11.06617 3.5035,-5.548123 4.7018,-12.503976 3.2568,-18.904567 -0.2061,-1.819583 -0.6114,-3.616612 -1.2079,-5.348077 l -4.3145,-19.100397 -20.6283,4.659507 -3.8201,0.862787 -97.7938,22.089739 -24.4483,5.522418 5.5225,24.44845 22.0897,97.79359 c 0.1947,1.55668 0.5478,3.093 1.0354,4.58422 l 4.487,19.86426 19.8643,-4.48696 c 2.3711,0.0718 4.7522,-0.19519 7.0484,-0.79045 z"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccsccccscccccccccccccc" />
- <path
- inkscape:connector-curvature="0"
- d="m 1811.1482,84.604931 a 32.652676,32.660298 0 0 0 -11.3666,4.37325 c -34.4001,19.907029 -63.0697,47.868959 -83.073,82.216229 -63.3309,108.74698 -26.5242,249.77362 82.1979,313.12086 108.7222,63.34758 249.7155,26.53074 313.0464,-82.21623 63.3342,-108.74665 26.5275,-249.77329 -82.1946,-313.120859 a 32.919987,32.92767 0 1 0 -33.2312,56.851539 c 78.2306,45.57997 104.1572,144.78698 58.5896,223.03324 -45.5708,78.24626 -144.7549,104.18075 -222.9823,58.60077 -77.8909,-45.38438 -104.2225,-144.06829 -59.4615,-222.15846 l 0.8817,-0.87511 c 14.289,-24.53497 34.8899,-45.2554 59.4615,-59.47522 a 32.652676,32.660298 0 0 0 -21.8613,-60.350329 z"
- id="path3869-2"
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.333606;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
- </g>
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
- id="path4710"
- d="m 2751.5327,16.142457 a 32.656485,32.656485 0 0 0 -25.5087,32.65322 l 0,163.266103 a 32.656485,32.656485 0 1 0 65.3064,0 l 0,-163.266103 a 32.656485,32.656485 0 0 0 -39.7977,-32.65322 z"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="matrix(0.22673265,0,0,0.22673265,629.93163,1021.1351)"
- id="g18376-2-2">
- <path
- id="path3978-8-8"
- d="m 501.08191,278.17762 c -7.21715,-13.9489 -14.06128,-28.08879 -21.39661,-41.97333 -3.73599,-7.06836 -5.80633,-15.24365 -13.12689,-20.35459 5.41537,-4.7453 6.07435,-10.74843 6.06327,-17.14198 -0.0718,-40.55881 -0.13243,-81.11551 0.0216,-121.669045 0.0464,-11.512935 -7.81863,-19.188576 -19.08306,-19.140036 -63.10508,0.290184 -126.20384,0.299154 -189.30153,-0.0016 -11.65486,-0.0554 -19.31942,7.967409 -19.26244,19.332085 0.22951,40.914946 0.12187,81.826726 0.0644,122.740616 -0.0143,5.95194 1.03886,11.37153 5.43014,15.34917 -2.53569,3.52073 -5.24706,6.45898 -7.02036,9.88157 -8.41693,16.26246 -16.16379,32.89267 -24.97854,48.92404 -5.47288,9.93486 -5.58368,19.86866 -3.65316,30.40446 0.98135,5.3758 4.14067,8.83427 9.05112,10.53053 2.74356,0.95444 5.79841,1.40766 8.71397,1.40766 84.09755,0.0765 168.18824,0.0638 252.27841,0.0638 0.84206,0 1.67621,0.0164 2.51088,-0.0143 8.26287,-0.25747 13.97951,-4.80334 15.51959,-12.88418 0.77348,-4.06733 0.9096,-8.26868 1.13172,-12.41304 0.25009,-4.59916 -0.81357,-8.88281 -2.96252,-13.04194 z M 255.01081,77.482921 c 0,-7.736317 2.21332,-9.910589 10.09315,-9.910589 31.23914,-0.0016 62.48567,0 93.7322,0 31.24283,0 62.48567,-0.0016 93.72481,0 7.86558,0 10.10369,2.192211 10.10369,9.915865 0,41.026273 0,82.043573 0,123.068263 0,7.59808 -2.37054,9.92642 -10.11055,9.92642 -62.4862,0.002 -124.97187,0.002 -187.46123,0 -7.75057,0 -10.08207,-2.29985 -10.08207,-9.93223 0,-41.02627 0,-82.04884 0,-123.067729 z M 485.50534,295.0405 c -42.21391,0.0105 -84.4273,0.01 -126.63383,0.01 -41.97702,0 -83.95405,-0.15776 -125.9279,0.13084 -7.91887,0.0538 -11.71554,-5.06503 -7.81862,-12.52541 9.23736,-17.71075 18.06213,-35.63201 27.15651,-53.42453 2.99048,-5.85223 8.05868,-8.49713 14.56989,-8.49713 33.63185,0 67.25683,0 100.88129,0 27.42823,0 54.8496,0.0433 82.27783,-0.029 7.57171,-0.0153 12.76495,3.15246 16.17488,10.0235 8.69973,17.58095 17.67909,35.02526 26.51494,52.54132 3.52812,7.00399 0.6057,11.77093 -7.19499,11.77093 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- <path
- id="path3980-4-5"
- d="m 394.57369,260.00786 c -0.81674,-3.51387 -2.85806,-5.19378 -6.57611,-5.18217 -19.4413,0.0712 -38.87891,0.0681 -58.31651,0 -3.70381,-0.007 -5.77362,1.63453 -6.58297,5.16581 -1.27523,5.56046 -2.5647,11.11565 -3.91116,16.6587 -1.51845,6.2933 -0.19363,8.04391 6.35715,8.06026 11.08557,0.0238 22.17748,0.005 33.27043,0.005 11.44699,-0.003 22.89397,0.0507 34.34834,-0.029 5.07876,-0.0322 6.74441,-2.20751 5.61639,-7.00188 -1.38286,-5.89655 -2.83009,-11.78149 -4.20556,-17.67698 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- </g>
- <path
- style="fill:#ff6600;stroke:#000000;stroke-width:0.22673266px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0"
- d="m 707.04998,1045.1395 -33.89651,17.5717"
- id="path22569-8"
- inkscape:connector-curvature="0" />
- <g
- transform="matrix(-0.11080185,0.19781467,-0.19781467,-0.11080185,802.61826,1078.8522)"
- id="g22288-2-9">
- <path
- id="path4152-4-1-3-79-8"
- d="m 271.73055,566.76226 -30.0517,-0.14345 c -7.07099,-0.0338 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10" />
- <rect
- id="rect4154-4-7-7-25-2"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="469.98615"
- x="239.76363"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <text
- transform="matrix(0.01414842,-0.99989991,0.99989991,0.01414842,0,0)"
- sodipodi:linespacing="125%"
- id="text5311-7-6-8-2"
- y="277.49564"
- x="-556.10962"
- style="font-size:32.15980148px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- xml:space="preserve"><tspan
- y="277.49564"
- x="-556.10962"
- id="tspan5313-5-2-7-34"
- sodipodi:role="line">ISO</tspan></text>
- <path
- sodipodi:nodetypes="cscc"
- inkscape:connector-curvature="0"
- d="m 266.57856,486.23883 c 0.031,4.18563 -4.38849,6.53271 -9.31446,6.53271 -4.92401,0 -9.42093,-2.6759 -9.42948,-6.53271 2.01684,0 16.95283,0 18.74394,0 z"
- id="path4818-2-4-3-6-1-0-4-2-4-6-7"
- style="fill:#000000;fill-opacity:1" />
- <g
- id="g13759-1-9-3-1"
- transform="translate(67.92871,0.39555892)">
- <g
- id="g4156-7-9-0-4-3-6-29"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-9-3-8-0" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-1-1-3-8" />
- </g>
- </g>
- </g>
- <text
- xml:space="preserve"
- style="font-size:9.06930542px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="837.55408"
- y="1056.5741"
- id="text24274-5"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan24276-4"
- x="837.55408"
- y="1056.5741">Tails</tspan></text>
- <g
- transform="matrix(0.22673265,0,0,0.22673265,889.50898,1021.9329)"
- id="g18376-2-5-13">
- <path
- id="path3978-8-9-0"
- d="m 501.08191,278.17762 c -7.21715,-13.9489 -14.06128,-28.08879 -21.39661,-41.97333 -3.73599,-7.06836 -5.80633,-15.24365 -13.12689,-20.35459 5.41537,-4.7453 6.07435,-10.74843 6.06327,-17.14198 -0.0718,-40.55881 -0.13243,-81.11551 0.0216,-121.669045 0.0464,-11.512935 -7.81863,-19.188576 -19.08306,-19.140036 -63.10508,0.290184 -126.20384,0.299154 -189.30153,-0.0016 -11.65486,-0.0554 -19.31942,7.967409 -19.26244,19.332085 0.22951,40.914946 0.12187,81.826726 0.0644,122.740616 -0.0143,5.95194 1.03886,11.37153 5.43014,15.34917 -2.53569,3.52073 -5.24706,6.45898 -7.02036,9.88157 -8.41693,16.26246 -16.16379,32.89267 -24.97854,48.92404 -5.47288,9.93486 -5.58368,19.86866 -3.65316,30.40446 0.98135,5.3758 4.14067,8.83427 9.05112,10.53053 2.74356,0.95444 5.79841,1.40766 8.71397,1.40766 84.09755,0.0765 168.18824,0.0638 252.27841,0.0638 0.84206,0 1.67621,0.0164 2.51088,-0.0143 8.26287,-0.25747 13.97951,-4.80334 15.51959,-12.88418 0.77348,-4.06733 0.9096,-8.26868 1.13172,-12.41304 0.25009,-4.59916 -0.81357,-8.88281 -2.96252,-13.04194 z M 255.01081,77.482921 c 0,-7.736317 2.21332,-9.910589 10.09315,-9.910589 31.23914,-0.0016 62.48567,0 93.7322,0 31.24283,0 62.48567,-0.0016 93.72481,0 7.86558,0 10.10369,2.192211 10.10369,9.915865 0,41.026273 0,82.043573 0,123.068263 0,7.59808 -2.37054,9.92642 -10.11055,9.92642 -62.4862,0.002 -124.97187,0.002 -187.46123,0 -7.75057,0 -10.08207,-2.29985 -10.08207,-9.93223 0,-41.02627 0,-82.04884 0,-123.067729 z M 485.50534,295.0405 c -42.21391,0.0105 -84.4273,0.01 -126.63383,0.01 -41.97702,0 -83.95405,-0.15776 -125.9279,0.13084 -7.91887,0.0538 -11.71554,-5.06503 -7.81862,-12.52541 9.23736,-17.71075 18.06213,-35.63201 27.15651,-53.42453 2.99048,-5.85223 8.05868,-8.49713 14.56989,-8.49713 33.63185,0 67.25683,0 100.88129,0 27.42823,0 54.8496,0.0433 82.27783,-0.029 7.57171,-0.0153 12.76495,3.15246 16.17488,10.0235 8.69973,17.58095 17.67909,35.02526 26.51494,52.54132 3.52812,7.00399 0.6057,11.77093 -7.19499,11.77093 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- <path
- id="path3980-4-3-2"
- d="m 394.57369,260.00786 c -0.81674,-3.51387 -2.85806,-5.19378 -6.57611,-5.18217 -19.4413,0.0712 -38.87891,0.0681 -58.31651,0 -3.70381,-0.007 -5.77362,1.63453 -6.58297,5.16581 -1.27523,5.56046 -2.5647,11.11565 -3.91116,16.6587 -1.51845,6.2933 -0.19363,8.04391 6.35715,8.06026 11.08557,0.0238 22.17748,0.005 33.27043,0.005 11.44699,-0.003 22.89397,0.0507 34.34834,-0.029 5.07876,-0.0322 6.74441,-2.20751 5.61639,-7.00188 -1.38286,-5.89655 -2.83009,-11.78149 -4.20556,-17.67698 z"
- clip-rule="evenodd"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-rule:evenodd" />
- </g>
- <text
- xml:space="preserve"
- style="font-size:9.06930542px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
- x="959.59619"
- y="1055.0935"
- id="text24274-5-3"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan24276-4-9"
- x="959.59619"
- y="1055.0935">Tails</tspan></text>
- <g
- id="g14041-2"
- transform="matrix(-0.11047841,-0.19089588,0.19089588,-0.11047841,943.65201,1185.8845)">
- <path
- d="m 301.5747,566.4861 -30.0517,-0.14345 c -7.07099,-0.0338 -12.93535,-5.95437 -13.04821,-13.17337 l 0.41101,-55.24138 55.97865,0.26721 -0.11638,55.24279 c -0.18177,7.21759 -5.95437,12.93535 -13.17337,13.0482 z"
- stroke-miterlimit="10"
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4.16666651;stroke-miterlimit:10"
- id="path4152-4-1-5" />
- <rect
- id="rect4154-4-7-8"
- height="27.083073"
- width="39.374622"
- stroke-miterlimit="10"
- transform="matrix(0.99998861,0.00477338,-0.00477338,0.99998861,0,0)"
- y="469.56754"
- x="269.60611"
- style="fill:none;stroke:#000000;stroke-width:4.16662645;stroke-miterlimit:10" />
- <path
- inkscape:connector-curvature="0"
- d="m 300.72986,549.73132 -28.18282,0 c -0.86313,0 -1.55809,-0.74461 -1.54731,-1.66072 l 0.21872,-18.56457 c 0.0135,-0.91525 0.71395,-1.65986 1.57709,-1.65986 l 3.54795,0 0,-5.80177 c 0.001,-6.22198 4.82143,-11.20417 10.64493,-11.20417 5.82216,0 10.49791,5.01611 10.44199,11.20417 l 0,5.80177 3.54795,0 c 0.86273,0 1.55768,0.74461 1.54704,1.65986 l -0.21872,18.56422 c -0.0135,0.91802 -0.71422,1.66107 -1.57682,1.66107 z M 292.4664,522.3761 c 0.0297,-3.27502 -2.44548,-5.92979 -5.5269,-5.92979 -3.08235,0 -5.60451,2.65477 -5.63403,5.92979 l 9.5e-4,5.47007 11.16133,0 -9.5e-4,-5.47007 z"
- id="path5189-4-8-1-2-2-0-5-7-1"
- style="fill:#ffffff;fill-opacity:1" />
- <g
- id="g13759-1-2"
- transform="translate(97.608432,0.232262)">
- <g
- id="g4156-7-9-0-4-7"
- transform="matrix(1.4801542,-1.2750407,1.4660905,1.2872717,118.56439,514.05907)">
- <line
- style="fill:none;stroke:#000000;stroke-width:1.9764694;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="40.6609"
- y1="12.348352"
- x2="39.013733"
- y2="13.948482"
- id="line4158-7-8-0-9-30" />
- <line
- style="fill:none;stroke:#000000;stroke-width:1.97647011;stroke-miterlimit:10"
- stroke-miterlimit="10"
- x1="35.6609"
- y1="7.3483534"
- x2="34.013733"
- y2="8.9484825"
- id="line4160-1-9-1-1-18" />
- </g>
- </g>
- <path
- sodipodi:nodetypes="cscc"
- inkscape:connector-curvature="0"
- d="m 296.44325,486.01559 c 0.031,4.18563 -4.38849,6.53271 -9.31446,6.53271 -4.92401,0 -9.42093,-2.6759 -9.42948,-6.53271 2.01684,0 16.95283,0 18.74394,0 z"
- id="path4818-2-4-3-6-1-0-4-2-7"
- style="fill:#000000;fill-opacity:1" />
- </g>
- </g>
-</svg>
diff --git a/wiki/src/blueprint/bootstrapping/assistant/overview/2nd_iteration/overview-20150324.odg b/wiki/src/blueprint/bootstrapping/assistant/overview/2nd_iteration/overview-20150324.odg
deleted file mode 100644
index ea1cfdb..0000000
--- a/wiki/src/blueprint/bootstrapping/assistant/overview/2nd_iteration/overview-20150324.odg
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/bootstrapping/assistant/windows.mdwn b/wiki/src/blueprint/bootstrapping/assistant/windows.mdwn
deleted file mode 100644
index 1d0c4aa..0000000
--- a/wiki/src/blueprint/bootstrapping/assistant/windows.mdwn
+++ /dev/null
@@ -1,518 +0,0 @@
-[[!meta title="Full synopsis for Windows USB scenario"]]
-
-[[!toc]]
-
-*Note: This page is part of our work on an [[*Installation
-Assistant*|assistant]] for Tails. It presents the full list of
-instructions for Windows user to install Tails on a USB stick.*
-
-*Note: Before getting to the full list of instructions, people will be
-presented an overview of the process. See the [draft
-wireframe](https://labs.riseup.net/code/attachments/download/782/overview-20150521-tchou.pdf).*
-
-Download and verify
-===================
-
-*Note: This section will correspond to the [[*Download and Verify Tails*
-browser extension|extension]]. See the [detailed
-wireframe](https://labs.riseup.net/code/attachments/download/764/extension-20150505.fodg).*
-
-Install a temporary Tails
-=========================
-
-In this step, you will install a temporary Tails by copying the Tails ISO image on a first USB
-stick using a program called *Universal USB Installer*.
-
-<div class="note">
-
-<p>On
-this temporary Tails you won't benefit from important features like
-automatic upgrades or the possibility to create an encrypted persistent
-storage to store some of your personal files.</p>
-
-</div>
-
-<div class="caution">
-
-<p>All the data on this USB stick will be lost.</p>
-
-</div>
-
-1. Plug the first USB stick in the computer.
-
-1. Click on the following link to download <span class="application">Universal USB Installer</span>:
-
- <a href='http://www.pendrivelinux.com/downloads/Universal-USB-Installer/Universal-USB-Installer-1.9.6.0.exe'>Download Universal USB Installer</a>
-
-1. At the Windows security warning, confirm that you want to
-run the program.
-
-1. Read the licence agreement and click **I Agree** to continue and
-start <span class="application">Universal USB Installer</span>.
-
-1. Select **Tails** from the drop-down list.
-
- [[!img uui.png link=no alt="screenshot of Universal USB Installer"]]
-
-1. Click **Browse** and choose the ISO image that you downloaded earlier.
-
-1. Use the drop-down list to specify the USB stick on which you want to install
-the ISO image.
-
- <div class="tip">
- <p>If the USB stick does not appear in the drop-down list, make sure
- that it is plugged in correctly and restart
- <span class="application">Universal USB Installer</span>.</p>
- </div>
-
-1. Select the **Format** option.
-
-1. Click **Create**.
-
-1. A warning appears. Click **Yes** to start the installation.
- The installation takes a few minutes.
-
-1. After the installation is finished, click **Close** to quit *Universal USB
-Installer*.
-
-Open these instructions on another device
-=========================================
-
-In the next step, you will shut down the computer. To be able to follow
-the rest of the instructions afterwards, we recommend you either:
-
- - Open this page on your smartphone, tablet, or another computer (recommended).
-
- [[!img tails_boum_org_blueprint_bootstrapping_assistant_windows.png link=no]]
-
- - Print the rest of the instructions on paper.
-
- - Take note of the URL of this page to be able to come back later:
-
- <https://tails.boum.org/install/win/usb/4-restart-temporary>
-
-Restart on the temporary Tails
-==============================
-
-1. Shut down the computer while leaving the first USB stick plugged in.
-
-1. Switch on the computer.
-
- If the computer starts on Tails, the **Boot Tails** menu
- appears. Choose **Live** and press **Enter**.
-
- [[!img doc/first_steps/start_tails/tails_boot_menu.png link=no alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
-
- <div class="note">
- <p>Most computers do not start on Tails by default. If it does you
- are lucky. Otherwise, if the computer starts on Windows, refer to the
- troubleshooting section about [[!toggle id="not_at_all" text="Tails
- not starting at all"]].</p>
- </div>
-
- [[!toggleable id="not_at_all" text="""
- <span class="hide">[[!toggle id="not_at_all" text=""]]</span>
-
- Tails does not start at all (troubleshooting)
- ---------------------------------------------
-
- The following section applies if the **Boot Tails** menu does not
- appear when starting on the USB stick.
-
- It is quite common for computers not to start automatically on a
- USB stick with Tails installed. Here are two troubleshooting techniques. You should try them
- one after the other.
-
- ### Getting to the boot menu
-
- On most computers, you can press a *boot menu key* to display a list of
- possible devices to start from. The following instructions explain how
- to display the boot menu and start on the USB stick. The following
- screenshot is an example of such boot menu:
-
- [[!img bios_boot_menu.png link=no]]
-
- 1. Identify the potential boot menu keys for the computer depending on
- the computer manufacturer in the following list:
-
- <table>
- <tr><th>Manufacturer</th><th>Type</th><th>Models</th><th>Key</th><th>Notes</th></tr>
- <tr><td>Acer</td><td>*</td><td>*</td><td>Esc, F12, F9</td></tr>
- <tr><td>Acer</td><td>netbook</td><td>AspireOne </td><td>F12</td></tr>
- <tr><td>Acer</td><td>netbook</td><td>Aspire Timeline</td><td>F12</td></tr>
- <tr><td>Acer</td><td>netbook</td><td>Aspire v3, v5, v7</td><td>F12</td><td>Boot Menu must be enabled in BIOS. It is disabled by default. Please check manual of the computer on how to enable it.</td></tr>
- <tr><td>Apple</td><td>*</td><td>After 2006</td><td>Option</td></tr>
- <tr><td>Asus</td><td>desktop</td><td>*</td><td>F8</td></tr>
- <tr><td>Asus</td><td>laptop</td><td>*</td><td>Esc</td></tr>
- <tr><td>Asus</td><td>laptop</td><td>R503C</td><td>F8</td></tr>
- <tr><td>Asus</td><td>netbook</td><td>Eee PC 1025c</td><td>Esc</td></tr>
- <tr><td>Compaq</td><td>*</td><td>Presario</td><td>Esc, F9</td></tr>
- <tr><td>Dell</td><td>desktop</td><td>Dimension, Inspiron, Latitude</td><td>F12</td></tr>
- <tr><td>Dell</td><td>desktop</td><td>Inspiron One 2020, 2305, 2320, 2330 All-In-One</td><td>F12</td></tr>
- <tr><td>Dell</td><td>laptop</td><td>Inspiron</td><td> F12</td></tr>
- <tr><td>Dell</td><td>laptop</td><td>Precision</td><td>F12</td></tr>
- <tr><td>eMachines</td><td>*</td><td>*</td><td>F12</td></tr>
- <tr><td>HP</td><td>generic</td><td>*</td><td>Esc, F9</td></tr>
- <tr><td>HP</td><td>desktop</td><td>Media Center</td><td>Esc</td></tr>
- <tr><td>HP</td><td>desktop</td><td>Pavilion 23 All In One</td><td>Esc</td></tr>
- <tr><td>HP</td><td>desktop</td><td>Pavilion g6 and g7 </td><td>Esc</td></tr>
- <tr><td>HP</td><td>desktop</td><td>Pavilion HPE PC, h8-1287c</td><td>Esc</td></tr>
- <tr><td>HP</td><td>desktop</td><td>Pavilion PC, p6 2317c</td><td>Esc, then F9 for "Boot Menu"</td></tr>
- <tr><td>HP</td><td>desktop</td><td>Pavilion PC, p7 1297cb</td><td>Esc, then F9 for "Boot Menu"</td></tr>
- <tr><td>HP</td><td>desktop</td><td>TouchSmart 520 PC</td><td>Esc, then F9 for "Boot Menu"</td></tr>
- <tr><td>HP</td><td>laptop</td><td>2000</td><td>Esc</td></tr>
- <tr><td>HP</td><td>notebook</td><td>Pavilion</td><td>Esc</td></tr>
- <tr><td>HP</td><td>notebook</td><td>ENVY dv6 and dv7 PC</td><td>Esc, then F9 for "Boot Menu"</td></tr>
- <tr><td>Intel</td><td>*</td><td>*</td><td>F10</td></tr>
- <tr><td>Lenovo</td><td>desktop</td><td>*</td><td>F12, F8, F10</td></tr>
- <tr><td>Lenovo</td><td>laptop</td><td>*</td><td>F12</td></tr>
- <tr><td>Lenovo</td><td>laptop</td><td>IdeaPad P500</td><td>F12 or Fn + F11</td></tr>
- <tr><td>NEC</td><td>*</td><td>*</td><td>F5</td></tr>
- <tr><td>Packard Bell</td><td>*</td><td>*</td><td>F8</td></tr>
- <tr><td>Samsung</td><td>*</td><td>*</td><td>F12, Esc</td></tr>
- <tr><td>Samsung</td><td>netbook</td><td>NC10</td><td>Esc</td></tr>
- <tr><td>Samsung</td><td>ultrabook</td><td>Series 5 Ultra and Series 7 Chronos</td><td>Esc</td></tr>
- <tr><td>Sharp</td><td>*</td><td>*</td><td>F2</td></tr>
- <tr><td>Sony</td><td>*</td><td>VAIO, PCG, VGN</td><td>F11</td></tr>
- <tr><td>Sony</td><td>*</td><td>VGN</td><td>Esc, F10</td></tr>
- <tr><td>Toshiba</td><td>*</td><td>Protege, Satellite, Tecra</td><td>F12</td></tr>
- <tr><td>Toshiba</td><td>*</td><td>Equium</td><td>F12</td></tr>
- </table>
-
- 1. Make sure that the first USB stick is plugged in the computer.
-
- 1. Shut down the computer.
-
- 1. Switch on the computer.
-
- Immediately press several times the first potential boot menu key identified in step 1.
-
- - If a boot menu with a list of possible devices to start from
- appears, select the first USB stick in the list and press **Enter**.
-
- - If the computer starts on Windows, repeat steps
- 2 and 3 for all the potential boot menu keys identified in step 1.
-
- If none of the potential boot menu keys identified in step 1 work or if
- the USB stick does not appear in the list, then try the second
- troubleshooting technique described below.
-
- ### Edit the BIOS settings
-
- You might need to edit the BIOS settings of the computer.
-
- <div class="tip">
-
- <p>Search for the user guide of the computer on the website of its
- manufacturer to learn how to edit the BIOS settings.</p>
-
- </div>
-
- In the BIOS settings, try to apply the following changes one by one and
- restart the computer after each change. Some changes might not
- apply to certain computer models.
-
- <div class="caution">
-
- <p>Take note of the changes that you apply to the BIOS settings, to be
- able to revert them if they prevent the computer to start on
- Windows.</p>
-
- </div>
-
- 1. Edit the **Boot Order**. Depending on the computer model you might
- see an entry for **removable devices** or **USB media**. Move this entry
- to the top of the list to force the computer to try to start from
- the first USB stick before starting from the internal hard disk.
-
- 1. Disable **Fast boot**.
-
- 1. If the computer is configured to start with **legacy BIOS**, try to
- configure it to start with **UEFI**. Else, if the computer is configured
- to start with **UEFI**, try to configure it to start with **legacy
- BIOS**. To do so, try any of the following options if available:
-
- - Enable Legacy mode
- - Disable Secure boot
- - Enable CSM boot
- - Disable UEFI
-
- 1. Try to upgrade the BIOS to the latest version provided by the manufacturer.
-
- If none of these options work, please [[report the problem to our
- support team|doc/first_steps/bug_reporting/tails_does_not_start]].
-
- We're sorry but you might not be able to use Tails on this computer.
-
- """]]
-
-1. After 30&ndash;60 seconds, another screen called *Tails Greeter*, appears.
-
- [[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=no]]
-
- <div class="note">
- <p>If the computer stops responding or displays error messages before
- getting to <span class="application">Tails Greeter</span>, refer to
- the troubleshooting section about
- [[!toggle id="not_entirely" text="Tails not starting entirely"]].</p>
- </div>
-
- [[!toggleable id="not_entirely" text="""
- <span class="hide">[[!toggle id="not_entirely" text=""]]</span>
-
- Tails does not start entirely (troubleshooting)
- -----------------------------------------------
-
- The following section applies if the **Boot Tails** menu appears but not
- *Tails Greeter* when starting Tails.
-
- 1. Restart the computer on the first USB stick.
-
- 1. In the **Boot Tails** menu, choose the <span class="guilabel">failsafe</span>
- mode which might work better on some computers.
-
- 1. If the <span class="guilabel">failsafe</span> mode does not work
- better, restart the computer again on the first USB stick.
-
- 1. In the **Boot Tails** menu, press `TAB`. A command line with a list
- of boot options appears at the bottom of the screen.
-
- [[!img doc/first_steps/startup_options/boot-menu-with-options.png link=no]]
-
- 1. Press the <span class="keycap">Backspace</span> key several times to
- remove the `quiet` option from the command line.
-
- 1. Type `debug nosplash` to add these options to the command line.
-
- 1. To start Tails, press **Enter**.
-
- 1. Hopefully, error messages now appear when starting Tails. You can
- [[send them to our support team by email|/support/talk]], for example by taking a
- picture of the last screen and error messages.
-
- 1. If the error message is `/bin/sh: can't access tty; job control
- turned off` followed by `(initramfs)`, then try removing the
- `live-media=removable` option from the boot command line.
-
- If removing `live-media=removable` allows you to start Tails, please
- report the problem to our [[support team|support/talk]].
- This contributes to improving the [[list
- of problematic USB sticks|support/known_issues#problematic-usb-sticks]].
- Then try installing Tails on another USB stick.
-
- <div class="caution">
-
- <p>Removing the <span class="code">live-media=removable</span> option
- might be dangerous. If an adversary had access to the computer and
- installed a malicious Tails on an internal hard disk, the computer
- might start on the malicious Tails instead of on the USB stick.</p>
-
- </div>
-
- 1. In *Tails Greeter*, select your preferred language in the drop-down
- list on the bottom left of the screen. Click **Login**.
-
- """]]
-
-1. After 15&ndash;30 seconds, the Tails desktop appears.
-
- [[!img desktop.png size=640x480 link=no]]
-
-Install the final Tails
-=======================
-
-In this step, you will install the final Tails on a second USB stick
-using *Tails Installer*.
-
-<div class="caution">
-
-<p>All the data on this USB stick will be lost.</p>
-
-</div>
-
-1. Plug the second USB stick in the computer.
-
-1. Choose
- <span class="menuchoice">
- <span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Tails</span>&nbsp;▸
- <span class="guimenuitem">Tails Installer</span>
- </span>
- to start <span class="application">Tails Installer</span>.
-
-1. Click on the <span class="button">Clone & Install</span> button.
-
- [[!img tails_installer.png link=no]]
-
-1. Use the <span class="guilabel">Target Device</span> drop-down list to
- specify the second USB stick.
-
-1. To start the installation, click on the <span
- class="button">Install Tails</span> button.
- The installation takes a few minutes.
-
- <div class="bug">
- <p>The progress bar usually freezes for some time around 95 percent
- while synchronizing data on disk.</p>
- </div>
-
-1. Read the warning message in the pop-up window. Click on the <span
- class="button">Yes</span> button to confirm.
-
-Restart on the final Tails
-==========================
-
-1. Shut down the computer.
-
-1. Unplug the first USB stick and leave the second USB stick plugged in.
-
-1. Switch on the computer.
-
-1. In the **Boot Tails** menu, choose **Live** and press **Enter**.
-
-1. After 30&ndash;60 seconds, *Tails Greeter* appears.
-
-1. In *Tails Greeter*, select your preferred language in the drop-down
-list on the bottom left of the screen. Click **Login**.
-
-1. After 15&ndash;30 seconds, the Tails desktop appears.
-
-Subscribe to our newsletter (optional)
-======================================
-
-It is very important to keep your Tails up-to-date, otherwise
-it will become vulnerable to numerous security issues.
-
-To be notified of new versions and important project news, follow our
-[[news feed|news]] or subscribe to our
-<a href="https://mailman.boum.org/listinfo/amnesia-news">newsletter</a>
-(one or two messages per month):
-
-<form method="post" action="https://mailman.boum.org/subscribe/amnesia-news" target="_blank">
- <input class="text" name="email" value=""/>
- <input class="button" type="submit" value="Subscribe"/>
-</form>
-
-Create an encrypted persistent storage (optional)
-=================================================
-
-You can optionally create an *encrypted persistent storage* in the
-remaining free space on the second USB stick to store any of the
-following:
-
- - Your personal files and working documents
- - Some of your settings
- - Your encryption keys
-
-The data in the encrypted persistent storage:
-
- - Remains available across separate working sessions.
- - Is encrypted using a passphrase of your choice.
-
-Once the encrypted persistent storage is created, you can choose whether
-to activate it or not each time you start Tails.
-
-<div class="tip">
-
-<p>If you don't want to store any data in Tails you can stop following
-these instructions and start enjoying Tails right now.</p>
-
-</div>
-
-<div class="caution">
-
-<p>The encrypted persistent storage is not hidden. An attacker in possession of
-the USB stick can know whether it has an encrypted persistent storage. Take into consideration
-that you can be forced or tricked to give out its passphrase.</p>
-
-</div>
-
-<div class="caution">
-
-<p>It is possible to
-open the encrypted persistent storage from other operating systems, but it might break
-your security.
-Other operating systems should probably not be trusted to handle
-sensitive information or leave no trace.</p>
-
-</div>
-
-1. Choose
- <span class="menuchoice">
- <span class="guimenu">Applications</span>&nbsp;▸
- <span class="guisubmenu">Tails</span>&nbsp;▸
- <span class="guimenuitem">Configure persistent volume</span></span> to
- start the *Persistence Assistant*. The assistant proposes to create
- an encrypted persistent volume on the USB stick.
-
-1. Specify a passphrase of your choice in both the
-<span class="guilabel">Passphrase</span> and <span class="guilabel">Verify
-Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span> button.
-
- <div class="tip">
- <p>We recommend choosing a long passphrase made of several random words
- rather than a single password. For example "bank violin thread duck knob
- train" is a very strong passphrase.</p>
-
- <p>To learn how to choose a good passphrase, read
- <a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">this
- article from The Intercept</a>.</p>
- </div>
-
-3. Wait for the creation to finish.
-
- <div class="bug">
- <p>If the creation is interrupted before it finishes, you might not
- be able to start Tails from this USB stick anymore. This can happen if you
- close the window of the assistant or unplug the USB stick during the creation of
- the encrypted persistent storage. Reinstall the final Tails from the
- temporary Tails to fix this issue.</p>
- </div>
-
-4. The assistant shows a list of the possible persistence features. Each
- feature corresponds to a set of files or settings to be saved in the encrypted
- persistent storage.
-
- For the time being, we recommend you to only activate the **Personal
- Data** persistence feature. You can modify the configuration of the
- encrypted persistent storage later on according to your needs.
-
- <div class="caution">
- <p>As a general rule, only activate the persistence features that you
- need, as you might otherwise store more data than intended or weaken
- your anonymity.</p>
- </div>
-
- Refer to our documentation on [[configuring the encrypted persistent
- storage|doc/first_steps/persistence/configure]] to learn more about
- the other persistence features.
-
-5. Click **Save**.
-
-1. Shut down the computer and restart on the final Tails.
-
-1. In *Tails Greeter*:
-
- - Select your preferred language in the drop-down list on the bottom left of the screen.
- - In the <span class="guilabel">Use persistence?</span> section, choose <span class="guilabel">Yes</span> to
-enable the encrypted persistent storage for the current working session.
- - Enter the passphrase of the persistent volume in the
-<span class="guilabel">Passphrase</span> text box.</span>
- - If you select the <span class="guilabel">Read-Only</span> check box, the
-content of encrypted persistent storage is available and you can modify
-it but the changes are not be saved.
- - Click **Login**.
-
- <div class="caution">
- <p>Use the encrypted persistent storage only when necessary. You can
- always start Tails without activating the encrypted persistent
- storage.</p>
- </div>
-
-1. After 15&ndash;30 seconds, the Tails desktop appears.
-
-1. You can now save your personal files and working documents in the
-**Persistent** folder. To open the **Persistent** folder choose
-<span class="menuchoice">
- <span class="guimenu">Places</span>&nbsp;▸
- <span class="guimenuitem">Persistent</span></span>.
diff --git a/wiki/src/blueprint/bootstrapping/assistant/windows/tails_boum_org_blueprint_bootstrapping_assistant_windows.png b/wiki/src/blueprint/bootstrapping/assistant/windows/tails_boum_org_blueprint_bootstrapping_assistant_windows.png
deleted file mode 100644
index 025e83e..0000000
--- a/wiki/src/blueprint/bootstrapping/assistant/windows/tails_boum_org_blueprint_bootstrapping_assistant_windows.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/bootstrapping/assistant/windows/uui.png b/wiki/src/blueprint/bootstrapping/assistant/windows/uui.png
deleted file mode 100644
index 6d7a82a..0000000
--- a/wiki/src/blueprint/bootstrapping/assistant/windows/uui.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/blueprint/derivatives.mdwn b/wiki/src/blueprint/derivatives.mdwn
index ecb4029..c3930a5e 100644
--- a/wiki/src/blueprint/derivatives.mdwn
+++ b/wiki/src/blueprint/derivatives.mdwn
@@ -10,7 +10,8 @@ What for:
Why is it complicated:
-- Release every 6 weeks and maybe emergency security releases
+- Release every 6 weeks, plus the occasional unscheduled emergency
+ security release
- Heavy quality assurance process (automated builds and tests)
- Complex infrastructure (upgrades)
- User trust (authenticated downloads, OpenPGP Web-of-Trust)
@@ -30,7 +31,7 @@ Good ways of doing it:
- Help us build in Tails other mechanisms that you might need to adapt
it to your needs (for example to have persistent DConf settings or APT
sources).
-- Talk with us to see how we can adapt our ISO images to make them
+- Talk with us to see how we can adapt our ISO images and source code to make them
easier for your to reuse.
- If you want to include a piece of software into Tails, talk to us as
early as possible so we can provide feedback on how to integrate it.
diff --git a/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn b/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
index ad58a27..2280da1 100644
--- a/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
@@ -21,37 +21,30 @@ Please take this into account when you comment on current proposals. Improvement
# Flow
-After working on a prototype and doing UX testing with some folks at NUMA, we arrived at
-the idea of having two main experience flows:
+After working on a prototype and doing UX testing with some folks at NUMA, we arrived at the idea of having two main experience flows:
-- A quick setup for regular users, in which every option is easy to access in a few screens;
-- A wizard to guide newcomers.
+- Guided Configuration: A wizard to guide new users
+- Self-guided Configuration: A quick setup for veteran users
-The result of this step can be found in [[NUMA_flow]].
+The result of this step can be found in this [[NUMA_flow]].
# Implementation phases
-The implementation and release of this is scheduled in three
-phases, so that we make actual progress we can deliver to users as
-soon as things become reality:
+The implementation and release of this is scheduled in three phases. The intention is to make progress that can be delivered as soon as things become reality:
-- Phase 1: redesign the Greeter's 1st and 2nd screen. We then have
- similar functionality to the current Greeter, but more clearly presented.
+- PHASE 1: Redesign the Greeter's 1st screen. We then have similar functionality to the current Greeter but more clearly presented.
-- Phase 2: add a Wizard to guide beginners ("Discover: Guided Configuration")
+- PHASE 2: Add a wizard to guide beginners ("Discover: Guided Configuration")
-- Phase 3: merge the persistence creation/configuration into the
- greeter
+- PHASE 3: Merge the persistence creation/configuration into the Greeter
+
+We are proposing this because we have been debating a lot on the first screen(s) and we have reached something that is worth being tested and implemented. There is still work needed on the Guided Configuration wizard.
-We are proposing this because we have been debating a lot on
-the first screen(s) and we have reached something that is worth
-being tested and implemented. On the other hand, there is more
-work needed on the Guided Configuration wizard.
# Proposed design for the 1st screen
-We refined this on the *tails-ux* mailing list to arrive at the following concrete proposal
-for the 1st screen. Below in this document we explain every designation.
+We refined this on the *tails-ux* mailing list to arrive at the following concrete proposal for the 1st screen. Below in this document we explain every designation.
+
## Intention
@@ -61,27 +54,22 @@ Design a greeter dialog that:
- Accommodates for fast access to other advanced options
- Has a simple and easy to understand interface for both new and advanced users
- Uses as much tested data from previous design iterations as possible
-- Is up-to-date with GNOME 3.14 standards
+- Is up-to-date with GNOME 3.14 guidelines
-## Proposed design
-<img src="https://labs.riseup.net/code/attachments/download/937/Tails.Greeter.Explained.png" width="900px" />
+## Proposed design
-[full size bitmap](https://labs.riseup.net/code/attachments/download/937/Tails.Greeter.Explained.png)
-[source](https://labs.riseup.net/code/attachments/download/936/Tails.Greeter.Explained.svgz)
+A single welcome and settings screen, which is always displayed, that acts as a "Check & Go" screen, as well as a hub for editing settings.
-<img src="https://mailman.boum.org/pipermail/tails-ux/attachments/20150910/550fa30e/attachment-0001.png" width="900px" />
+<img src="https://labs.riseup.net/code/attachments/download/984/Greeter.Explained.png" width="100%" height="auto" />
-[full size bitmap](https://mailman.boum.org/pipermail/tails-ux/attachments/20150910/550fa30e/attachment-0001.png)
-[source](https://mailman.boum.org/pipermail/tails-ux/attachments/20150910/550fa30e/attachment-0001.bin)
+[full size bitmap](https://labs.riseup.net/code/attachments/download/984/Greeter.Explained.png)
+[source](https://labs.riseup.net/code/attachments/download/985/Greeter.Explained.svgz)
-There is a single welcome and settings screen which is always displayed and acts as a "Check & Go" screen, as well as a hub for editing settings.
+<img src="https://labs.riseup.net/code/attachments/download/979/Greeter.States.png" width="100%" height="auto" />
-When a line is clicked, a popover ([[https://developer.gnome.org/hig/stable/popovers.html.en]]) opens with an explanation of the option and the controls to change its value.
-
-As the values change their new value will replace the previous value in each respective location.
-
-It is clear that the "Language" section can/should be saved, but not yet weather the "Settings" section can/should be saved.
+[full size bitmap](https://labs.riseup.net/code/attachments/download/979/Greeter.States.png)
+[source](https://labs.riseup.net/code/attachments/download/980/Greeter.States.svgz)
## Explanation of this design
@@ -89,17 +77,19 @@ It is clear that the "Language" section can/should be saved, but not yet weather
Which content structure type is most appropriate for the Greeter?
-[[!img Greeter.Decision.00-Structure.png link="Greeter.Decision.00-Structure.svg" size="800x"]]
+<img src="https://labs.riseup.net/code/attachments/download/987/Content.Structure.Types.png" width="100%" height="auto" />
-- Step-by-step - Guided walkthrough
-- Show/Hide - Hidden off-screen or behind on-screen element
-- **Openface - Full display**
+[full size bitmap](https://labs.riseup.net/code/attachments/download/987/Content.Structure.Types.png)
+[source](https://labs.riseup.net/code/attachments/download/988/Content.Structure.Types.svgz)
-With the Step-by-step flow already established as the most appropriate guided configuration structure, the designation made was that, the Show/Hide structure most appropriately accommodates the two end-of-spectrum use cases (noob vs veteran). However, it doesn't align GNOME HIG and doesn't feedback to the user which options are selected (when diverging from defaults). We thus choosed to:
+- Step-by-step: Guided walkthrough
+- Show/Hide: Hidden off-screen or behind on-screen element
+- **Openface: Full display**
-- add a + button to add setting, as commonly found in GNOME lists
-- display settings that diverge from defaults
+With the Step-by-step flow already established as the most appropriate guided configuration structure, the designation made was that the Show/Hide structure most appropriately accommodates the two end-of-spectrum use cases (noob and veteran). However, this does not align with the GNOME HIG or provide feedback to the user which options are selected (when diverging from defaults). We thus chose to:
+- Add a "+" button to add a customizable setting, as commonly found in GNOME lists
+- Only display privacy settings that diverge from defaults
### Options Available On The 1st Screen
@@ -113,7 +103,10 @@ In our situation, this is most effectively accomplished by displaying all settin
Where should the ‘Start Tails’ button be located?
-[[!img Greeter.Decision.01-Start.png link="Greeter.Decision.01-Start.svg" size="800x"]]
+<img src="https://labs.riseup.net/code/attachments/download/989/Start.Tails.Button.Location.png" width="100%" height="auto" />
+
+[full size bitmap](https://labs.riseup.net/code/attachments/download/989/Start.Tails.Button.Location.png)
+[source](https://labs.riseup.net/code/attachments/download/990/Start.Tails.Button.Location.svgz)
Height:
@@ -140,11 +133,14 @@ How should the settings section be ordered?
- Importance: Storage, Language, Settings
- **Logical: Language, Storage, Settings**
-An arbitrary order such as alphabetical is much less relevant than ordering by importance or logical steps. On top of that, to setup storage, one should select the appropriate language first to be able to read or write. Thus the choice of the Language, Storage, then Settings order.
+An order such as alphabetical is much less helpful than ordering by importance or by logical steps. On top of that, to setup storage, one should select the appropriate language first to be able to read or write. Thus the choice of the Language, Storage, then Settings order.
+
+Should the settings sections be labeled with either two or three labels?
-Further, should the settings sections be labeled with either two or three labels?
+<img src="https://labs.riseup.net/code/attachments/download/991/Settings.Labels.png" width="100%" height="auto" />
-[[!img Greeter.Decision.03-Labels.png link="Greeter.Decision.03-Labels.svg" size="800x"]]
+[full size bitmap](https://labs.riseup.net/code/attachments/download/991/Settings.Labels.png)
+[source](https://labs.riseup.net/code/attachments/download/992/Settings.Labels.svgz)
- Two
- **Three**
@@ -155,7 +151,10 @@ The designation was made that having three sections with three labels was the mo
Should icons accompany the Section or Line-item labels, none, or both?
-[[!img Greeter.Decision.04-Icons.png link="Greeter.Decision.04-Icons.svg" size="800x"]]
+<img src="https://labs.riseup.net/code/attachments/download/993/Label.Icons.png" width="100%" height="auto" />
+
+[full size bitmap](https://labs.riseup.net/code/attachments/download/993/Label.Icons.png)
+[source](https://labs.riseup.net/code/attachments/download/994/Label.Icons.svgz)
- Section
- **Line Item**
@@ -175,7 +174,10 @@ The designation was made that icons should not accompany button labels. In addit
Should the Greeter have the option to be closed/restarted?
-[[!img Greeter.Decision.05-Close.png link="Greeter.Decision.05-Close.svg" size="800x"]]
+<img src="https://labs.riseup.net/code/attachments/download/995/Close.Greeter.png" width="100%" height="auto" />
+
+[full size bitmap](https://labs.riseup.net/code/attachments/download/995/Close.Greeter.png)
+[source](https://labs.riseup.net/code/attachments/download/996/Close.Greeter.svgz)
- **Close/Restart**
- No Close/Restart
@@ -188,7 +190,11 @@ Since there are multiple boot modes to choose from for Tails, the designation wa
The language section is always visible. When a language is saved (in cleartext), it is automatically filled in with saved options.
-Clicking on a language line will open a Popover with the available options and a search bar.
+When a line is clicked, a popover ([[https://developer.gnome.org/hig/stable/popovers.html.en]]) opens with an explanation of the option and the controls to change its value.
+
+As the values change their new value will replace the previous value in each respective location.
+
+It is clear that the "Language" section can/should be saved, but not yet weather the "Settings" section can/should be saved.
UI when "Save Language Changes" is checked:
@@ -203,18 +209,9 @@ UI when "Save Language Changes" is checked:
### Storage
-<img src="https://labs.riseup.net/code/attachments/download/954/EncryptedStorage.png" width="400px"/>
-
-[full size bitmap](https://labs.riseup.net/code/attachments/download/954/EncryptedStorage.png)
-
-
-1. Initial state
-2. While typing
-3. After clicking on enable
-4. Unlocked storage
-5. If the password is wrong
+<img src="https://labs.riseup.net/code/attachments/download/997/Encrypted.Storage.png" width="100%" height="auto" />
-A context menu enables to "show passphrase", "copy" and "paste" as in GNOME OpenPGP agent
+[full size bitmap](https://labs.riseup.net/code/attachments/download/997/Encrypted.Storage.png) [source](https://labs.riseup.net/code/attachments/download/998/Encrypted.Storage.svgz)
# Upcoming settings
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index ea16bea..84e3721 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -40,24 +40,42 @@ to add it, run:
#Git comandi quotidiani
Sono tutti da mandare da terminale, una volta che si è dentro alla cartella che si usa per il progetto tails.
-Il pulsante TAB è vostro amico per completare tutti i percorsi dei file e soprattutto quando usate git add.
+Il pulsante TAB è vostro amico per completare tutti i percorsi dei file e soprattutto quando usate git add. Le frecce su e giù della tastiera vi danno gli ultimi comandi che avete lanciato, così andate velocissim*.
+
+Tutte le volte va configurata la chiave ssh che si usa, quindi:
+
+ $ ssh-add /home/utente/vostrachiaveprivata
+
+Fatto, ora possimo sincronizzarsi al repository remoto, prendendo i file che ci mancano:
$ git pull
-Per sincronizzarsi al repository remoto
+Per aggiungere allo stadio "stage" i file che poi si manderà al repository remoto.
+
$ git add NAMEFILE
-Per aggiungere allo stadio "stage" i file che poi si manderà al repository remoto
+Per avere una descrizione delle modifiche fatte localmente, ma che apparirà anche al repository remoto quando si aggiungeranno
+
$ git commit -m "DESCRIZIONE DELLE MODIFICHE FATTE"
-Per avere una descrizione delle modifiche fatte localmente, ma che apparirà anche al repository remoto quando si aggiungeranno
+Se siete sicuri che le modifiche che avete fatto vanno tutte sul repository remoto, potete condensare i due comandi sopra con uno solo, -a mette tutti i file nella zona "stage" e committate direttamente:
+
+ $ git commit -a -m "DESCRIZIONE MODIFICHE"
+
+Se non sapete l'identità con cui è configurato git, fate un controllo prima di mandare le cose in remoto:
+
+
+ $ git config -l
+
+Per aggiungere i commit fatti al repository remoto:
-
$ git push l10n-italian master
-Per aggiungere i commit fatti al repository remoto
+In caso di dubbi, vedete un po il vosro status:
+
+ $ git status
@@ -149,8 +167,11 @@ in fondo al comando):
11)Genero la chiave ssh, la invio agli sviluppatori TAILS(il file.pub) e l'associo per essere autenticato sul server:
ssh-keygen -t rsa -b 4096 -C "ignifugo@blablabla.net"
- $ eval "$(ssh-agent -s)"
- Agent pid 12534
+
+Ti chiederà il nome con cui genererà i due file della chiave, quello pubblico e quello segreto. QUindi ti cheide una passwor, due volte; i caratteri non si vedono quando li digiti.Finito
+
+Ora configuro la comunicazione ssh ad usare la mia chiave segreta ed invio quella pubblica agli sviluppatori di Tails per poter così scrivere nel repository condiviso.
+
$ ssh-add /home/cri/ignissh
Enter passphrase for /home/cri/ignissh:
Identity added: /home/cri/ignissh (/home/cri/ignissh)
@@ -196,34 +217,35 @@ Attingere nuove pagine da tradurre dando precedenza a queste:
./doc/about/requirements --DONE, pushed, daRev
-./doc/download
+./doc/download --DONE, pushed, daRev
-./doc/get.index
+./doc/get.index --DONE, pushed, daRev
-./doc/get/trusting_tails_signing_key
+./doc/get/trusting_tails_signing_key --DONE, pushed, daRev
-./doc/get/*
+./doc/get/*--DONE, pushed, daRev
___
bf
./doc/about.index --FINITO!
-./doc/about/openpgp_keys --80% DONE, a lot of issues... daRev ?
-
-./doc/about/features --DONE, pushed daRev ?
+./doc/about/features --DONE, pushed daRev
-./doc/about/fingerprint --DONE, pushed daRev ?
+./doc/about/fingerprint --DONE, pushed daRev
./doc/first_steps/persistence.caution --FINITO!
-./doc/first_steps/persistence/configure --DONE pushed daRev ?
+./doc/first_steps/persistence/configure --DONE pushed daRev
./doc/first_steps/persistence/delete --FINITO!
+./doc/first_steps/persistence/warnings --FINITO!
+
+***
./doc/first_steps/persistence/use
-./doc/first_steps/persistence/warnings --FINITO!
+./doc/about/openpgp_keys --80% DONE, a lot of issues... not pushed
___
./doc/about/tor --DONE, Pushed
diff --git a/wiki/src/blueprint/lizard_failover.mdwn b/wiki/src/blueprint/lizard_failover.mdwn
new file mode 100644
index 0000000..f3148e5
--- /dev/null
+++ b/wiki/src/blueprint/lizard_failover.mdwn
@@ -0,0 +1,60 @@
+This is about [[!tails_ticket 6185]] and friends.
+
+[[!toc levels=2]]
+
+# Scope
+
+The idea is to avoid blocking the release process and normal Tails
+usage if lizard goes down. It's *not* meant to replace lizard for more
+than a few weeks.
+
+# Services
+
+These are the services, among [[those we
+run|contribute/working_together/roles/sysadmins]], that we want
+a failover for. This is inspired by the [[priority list for service
+monitoring|blueprint/monitor_servers#services]].
+
+- APT repository (our own one + the freezable Debian one)
+- bittorrent
+- Gitolite + git-annex for our Tor Browser archive
+- rsync server
+- WhisperBack relay
+
+<a id="system-specs"></a>
+
+# System requirements
+
+This is about [[!tails_ticket 10243]].
+
+The goal is to specify what we'll likely need mid-2016.
+We also need datacenter-class bandwidth.
+
+- APT repository:
+ * CPU: reprepro can already be hungry; and once we have the
+ freezable APT repo, depending on the chosen tools it may grow
+ a lot (e.g. no idea how aptly behaves)
+ * RAM: currently low, but might grow for the same reason as CPU usage
+ * storage: 425 GB, +25% each year
+- bittorrent:
+ * CPU: low
+ * RAM: low
+ * storage: 3 GB
+- Tor Browser archive:
+ * CPU: low
+ * RAM: low
+ * storage: 60 GB, +40GB each year
+- rsync server:
+ * CPU: low
+ * RAM: low
+ * storage: 5 GB (excluding `obsolete`; 20 GB including it)
+- WhisperBack relay:
+ * CPU: low
+ * RAM: low
+ * storage: low
+
+**Total**:
+
+ * CPU: currently low but must be easily upgradable
+ * RAM: 2 GB should be enough for now, but must be easily upgradable
+ * storage: 500 GB mid-2016; 650 GB mid-2017
diff --git a/wiki/src/blueprint/monitor_servers.mdwn b/wiki/src/blueprint/monitor_servers.mdwn
index 5fedbdb..470f57e 100644
--- a/wiki/src/blueprint/monitor_servers.mdwn
+++ b/wiki/src/blueprint/monitor_servers.mdwn
@@ -244,6 +244,8 @@ scale up to 50 hosts.
monitoring system. Let's keep in mind that collecting exported
Puppet resources is expensive.
+<a id="services"></a>
+
# Service and system checks
Below, HIGH, MEDIUM and LOW are priority level wrt. the implementation
@@ -263,8 +265,8 @@ For description of individual services, see
## APT repository
-* HIGH: `stable` APT suite over HTTP
-* HIGH: freezable APT repository, once it exists
+* CRITICAL: `stable` APT suite over HTTP
+* CRITICAL: freezable APT repository, once it exists
## Bitcoind
@@ -288,18 +290,18 @@ For description of individual services, see
## Jenkins
-* HIGH: the HTTP server must be up, and unauthenticated connection
+* CRITICAL: 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
+* CRITICAL: <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
+* CRITICAL: check, over `rsync://`, that expected directories are there
## Test suite infrastructure
@@ -308,7 +310,7 @@ For description of individual services, see
## Website
-* HIGH: <https://tails.boum.org/> must be up and working
+* CRITICAL: <https://tails.boum.org/> must be up and working
## WhisperBack relay
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 20e010d..7302c27 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -15,3 +15,5 @@ Availability and plans for the next weeks
Discussions
===========
+
+ - [[!tails_ticket 10188 desc="Draft text for the website about buying t-shirts"]]
diff --git a/wiki/src/blueprint/report_2015_08.mdwn b/wiki/src/blueprint/report_2015_08.mdwn
index 96c9491..b679edd 100644
--- a/wiki/src/blueprint/report_2015_08.mdwn
+++ b/wiki/src/blueprint/report_2015_08.mdwn
@@ -18,16 +18,25 @@ Releases
Code
====
-FIXME
+## Upgrades and changes
-* Alan submitted for review a new version of
- [Tor Monitor](https://mailman.boum.org/pipermail/tails-dev/2015-August/009381.html)
- (to replace Vidalia) and Sascha Steinbiss proposed to
- [package it for Debian](https://mailman.boum.org/pipermail/tails-dev/2015-August/009397.html).
+- Install Tor Browser 5.0.2 (based on Firefox ESR 38.2.1).
+
+- Install a 32-bit GRUB EFI boot loader. Tails should now start on some tablets
+with Intel Bay Trail processors among others.
+
+- Let the user know when Tails Installer has rejected a device because it is too
+small.
+
+- Upgrade Tor to 0.2.6.10-1~d70.wheezy+1+tails1
+
+## Fixed problems
+
+- Our AppArmor setup has been audited and improved in various ways which should
+harden the system.
+
+- The network should now be properly disabled when MAC address spoofing fails.
-* We drafted a script to [[!tails_ticket 9993 desc="run a Mumble server"]] from
- Tails, verified that the Mumble client in Tails Jessie works well, and
- started using it for internal meetings.
Documentation and website
=========================
@@ -108,12 +117,19 @@ Upcoming events
On-going discussions
====================
-FIXME
+* Alan submitted for review a new version of
+ [Tor Monitor](https://mailman.boum.org/pipermail/tails-dev/2015-August/009381.html)
+ (to replace Vidalia) and Sascha Steinbiss proposed to
+ [package it for Debian](https://mailman.boum.org/pipermail/tails-dev/2015-August/009397.html).
+
+* We drafted a script to [[!tails_ticket 9993 desc="run a Mumble server"]] from
+ Tails, verified that the Mumble client in Tails Jessie works well, and
+ started using it for internal meetings.
Press and testimonials
======================
-FIXME
+* 2015-08-04: [Cinq systèmes d’exploitation pour snober Windows 10 (et Mac OS)](http://www.lemonde.fr/pixels/article/2015/08/04/cinq-systemes-d-exploitation-pour-snober-windows-10-et-mac-os_4710726_4408996.html) by Damien Leloup in Le Monde (in French).
Translation
===========
@@ -123,9 +139,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 469,870 times this month. This makes 15,157 boots a day on average.
-* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
+* 31,870 downloads of the OpenPGP signature of Tails ISO from our website.
* 127 bug reports were received through WhisperBack.
diff --git a/wiki/src/contribute.de.po b/wiki/src/contribute.de.po
index 08c5bec..054ae0d 100644
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-20 12:11+0300\n"
+"POT-Creation-Date: 2015-10-13 12:48+0300\n"
"PO-Revision-Date: 2014-04-18 23:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -383,7 +383,19 @@ msgid "Source code: [[Git repositories|contribute/git]]"
msgstr "Quellcode: [[Git repositories|contribute/git]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
+#| " - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
+#| " - [[Easy tasks|easy_tasks]] for new contributors\n"
+#| " - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
+#| " can be filtered by type of work (see links in the sidebar)\n"
+#| " - [[Building a Tails image|contribute/build]]\n"
+#| " - [[Build the website|contribute/build/website]]\n"
+#| " - [[Customize Tails|contribute/customize]]\n"
+#| " - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
+#| " - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
+#| " - [[Glossary for contributors|contribute/glossary]]\n"
msgid ""
" - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
" - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
@@ -391,7 +403,7 @@ msgid ""
" - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
" can be filtered by type of work (see links in the sidebar)\n"
" - [[Building a Tails image|contribute/build]]\n"
-" - [[Build the website|contribute/build/website]]\n"
+" - [[Build a local copy of the website|contribute/build/website]]\n"
" - [[Customize Tails|contribute/customize]]\n"
" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
" - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
diff --git a/wiki/src/contribute.fr.po b/wiki/src/contribute.fr.po
index 1a501eb..3c364f0 100644
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-08-20 12:11+0300\n"
+"POT-Creation-Date: 2015-10-13 12:48+0300\n"
"PO-Revision-Date: 2014-03-26 10:50+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -382,7 +382,7 @@ msgid ""
" - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
" can be filtered by type of work (see links in the sidebar)\n"
" - [[Building a Tails image|contribute/build]]\n"
-" - [[Build the website|contribute/build/website]]\n"
+" - [[Build a local copy of the website|contribute/build/website]]\n"
" - [[Customize Tails|contribute/customize]]\n"
" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
" - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index 6b7b0e3..2c6a352 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -135,7 +135,7 @@ Tools for contributors
- [Tasks](https://labs.riseup.net/code/projects/tails/issues)
can be filtered by type of work (see links in the sidebar)
- [[Building a Tails image|contribute/build]]
- - [[Build the website|contribute/build/website]]
+ - [[Build a local copy of the website|contribute/build/website]]
- [[Customize Tails|contribute/customize]]
- [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages
- [[APT repository|contribute/APT_repository]], to store our custom Debian packages
diff --git a/wiki/src/contribute.pt.po b/wiki/src/contribute.pt.po
index 8430c8c..87321ec 100644
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-20 12:11+0300\n"
+"POT-Creation-Date: 2015-10-13 12:48+0300\n"
"PO-Revision-Date: 2014-05-23 14:56-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
@@ -387,7 +387,19 @@ msgid "Source code: [[Git repositories|contribute/git]]"
msgstr "Código fonte: [[Repositórios git|contribute/git]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
+#| " - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
+#| " - [[Easy tasks|easy_tasks]] for new contributors\n"
+#| " - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
+#| " can be filtered by type of work (see links in the sidebar)\n"
+#| " - [[Building a Tails image|contribute/build]]\n"
+#| " - [[Build the website|contribute/build/website]]\n"
+#| " - [[Customize Tails|contribute/customize]]\n"
+#| " - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
+#| " - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
+#| " - [[Glossary for contributors|contribute/glossary]]\n"
msgid ""
" - [[Redmine bug tracker|contribute/working_together/Redmine]]\n"
" - [Roadmap](https://labs.riseup.net/code/projects/tails/roadmap)\n"
@@ -395,7 +407,7 @@ msgid ""
" - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
" can be filtered by type of work (see links in the sidebar)\n"
" - [[Building a Tails image|contribute/build]]\n"
-" - [[Build the website|contribute/build/website]]\n"
+" - [[Build a local copy of the website|contribute/build/website]]\n"
" - [[Customize Tails|contribute/customize]]\n"
" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
" - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
diff --git a/wiki/src/contribute/build/website.mdwn b/wiki/src/contribute/build/website.mdwn
index ad3d5f3..80eeba6 100644
--- a/wiki/src/contribute/build/website.mdwn
+++ b/wiki/src/contribute/build/website.mdwn
@@ -1,34 +1,82 @@
-[[!meta title="Build the wiki offline"]]
+[[!meta title="Build a local copy of the website"]]
-Here is how to build the wiki offline.
+The website [[https://tails.boum.org/]] is built using
+[Ikiwiki](https://ikiwiki.info) from source code that is available in
+our main Git repository, along with the rest of the Tails code.
-<div class="bug">
+You can build a local copy of the website on your computer. Building the
+website produces a set a HTML pages stored on your system that you can
+open in your usual web browser even while working offline. Doing so is
+useful for documentation writers and translators to see how their
+changes will apply on the website.
-<p>The following instructions don't work as such in Tails. See
-[[!tails_ticket 9018]] for a possible solution.</p>
+[[!toc]]
-</div>
+Build the website in Linux
+==========================
-If you have not done it before, update the list of packages known to Tails:
+1. Update the list of available packages:
- sudo apt-get update
+ sudo apt-get update
-Then install the dependencies:
+2. Install the required packages:
- sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
- perlmagick libyaml-syck-perl ikiwiki
+ sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
+ perlmagick libyaml-syck-perl ikiwiki
-Clone our main [[Git repository|git]]:
+3. Clone our main [[Git repository|git]]:
- git clone https://git-tails.immerda.ch/tails
+ git clone https://git-tails.immerda.ch/tails
-Then run the following command, at the root of the Git folder:
+[[!inline pages="contribute/build/website/src.inline" raw="yes"]]
- ./build-wiki
+4. Build the website:
-You can now browse the files in
+ cd tails
+ ./build-website
- ./config/chroot_local-includes/usr/share/doc/tails/website/
+[[!inline pages="contribute/build/website/languages.inline" raw="yes"]]
-To accelerate the build, you can disable some languages by editing the
-parameter `po_slave_languages` in ikiwiki.setup.
+5. You can now browse your local copy of the website in the following folder:
+
+ <span class="filename">config/chroot_local-includes/usr/share/doc/tails/website/</span>
+
+<a id="tails"></a>
+
+Build the website in Tails
+==========================
+
+1. [[Create and configure|doc/first_steps/persistence/configure]] a persistent volume and activate the following features:
+
+ - Personal Data
+ - APT Packages
+ - APT Lists
+
+2. Restart Tails, [[enable the persistence|doc/first_steps/persistence/use]], and [[set up an administration password|doc/first_steps/startup_options/administration_password]].
+
+3. Update the list of available packages:
+
+ sudo apt-get update
+
+4. Install the required packages:
+
+ sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
+ perlmagick libyaml-syck-perl ikiwiki
+
+5. Clone our main [[Git repository|git]] in the <span class="filename">Persistent</span> folder:
+
+ cd ~/Persistent/
+ git clone https://git-tails.immerda.ch/tails
+
+[[!inline pages="contribute/build/website/src.inline" raw="yes"]]
+
+6. Build the website:
+
+ cd tails
+ ./build-website --set destdir="/home/amnesia/Persistent/Tor Browser/tails" "$@"
+
+[[!inline pages="contribute/build/website/languages.inline" raw="yes"]]
+
+7. You can now visit the following link in <span class="application">Tor Browser</span> to browse your local copy of the website:
+
+ [[file:///home/amnesia/Persistent/Tor Browser/tails/index.en.html]]
diff --git a/wiki/src/contribute/build/website/languages.inline.mdwn b/wiki/src/contribute/build/website/languages.inline.mdwn
new file mode 100644
index 0000000..4c410e2
--- /dev/null
+++ b/wiki/src/contribute/build/website/languages.inline.mdwn
@@ -0,0 +1,5 @@
+ <div class="tip">
+ <p>To accelerate the build, you can disable some languages by editing
+ the <span class="code">po_slave_languages</span> parameter in the file
+ <span class="filename">ikiwiki.setup</span>.</p>
+ </div>
diff --git a/wiki/src/contribute/build/website/src.inline.mdwn b/wiki/src/contribute/build/website/src.inline.mdwn
new file mode 100644
index 0000000..80981dd
--- /dev/null
+++ b/wiki/src/contribute/build/website/src.inline.mdwn
@@ -0,0 +1,4 @@
+ <div class="tip">
+ <p>The source code of the website is located in the
+ <span class="filename">wiki/src/</span> folder.</p>
+ </div>
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 7c7eb86..4d6c12d 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,21 +1,36 @@
[[!meta title="Calendar"]]
-* 2015-09-03: [[Monthly meeting|contribute/meetings]]
-
-* 2015-09-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
-
-* 2015-09-22: Release 1.6 (anonym is the RM)
-
-* 2015-09-22: [Tails - Computer nutzen und Privatsphäre schützen](http://pentabarf.linkemedienakademie.de/export/lima15_2/events/158.de.html)
- by Vera Henssler and Ulrich Overdieck in Berlin, Germany (in German)
-
-* 2015-09-27 to 2015-10-02: Tor developers meeting in Berlin
-
-* 2015-09-29 to 2015-10-02: Farsi localization sprint in Amsterdam
-
* 2015-10-06 to 08: OTF Annual Summit in Washington DC
-* 2015-11-03: Release 1.7 (anonym is the RM)
+* 2015-10-26:
+ - Freeze Tails 1.7: All feature branches targeting Tails 1.7 should
+ be merged into the `devel` branch by noon, CET. I'm open to make
+ exceptions if you can be online and responsive during that
+ afternoon.
+ - Build and upload Tails 1.7~rc1.
+ - Start testing Tails 1.7~rc1 during late CET if building the image
+ went smoothly.
+
+* 2015-10-27:
+ - Finish testing Tails 1.7~rc1 by the afternoon, CET.
+ - Release Tails 1.7~rc1.
+
+* 2015-11-02:
+ - All new branches targeting Tails 1.7 must be merged into the
+ `testing` branch by noon CET. I'm open to make exceptions if you
+ can be online and responsive during that afternoon.
+ - Tor Browser 4.5.x, based on Firefox 38esr, is hopefully out so
+ we can import it.
+ - Build and upload Tails 1.7 ISO image and IUKs.
+ - Start testing Tails 1.7 during late CET if building the image
+ went smoothly.
+
+* 2015-11-03:
+ - Finish testing Tails 1.7 by the afternoon, CET.
+ - Release Tails 1.7 during late CET, earliest when Mozilla
+ publishes their MFSAs.
+
+* 2015-11-20 to 2015-11-22: User testing of the Installation Assistant
* 2015-12-15: Release 1.8 (anonym is the RM)
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 395b756..51ed8d6 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -712,8 +712,7 @@ extension).
that the Debian distribution does not provide or endorse Tails.
- [Tor](http://www.torproject.org/): anonymizing overlay network for
TCP. Our intention is to always use the latest stable version.
-- [Vidalia](https://www.torproject.org/projects/vidalia) is used
- to control Tor's behavior.
+- Vidalia is used to control Tor's behavior.
Being based in Debian, Tails benefits from its great package
management tools, facilitating its build and the inclusion of new
diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn
index fd1d39d..c5547aa 100644
--- a/wiki/src/contribute/git.mdwn
+++ b/wiki/src/contribute/git.mdwn
@@ -75,7 +75,7 @@ Repositories
Main repository
---------------
-This repository contains the Tails source code and the wiki source.
+This repository contains the Tails source code and the source of the website.
Anyone can check it out like this:
diff --git a/wiki/src/contribute/how/code.mdwn b/wiki/src/contribute/how/code.mdwn
index 3367a46..32f30a3 100644
--- a/wiki/src/contribute/how/code.mdwn
+++ b/wiki/src/contribute/how/code.mdwn
@@ -98,7 +98,7 @@ So you know what bug you want to fix, what feature you want to
implement. At this point, we advise you to:
1. **Gather results of previous research and discussions** on the
- topic you are interested in. Search this wiki, [[!tails_redmine ""
+ topic you are interested in. Search this website, [[!tails_redmine ""
desc="tickets on Redmine"]] and the [developers mailing-list
archive](https://mailman.boum.org/pipermail/tails-dev/).
2. **[[Tell us|contribute/talk]] about your plans** to make sure your
diff --git a/wiki/src/contribute/how/documentation.mdwn b/wiki/src/contribute/how/documentation.mdwn
index db2a55e..6bf40ae 100644
--- a/wiki/src/contribute/how/documentation.mdwn
+++ b/wiki/src/contribute/how/documentation.mdwn
@@ -28,10 +28,11 @@ But there are still many ways you can start contributing:
[[ask us for review|contribute/talk]].
- Small fixes and enhancements to the current documentation are
- greatly welcome. This can be done by [[sending us|contribute/talk]]
- Git patches, by publishing a [[Git]] branch, or simply by email on
- the public mailing list. In the general case, this work should be
- based on the `master` branch.
+ greatly welcome. This can be done by sending Git patches to [[the
+ tails-dev mailing list|contribute/talk]] or by publishing a
+ [[Git]] branch (for example to a fork on
+ [GitLab](https://gitlab.com/Tails/tails)). In general,
+ documentation changes should be based on the `master` branch.
Documentation writers coordinate themselves using our usual
[[development communication channels|contribute/talk]].
@@ -39,6 +40,10 @@ Documentation writers coordinate themselves using our usual
Documentation writers should also read our [[documentation
guidelines|guidelines]].
+New documentation should be wrapped to 80 characters; however, please
+do not submit patches that merely re-wrap existing text, as this makes
+it harder to read the git history.
+
We recommend you to [[build an offline version of the
documentation|contribute/build/website]] to test your contributions
before sharing them with us.
diff --git a/wiki/src/contribute/how/translate/team/fr.mdwn b/wiki/src/contribute/how/translate/team/fr.mdwn
index 90b4ef9..8516849 100644
--- a/wiki/src/contribute/how/translate/team/fr.mdwn
+++ b/wiki/src/contribute/how/translate/team/fr.mdwn
@@ -35,6 +35,8 @@ For French, various bits of text can be translated via Git:
* matsa: [[https://git-tails.immerda.ch/matsa/tails]]
* mercedes508: [[https://git-tails.immerda.ch/mercedes508]]
* seb35: [[https://git-tails.immerda.ch/seb35]]
+* elouann: [[http://git.tails.boum.org/elouann/tails/]]
+ * PGP fingerprint: `4C95 4E38 AC95 9C33 BD03 7A09 A29F 43F4 830F 0A36`
# Glossaries
diff --git a/wiki/src/contribute/how/translate/with_Git.mdwn b/wiki/src/contribute/how/translate/with_Git.mdwn
index d5e09e8..fc7b81f 100644
--- a/wiki/src/contribute/how/translate/with_Git.mdwn
+++ b/wiki/src/contribute/how/translate/with_Git.mdwn
@@ -18,7 +18,7 @@ If you want to use another operating system, these tools are:
* Git - manage source code
* Poedit - translate files
* OpenSSH client - publish your translations on the server
-* tools to [[build the wiki locally|contribute/build/website/]] in
+* tools to [[build a local copy of the website|contribute/build/website/]] in
order to check how it will look like
If you do not use Tails, please ensure that you use at least version 1.5 of Poedit,
diff --git a/wiki/src/contribute/l10n_tricks.mdwn b/wiki/src/contribute/l10n_tricks.mdwn
index 0571cd6..e646dd3 100644
--- a/wiki/src/contribute/l10n_tricks.mdwn
+++ b/wiki/src/contribute/l10n_tricks.mdwn
@@ -17,11 +17,11 @@ Calculate statistics on the translations
Run the [[language statistics.sh]] script.
-Build the wiki offline
-======================
+Build a local copy of the website
+=================================
-To check your translations before you send them, you may want to browse the
-wiki offline. See the [[corresponding documentation|contribute/build/website]].
+To check your translations before sending them, we recommend you [[build
+a local copy of the website|contribute/build/website]].
Search for fuzzy strings with Vim
=================================
diff --git a/wiki/src/contribute/meetings.mdwn b/wiki/src/contribute/meetings.mdwn
index fc29642..4ed8132 100644
--- a/wiki/src/contribute/meetings.mdwn
+++ b/wiki/src/contribute/meetings.mdwn
@@ -1,5 +1,7 @@
[[!meta title="Contributors meetings"]]
+[[!toc]]
+
Each month a contributors meeting is organized. It currently happens
on **third day** of the month on [[#tails-dev|contribute/chat]] at
9pm CEST or CET (7pm or 8pm UTC). Everybody is welcome to attend, existing
diff --git a/wiki/src/contribute/meetings/201510.mdwn b/wiki/src/contribute/meetings/201510.mdwn
new file mode 100644
index 0000000..f9d3658
--- /dev/null
+++ b/wiki/src/contribute/meetings/201510.mdwn
@@ -0,0 +1,42 @@
+[[!meta title="October 2015 online meeting"]]
+
+[[!toc levels=1]]
+
+# Volunteers to handle "[Hole in the roof](https://labs.riseup.net/code/versions/198)" tickets this month
+
+ - We closed [[!tails_ticket 7546 desc="Add MAC spoofing to the manual test suite"]].
+ - _adamb will give a try at [[!tails_ticket 8086 desc="Test our build system with Vagrant 1.6.x"]]
+
+# Important tickets flagged for next release but without assignee
+
+We didn't spot any ticket that needed to be reassigned.
+
+# Availability for LHF
+
+jvoisin, and u should be there.
+
+# Availability for the month
+
+ - u will work on Tails Installer, Icedove, TorBirdy, the mirror
+ infrastructure, and importing the Farsi translations.
+ - sajolida will work on the Installation Assistant, prepare the call for
+ donation of the end of the year, and other fundraising.
+ - muri will be translating and maybe do one or two small easy tasks.
+
+# [[!tails_ticket 10257 desc="Discuss & adopt a strategy to merge commits from Weblate"]]
+
+We realized that this was highly dependent on the way we could implement a
+review process inside Weblate which was something in the original list of
+requirements ("MUST: provide user roles (admin, reviewer, translator"). We
+created a ticket to investigate this [[!tails_ticket 10331 desc="#10331"]].
+
+# [[!tails_ticket 10179 desc="Document mentors for new contributors"]]
+
+We agreed on creating a dedicated page for that and linking it close to the
+[[Easy tasks|contribute/easy_tasks]], probably as a new H3 headers under "Tools
+for contributors".
+
+# [[!tails_ticket 10024 desc="Document issues behind having Tails derivatives"]]
+
+We reviewed the draft by sajolida. Other examples were mentioned such as
+supporting other cryptcurrencies or different pluggable transports.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 53ad210..7a94c19 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -306,7 +306,7 @@ matches the date of the future signature.
echo "$RELEASE_DATE" > wiki/src/inc/stable_i386_date.html
sed -ri "s%news/version_.*]]%news/version_$VERSION]]%" wiki/src/inc/stable_i386_release_notes.*
$EDITOR wiki/src/inc/*.html
- ./build-wiki
+ ./build-website
git commit wiki/src/inc/ -m "Update version and date for $VERSION."
### features and design documentation
@@ -328,7 +328,7 @@ pages that were added or changed accordingly to changes coming with
the new release. This e.g. ensures that the RC call for translation
points translators to up-to-date PO files:
- ./build-wiki && git add wiki/src && git commit -m 'Update website PO files.'
+ ./build-website && git add wiki/src && git commit -m 'Update website PO files.'
Call for translation
====================
@@ -692,6 +692,13 @@ Make sure every webserver listed in the `dl.amnesia.boum.org` round
robin pool has the new version. Drop those that are lagging behind and
notify their administrators.
+ISO history
+-----------
+
+Push the released ISO to our Tails ISO history git-annex repo, so that
+our isotesters can fetch it from there and not fail to test because of
+it missing. How to do it is described in our internal Git repo.
+
Update the website and Git repository
=====================================
@@ -809,7 +816,7 @@ Write the announcement for the release in
In any case
-----------
-Generate PO files for the announcements with `./build-wiki`.
+Generate PO files for the announcements with `./build-website`.
Then, send them to <tails-l10n@boum.org> so that they get translated
shortly, perhaps even soon enough to integrate them before pushing the
@@ -869,6 +876,7 @@ repository like this:
git push origin master:master \
)
+
Bug tracker
-----------
diff --git a/wiki/src/contribute/release_process/liveusb-creator.mdwn b/wiki/src/contribute/release_process/liveusb-creator.mdwn
index 1afa3d0..1f5c1f4 100644
--- a/wiki/src/contribute/release_process/liveusb-creator.mdwn
+++ b/wiki/src/contribute/release_process/liveusb-creator.mdwn
@@ -1,103 +1,191 @@
[[!meta title="Releasing liveusb-creator"]]
-[[!toc levels=1]]
+[[!toc levels=3]]
-Upstream and packaging
-======================
+The big picture
+===============
+
+Upstream
+--------
For this package, "upstream" means, from a Debian packaging
-point-of-view, the state of our master branch. Let's not pretend we
+point-of-view, the state of our upstream branches. Let's not pretend we
have not forked liveusb-creator, and admit we are now upstream for our
own version.
-Still, most of the time, we will be releasing -N "Debian"-specific
-packages, that really are packaged Git snapshots, rather than new
-"upstream" releases. Only when we really need it, we will update the
-"orig" tarball from our master branch.
+The `master` branch must always be the one that targets current Tails.
+That's what we have always done, and right
+now `master` is indeed targeting Wheezy.
+
+But that's not enough, since we also need to put releases out with code
+that works on current Debian testing/sid. Thus, we maintain several upstream
+release branches in parallel, each with their own major version number:
+
+ * for releases that target Wheezy:
+ * version = `3.*`
+ * tag = `tails-installer_3.*`
+ * for work and releases that target Jessie (and, as long as compatible,
+ that target testing/sid as well):
+ * branch = feature/jessie (that's what we've been doing so far)
+ * version = `4.*`
+ * tag = `tails-installer_4.*`
+
+Once we can't support both Jessie and testing/sid with the same
+codebase anymore, we'll fork a new upstream release branch that targets Stretch,
+it'll be called feature/stretch, use version `5.*`, etc.
+
+Packaging
+---------
+
+We're using [DEP-14 conventions](http://dep.debian.net/deps/dep14/),
+except for our `master` branch which is used for upstream development
+targetted at current Tails, as said above. More specifically:
+
+* The `pristine-tar` branch contains the binary delta between DFSG-freed
+ tarballs and the corresponding tag. It's automatically maintained by
+ `gbp import-orig`.
+* The `debian/sid` branch is used to build the package that we upload to
+ Debian unstable. The tags on this branch are called `debian/$package_version`,
+ which is the default when creating them with
+ `gbp buildpackage --git-sign-tags --git-tag-only`;
+ in practice this is something like `debian/4.0+dfsg-1`.
+* The `debian/$codename-backports` branch is used to prepare packages
+ that we upload to the official backports repository for Debian `$codename`.
+ E.g. here we want to have `debian/jessie-backports` soon after the initially
+ uploaded package reaches Debian testing. The tags on this branch are also called
+ `debian/$package_version`. In practice this is something like
+ `debian/4.0+dfsg-1~bpo8+1`.
+* The `tails/$codename` branch is used to prepare packages that we upload
+ to the Tails APT repo, but not to Debian -- e.g. `3.*` as currently used on
+ Tails/Wheezy will never be uploaded to Debian.
+* Additionally, we use `tails/$feature` branches for other Tails-specific packaging branches.
+* The `upstream/3.x+dfsg`, `upstream/4.x+dfsg`, etc. branches are what we tell `gbp`
+ to use as its "upstream" branch.
Topic branches
-==============
+--------------
+
+In practice, it's expected that Tails contributors submit bugfix and
+feature branches forked off master, because they want them part of next
+Tails release. Hence, it will happen that code lands into master first,
+and in turn into a new `3.*` upstream release, before it lands into
+`feature/jessie` and in turn into a new `4.*` upstream release.
-For how to package `bugfix` and `feature`, see
+For how to package topic branches (`bugfix/*` and `feature/*`), see
[[the dedicated page|topic_branch]].
-Tidy up upstream source
-=======================
+Workflow
+========
-Merge new Fedora's changes if needed:
+Release a new upstream version
+------------------------------
- git checkout master
- git remote add fedora git://git.fedorahosted.org/git/liveusb-creator
- git fetch fedora
- git remote add lmacken https://github.com/lmacken/liveusb-creator.git
- git fetch lmacken
+<a id="upstream-prepare"></a>
-Then see if they have tagged a release that we haven't merged yet,
-and merge the release tag if needed (in advance before the freeze,
-and following our usual review'n'merge process).
+### Prepare the environment
-Do extra changes if needed.
+The new upstream version should be something like `3.14`, based on the
+upstream branch you are building the Debian package for. Adjust and
+export:
-Generate a new upstream tarball
-===============================
+ export NEW_UPSTREAM_VERSION=3.replace_me
+ export UPSTREAM_DEV_BRANCH=master
-**If needed** (that is, basically if dpkg-source complains, when
-running git-buildpackage below, that it cannot represent changes in
-binary files), generate a new upstream tarball from the tip of our
-master branch.
+<a id="upstream-tag"></a>
-The new upstream version should be something like `3.11.6+tails1`:
-only increment the number after `+tails` if the new release is still
-based on Fedora's 3.11.6. Else, set the part before `+tails` to the
-new Fedora release's version number, and reset the right side to
-`+tails1`.
+### Tag the new version
- export NEW_UPSTREAM_VERSION=XXX
- git archive --prefix=git/ \
- --output=../tarballs/liveusb-creator_$NEW_UPSTREAM_VERSION.orig.tar.xz \
- master
+ git checkout "$UPSTREAM_DEV_BRANCH" && \
+ ./setup.py build && \
+ (cd po && \
+ for po in *.po ; do msgmerge --update "$po" \
+ liveusb-creator.pot ; done \
+ ) && \
+ git commit po -m 'Update POT and PO files.' && \
+ git tag \
+ -s "tails-installer_$NEW_UPSTREAM_VERSION" \
+ -m "Releasing Tails Installer $NEW_UPSTREAM_VERSION" && \
+ git push origin "$UPSTREAM_DEV_BRANCH" && \
+ git push origin --tags
-Update the Debian package
-=========================
+<a id="upstream-tarball"></a>
+
+### Generate a new upstream tarball
+
+ mkdir -p ../tarballs && \
+ git archive \
+ --prefix="liveusb-creator-$NEW_UPSTREAM_VERSION/" \
+ --output="../tarballs/liveusb-creator_$NEW_UPSTREAM_VERSION.tar.gz" \
+ "$UPSTREAM_DEV_BRANCH"
+
+<a id="tails-package"></a>
+
+Update the Debian package for Tails
+-----------------------------------
+
+Checkout the packaging branch, that would be `tails/wheezy` or `tails/jessie`,
+for example:
+
+ export PACKAGING_BRANCH=tails/jessie
+ git checkout "$PACKAGING_BRANCH"
+
+Verify that `debian/gbp.conf` references the correct upstream and Debian (packaging) branches,
+and that `pristine-tar` usage is enabled, e.g.:
+
+ [DEFAULT]
+ upstream-branch = upstream/4.x+dfsg
+ debian-branch = tails/jessie
+ pristine-tar = True
-Checkout the branch with Debian package specifics:
+Extract the upstream and packaging branch from gbp.conf:
- git checkout debian
+ export UPSTREAM_BRANCH=`gbp config buildpackage.upstream-branch | sed -r -e 's,.*=,,'`
-Merge upstream changes:
+Create a DFSG-compatible tarball from the previously created Git
+archive and reimport it into the source tree. This merges, into the
+`debian-branch` specified in `gbp.conf`, not only the commit that
+imported the current DFSG free upstream tarball into the
+`upstream-branch`, but also the corresponding upstream Git history:
- git merge master
+ mk-origtargz \
+ -C ../tarballs \
+ --version "$NEW_UPSTREAM_VERSION+dfsg" \
+ --copy \
+ ../tarballs/liveusb-creator_$NEW_UPSTREAM_VERSION.tar.gz && \
+ gbp import-orig \
+ --upstream-vcs-tag="tails-installer_$NEW_UPSTREAM_VERSION" \
+ ../tarballs/liveusb-creator_$NEW_UPSTREAM_VERSION+dfsg.orig.tar.gz
Update `debian/changelog`:
gbp dch && dch -e
-(Do not forget to set the appropriate release.)
+In there, set the appropriate:
-Commit:
+* version number, such as `4.3+dfsg-0tails1`; in particular, note that
+ the Debian revision starts with `-0` for any package meant for the
+ Tails APT repository, while the first package that will be uploaded
+ to Debian will have `-1`;
+* target release name.
+
+Commit the changelog:
git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
-Build a new Debian package (use a Wheezy/i386 chroot):
+Build a new Tails package (use a i386 chroot that matches the target distribution):
gbp buildpackage
-If `gbp buildpackage` complains about a missing `upstream/$VERSION`,
-then manually download the corresponding tarball (which can be found
-in our Debian repo unless upstream just had a new release) and place
-it in `..`, and then re-run the command with `--git-no-pristine-tar`.
-
Add a signed tag to the Git repository and push the changes:
gbp buildpackage --git-tag-only --git-sign-tags && \
- git push origin master:master \
- debian:debian && \
- git push --tags
-
-(Make sure both `master` and `debian` are pushed.)
+ git push origin "$UPSTREAM_BRANCH" \
+ "$PACKAGING_BRANCH" \
+ pristine-tar && \
+ git push origin --tags
Add the Debian package to Tails
-===============================
+-------------------------------
Sign the package:
@@ -106,3 +194,28 @@ Sign the package:
Upload:
dupload --to tails $CHANGES_FILE
+
+Update the Debian package
+-------------------------
+
+This assumes that the latest upstream release has been imported into
+a Tails packaging branch (e.g. `tails/jessie`) already.
+
+And then, a maintainer of `tails-installer` in Debian updates the
+package in sid accordingly, for example:
+
+* check out the `debian/sid` branch
+* merge the `tails/jessie` branch
+* bump version to `4.3+dfsg-1`
+* build, test and upload to sid
+* have gbp create a `debian/4.3+dfsg-1` tag
+* push the Debian packaging branch (`debian/sid`) and the new tag
+
+Example for a backport to Jessie:
+
+* check out the `debian/jessie-backports` branch
+* merge the `debian/sid` branch
+* `dch --bpo` to bump version to `4.3+dfsg-1~bpo8+1`
+* build, test and upload to jessie-backports
+* have gbp create a `debian/4.3+dfsg-1_bpo8+1` tag
+* push the Debian packaging branch (`debian/jessie-backports`) and the new tag
diff --git a/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn b/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn
index 4fe9b93..190ee93 100644
--- a/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn
+++ b/wiki/src/contribute/release_process/liveusb-creator/topic_branch.mdwn
@@ -1,19 +1,53 @@
[[!meta title="Packaging liveusb-creator topic branches"]]
-Let's say your branch is `feature/$TOPIC`, then you package it as
-follows:
-
-1. `git checkout -b debian_$TOPIC debian`
-2. `git merge feature/$TOPIC`
-3. Use `git-dch --auto --snapshot --ignore-branch` to fill `debian/changelog`, and
- insert something like "+feature.$TOPIC.1bugfix-6092-drop-racy-code" (with all special
- characters changed to full stops, i.e. ".") between the version
- last packaged in the "debian" branch, and the gbp snapshot number
- (that looks like "~1.gbpNNNNNN"). In the end, if `$TOPIC =
- 7000-blah-bleh` it should look something like:
- 3.11.6+tails1-4+feature.7000.blah.bleh~1.gbp4a0c9c
-4. Commit the changelog:
-
- git commit debian/changelog
-
-5. Build with `git-buildpackage --git-ignore-branch`.
+Let's say you want to build a package for a topic branch called
+`bugfix/12345-blah`. Please read on.
+
+<div class="note">
+
+If your topic branch has been forked off a different branch than
+<code>master</code>, then you need to adjust the following
+instructions a bit: not only you need to replace occurrences of
+<code>master</code>, but your <code>TARGET_DIST</code> will also
+be different.
+
+</div>
+
+Prepare the environment:
+
+ export TARGET_DIST="tails/wheezy
+ export TOPIC="bugfix/12345-blah"
+
+Fork the appropriate packaging branch into a new one that's dedicated
+to packaging the work that your topic branch introduces:
+
+ git checkout -b "tails/$TOPIC" "$TARGET_DIST"
+
+Create a patch representing the delta you want to add to the package,
+and import it into the current packaging branch as a quilt patch:
+
+ PATCH="$(mktemp).diff"
+ git diff "master..$TOPIC" > "$PATCH" && \
+ quilt import "$PATCH" && \
+ git add debian/patches/ && \
+ git commit -m "Import diff for $TOPIC as a quilt patch."
+
+Fill `debian/changelog`:
+
+ gbp dch --auto --snapshot --ignore-branch
+
+Then, insert something like `+bugfix.12345.blah` (with all special
+characters changed to full stops, i.e. ".") between the version last
+packaged in the `$TARGET_DIST` branch, and the gbp snapshot number (that
+looks like `~1.gbpNNNNNN`). In our example, it should look something
+like `4.3+dfsg-0tails1+bugfix.12345.blah~1.gbp4a0c9c` in the end.
+
+Verify the changelog manually.
+
+Commit:
+
+ git commit debian/changelog
+
+Build in a suitable chroot with:
+
+ gbp buildpackage --git-ignore-branch
diff --git a/wiki/src/contribute/release_process/test.mdwn b/wiki/src/contribute/release_process/test.mdwn
index d145772..20fa49d 100644
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
@@ -81,12 +81,13 @@ tracked by tickets prefixed with `todo/test_suite:`.
* Run the [tests the TBB folks
use](https://trac.torproject.org/projects/tor/wiki/doc/build/BuildSignoff#TestPagestoUse).
+ (automate: [[!tails_ticket 10260]])
* Compare the fingerprint of Tails and the latest TBB using at least
<https://panopticlick.eff.org/>
- The exposed User-Agent should match the latest TBB's one.
- Update the [[fingerprint section|support/known_issues#fingerprint]] of the
- known issues page if needed.
-* WebRTC should be disabled:
+ known issues page if needed. (automate: [[!tails_ticket 10262]])
+* WebRTC should be disabled: (automate: [[!tails_ticket 10264]])
- In `about:config` check that `media.peerconnection.enabled` is set to
`false`.
- <http://mozilla.github.io/webrtc-landing/>, especially the `getUserMedia`
@@ -96,12 +97,13 @@ tracked by tickets prefixed with `todo/test_suite:`.
`ifconfig | grep inet | grep -v inet6 | cut -d" " -f2 | tail -n1`
* One should be able to switch identities from the web browser.
* Running `getTorBrowserUserAgent` should produce the User-Agent set by the
- installed version of Torbutton, and used in the Tor Browser.
+ installed version of Torbutton, and used in the Tor Browser. (automate: [[!tails_ticket 10268]])
# Tor
* The version of Tor should be the latest stable one, which is the highest version number
- before alpha releases on <http://deb.torproject.org/torproject.org/pool/main/t/tor/>.
+ before alpha releases on <http://deb.torproject.org/torproject.org/pool/main/t/tor/>. (automate:
+ [[!tails_ticket 10259]])
# Claws
@@ -144,20 +146,20 @@ tracked by tickets prefixed with `todo/test_suite:`.
# Erase memory on shutdown
-- `memlockd` must be running
- After booting from DVD, remove Tails boot medium and check that the
memory erasure process is started (`Loading new kernel`, at least).
(automate: [[!tails_ticket 5472]])
- After booting from USB, remove Tails boot medium and check that the
memory erasure process is started (`Loading new kernel`, at least).
+ (automate: [[!tails_ticket 5472]])
# Root access control
* Check you can login as root with `su` neither with the `amnesia` password nor
- with the `live` one.
+ with the `live` one. (automate: [[!tails_ticket 10274]])
* Check that the `$TAILS_USER_PASSWORD` variable, if still existing in the system
environment after the boot has finished, does not contain the clear text
- password.
+ password. (automate: [[!tails_ticket 10275]])
# Virtualization support
@@ -286,16 +288,16 @@ Start I2P by appending `i2p` to the kernel command line.
Enable I2P in the boot loader menu, and enable Windows camouflage via
the Tails Greeter checkbox, and then:
-* Tails OpenPGP Applet's context menu should look readable
+* Tails OpenPGP Applet's context menu should look readable (automate: [[!tails_ticket 10255]])
* The Tor Browser, Unsafe Browser and I2P Browser should all use the
- Internet Explorer theme.
-* Vidalia should not start.
+ Internet Explorer theme. (automate: [[!tails_ticket 10258]])
+* Vidalia should not start. (automate: [[!tails_ticket 10256]])
# Unsafe Web Browser
-* Browsing (by IP) a FTP server on the LAN should be possible.
+* Browsing (by IP) a FTP server on the LAN should be possible. (automate: [[!tails_ticket 10252]])
-* Google must be the default, pre-selected search plugin.
+* Google must be the default, pre-selected search plugin. (automate: [[!tails_ticket 10253]])
# Real (non-VM) hardware
@@ -315,20 +317,20 @@ the Tails Greeter checkbox, and then:
- in one language to which the website is translated
- in one language to which the website is not translated (=> English)
* Browse around in the documentation shipped in the image. Internal
- links should be fine.
+ links should be fine. (automate: [[!tails_ticket 10254]])
# Internationalization
Boot and check basic functionality is working for every supported
language. You *really* have to reboot between each language.
-* The chosen keyboard layout must be applied.
+* The chosen keyboard layout must be applied. (automate: [[!tails_ticket 10261]])
* The virtual keyboard must work and be auto-configured to use the same keyboard
- layout as the X session.
+ layout as the X session. (automate: [[!tails_ticket 10263]])
* In the Tor Browser:
- - Disconnect.me must be the default, pre-selected search plugin.
+ - Disconnect.me must be the default, pre-selected search plugin. (automate: [[!tails_ticket 10265]])
- the Disconnect.me, Startpage and Wikipedia search plugins must be
- localized for the supported locales:
+ localized for the supported locales (automate: [[!tails_ticket 10267]]):
. /usr/local/lib/tails-shell-library/tor-browser.sh
supported_tor_browser_locales
@@ -336,21 +338,21 @@ language. You *really* have to reboot between each language.
## Spellchecking
* Check that every supported language is listed in the list of languages for
- spell checking.
+ spell checking. (automate: [[!tails_ticket 10269]])
- Visit <https://translate.google.com/>.
- Right-click and choose "Check spelling".
- Right-click and check the list of available languages.
* For a few languages, check the spell checking:
- Type something in the textarea.
- Right-click and select a language.
- - Verify that the spelling suggestion are from that language.
+ - Verify that the spelling suggestion are from that language. (automate: [[!tails_ticket 10271]])
* Once [[!tails_ticket 5962]] is fixed, the browser spelling dictionary must be
- localized (for languages that are supported by our branding extension).
+ localized (for languages that are supported by our branding extension). (automate: [[!tails_ticket 10272]])
# Misc
* Check that Tails Greeter's "more options" screen displays properly
on a display with 600 px height, preferably in a language that's
- more verbose than English (e.g. French).
+ more verbose than English (e.g. French). (automate: [[!tails_ticket 10276]])
* Check that all seems well during init (mostly that all services
- start without errors), and that `/var/log/syslog` seems OK.
+ start without errors), and that `/var/log/syslog` seems OK. (automate: [[!tails_ticket 10277]])
diff --git a/wiki/src/doc/about/features.de.po b/wiki/src/doc/about/features.de.po
index 239dd95..a77c391 100644
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
@@ -60,7 +60,7 @@ msgid ""
"* [Tor](https://www.torproject.org) with:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
" - regular, obfs2, obfs3, obfs4, and ScrambleSuit bridges support\n"
-" - the [Vidalia](https://www.torproject.org/projects/vidalia) graphical frontend ([[More...|doc/anonymous_internet/vidalia]])\n"
+" - the Vidalia graphical frontend ([[More...|doc/anonymous_internet/vidalia]])\n"
"* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy\n"
" network configuration ([[More...|doc/anonymous_internet/networkmanager]])\n"
"* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[More...|doc/anonymous_internet/Tor_Browser]]), a web\n"
@@ -87,7 +87,7 @@ msgstr ""
"* [Tor](https://www.torproject.org) mit:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
" - Unterstützung von normalen, obfs2, obfs3, obfs4 und ScrambleSuit Bridges\n"
-" - dem grafischen Front-End [Vidalia](https://www.torproject.org/projects/vidalia) ([[Mehr...|doc/anonymous_internet/vidalia]])\n"
+" - dem grafischen Front-End Vidalia ([[Mehr...|doc/anonymous_internet/vidalia]])\n"
"* [NetworkManager](http://projects.gnome.org/NetworkManager/) für einfache\n"
" Netzwerkkonfiguration ([[Mehr...|doc/anonymous_internet/networkmanager]])\n"
"* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.de) ([[Mehr...|doc/anonymous_internet/Tor_Browser]]), ein Webbrowser\n"
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index c174dd3..226bc46 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -60,7 +60,7 @@ msgid ""
"* [Tor](https://www.torproject.org) with:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
" - regular, obfs2, obfs3, obfs4, and ScrambleSuit bridges support\n"
-" - the [Vidalia](https://www.torproject.org/projects/vidalia) graphical frontend ([[More...|doc/anonymous_internet/vidalia]])\n"
+" - the Vidalia graphical frontend ([[More...|doc/anonymous_internet/vidalia]])\n"
"* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy\n"
" network configuration ([[More...|doc/anonymous_internet/networkmanager]])\n"
"* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[More...|doc/anonymous_internet/Tor_Browser]]), a web\n"
@@ -87,7 +87,7 @@ msgstr ""
"* [Tor](https://www.torproject.org) avec :\n"
" - [[isolation de flux|contribute/design/stream_isolation]]\n"
" - prise en charge des bridges normaux, obfs2, obfs3, obfs4 et ScrambleSuit\n"
-" - l'interface graphique [Vidalia](https://www.torproject.org/projects/vidalia) ([[Plus d'information...|doc/anonymous_internet/vidalia]])\n"
+" - l'interface graphique Vidalia ([[Plus d'information...|doc/anonymous_internet/vidalia]])\n"
"* [NetworkManager](http://projects.gnome.org/NetworkManager/) pour une\n"
" configuration réseau simple ([[Plus d'information...|doc/anonymous_internet/networkmanager]])\n"
"* Le [navigateur Tor](https://www.torproject.org/projects/torbrowser.html.en) ([[Plus d'information...|doc/anonymous_internet/Tor_Browser]]), un navigateur\n"
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index 38d4ad8..b2ae50d 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -18,7 +18,7 @@ Networking
* [Tor](https://www.torproject.org) with:
- [[stream isolation|contribute/design/stream_isolation]]
- regular, obfs2, obfs3, obfs4, and ScrambleSuit bridges support
- - the [Vidalia](https://www.torproject.org/projects/vidalia) graphical frontend ([[More...|doc/anonymous_internet/vidalia]])
+ - the Vidalia graphical frontend ([[More...|doc/anonymous_internet/vidalia]])
* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy
network configuration ([[More...|doc/anonymous_internet/networkmanager]])
* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[More...|doc/anonymous_internet/Tor_Browser]]), a web
diff --git a/wiki/src/doc/about/features.pt.po b/wiki/src/doc/about/features.pt.po
index 694fb96..ca22d2c 100644
--- a/wiki/src/doc/about/features.pt.po
+++ b/wiki/src/doc/about/features.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
+"POT-Creation-Date: 2015-10-21 09:30+0200\n"
"PO-Revision-Date: 2014-08-14 15:59+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -85,7 +85,7 @@ msgid ""
"* [Tor](https://www.torproject.org) with:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
" - regular, obfs2, obfs3, obfs4, and ScrambleSuit bridges support\n"
-" - the [Vidalia](https://www.torproject.org/projects/vidalia) graphical frontend ([[More...|doc/anonymous_internet/vidalia]])\n"
+" - the Vidalia graphical frontend ([[More...|doc/anonymous_internet/vidalia]])\n"
"* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy\n"
" network configuration ([[More...|doc/anonymous_internet/networkmanager]])\n"
"* [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) ([[More...|doc/anonymous_internet/Tor_Browser]]), a web\n"
diff --git a/wiki/src/doc/about/requirements.de.po b/wiki/src/doc/about/requirements.de.po
index 8b433c2..83ce086 100644
--- a/wiki/src/doc/about/requirements.de.po
+++ b/wiki/src/doc/about/requirements.de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails website\n"
"POT-Creation-Date: 2015-08-10 19:28+0200\n"
-"PO-Revision-Date: 2014-07-18 23:40+0100\n"
-"Last-Translator: Tails translators <amnesia@boum.org>\n"
+"PO-Revision-Date: 2015-10-02 19:56+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: de_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"
+"X-Generator: Poedit 1.6.10\n"
#. type: Plain text
#, no-wrap
@@ -56,14 +56,10 @@ msgstr ""
"kompatibel zu IBM-PCs."
#. type: Bullet: '- '
-#, fuzzy
-#| msgid ""
-#| "**1 GB of RAM** to work smoothly. Tails is known to work with less memory "
-#| "but you might experience strange behaviours or crashes."
msgid ""
"**2 GB of RAM** to work smoothly. Tails is known to work with less memory "
"but you might experience strange behaviours or crashes."
msgstr ""
-"Tails braucht **1GB RAM**, um sauber zu arbeiten. Notfalls läuft es auch mit "
-"weniger Arbeitsspeicher, allerdings kann es dann zu unerwarteten Störungen "
-"oder Systemabstürzen kommen."
+"**2GB RAM**, um sauber zu arbeiten. Notfalls läuft es auch mit weniger "
+"Arbeitsspeicher, allerdings kann es dann zu unerwarteten Störungen oder "
+"Systemabstürzen kommen."
diff --git a/wiki/src/doc/about/tor.fr.po b/wiki/src/doc/about/tor.fr.po
index 277e2cf..7c3d930 100644
--- a/wiki/src/doc/about/tor.fr.po
+++ b/wiki/src/doc/about/tor.fr.po
@@ -5,16 +5,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-02-22 12:54+0100\n"
-"PO-Revision-Date: 2015-01-18 11:06-0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-12 21:56+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \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.6.10\n"
+"Language: fr\n"
#. type: Plain text
#, no-wrap
@@ -23,7 +23,8 @@ msgstr "[[!meta title=\"Pourquoi Tails utilise Tor ?\"]]\n"
#. type: Plain text
msgid "Tails uses Tor because it is the best available anonymity network."
-msgstr "Tails utilise Tor car c'est le meilleur réseau d'anonymat disponible."
+msgstr ""
+"Tails utilise Tor car c'est le meilleur réseau d'anonymisation disponible."
#. type: Title =
#, no-wrap
@@ -38,7 +39,7 @@ msgid ""
msgstr ""
"Nous voulons renforcer une bonne sécurité par défaut à nos utilisateurs. "
"C'est pourquoi il est dans les conditions fondamentales de Tails de forcer "
-"tout le trafic sortant à passer dans des réseau d'anonymisation tel que Tor."
+"tout le trafic sortant à passer dans des réseaux d'anonymisation tel que Tor."
#. type: Plain text
msgid ""
@@ -57,8 +58,8 @@ msgid ""
"in the network to know both the origin and the destination of a connection."
msgstr ""
"Les Virtual Private Networks (VPNs) pourraient être plus rapide que Tor mais "
-"ne ils sont pas des réseaux d'anonimysation , car les administrateurs des "
-"VPN peuvent savoir à la fois d'où vous vous connectez et vers où vous vous "
+"ils ne sont pas des réseaux d'anonymisation, car les administrateurs des VPN "
+"peuvent savoir à la fois d'où vous vous connectez et vers où vous vous "
"connectez et ainsi briser votre anonymat. Tor fournit de l'anonymat en "
"rendant impossible pour un unique point du réseau de savoir à la fois "
"l'origine et la destination d'une connexion."
@@ -104,7 +105,7 @@ msgstr ""
"d'entreprises, des militaires, des victimes d'abus et des citoyens lambda "
"concernés par leur vie privée. En fait cette diversité permet un anonymat "
"plus fort à chacun en rendant plus difficile d'identifier ou de cibler un "
-"profile d'utilisateur de Tor spécifique. L'anonymat aime la compagnie."
+"profil d'utilisateur de Tor spécifique. L'anonymat aime la compagnie."
#. type: Title =
#, no-wrap
@@ -128,7 +129,7 @@ msgid ""
"Software Foundation](https://www.fsf.org/news/2010-free-software-awards-"
"announced) to name a few."
msgstr ""
-"Tor a reçu des récompenses d' institutions comme la [Electronic Frontier "
+"Tor a reçu des récompenses d'institutions comme la [Electronic Frontier "
"Foundation](https://www.eff.org/awards/pioneer/2012), et la [Free Software "
"Foundation](https://www.fsf.org/news/2010-free-software-awards-announced) "
"pour ne nommer qu'elles."
@@ -148,7 +149,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"relationship\"></a>\n"
-msgstr ""
+msgstr "<a id=\"relationship\"></a>\n"
#. type: Title =
#, no-wrap
@@ -179,7 +180,7 @@ msgid ""
"class=\"application\">Tor Browser</span>).\n"
msgstr ""
"Tails est un système d'exploitation complet qui utilise Tor en tant qu'application\n"
-"réseau par défaut. The Tor Project recommande l'utilisation de Tails pour les cas\n"
+"réseau par défaut. Le projet Tor recommande l'utilisation de Tails pour les cas\n"
"d'usages non pris en compte par leurs propres projets (par exemple le\n"
"<span class=\"application\">navigateur Tor</span>).\n"
diff --git a/wiki/src/doc/about/warning.de.po b/wiki/src/doc/about/warning.de.po
index f94527f..46f3886 100644
--- a/wiki/src/doc/about/warning.de.po
+++ b/wiki/src/doc/about/warning.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-03 11:42+0300\n"
+"POT-Creation-Date: 2015-10-11 18:23+0300\n"
"PO-Revision-Date: 2015-01-16 21:52-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -231,12 +231,18 @@ msgstr ""
"die Tatsache, dass Sie Tor verwenden, zu verschleiern.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "**The destination server that you are contacting through Tor** can know whether your\n"
+#| "communication comes out from a Tor exit node by consulting the publicly\n"
+#| "available list of exit nodes that might contact it. For example using the [Tor\n"
+#| "Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) of\n"
+#| "the Tor Project.\n"
msgid ""
"**The destination server that you are contacting through Tor** can know whether your\n"
-"communication comes out from a Tor exit node by consulting the publicly\n"
+"communication comes from a Tor exit node by consulting the publicly\n"
"available list of exit nodes that might contact it. For example using the [Tor\n"
-"Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) of\n"
+"Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) from\n"
"the Tor Project.\n"
msgstr ""
"**Der Zielserver, den Sie über Tor kontaktieren**, kann durch Abfragen der öffentlichen Liste\n"
@@ -320,13 +326,21 @@ msgstr ""
"bei der Überprüfung der Authentizität der Server walten lassen sollten.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Usually, this is automatically done throught SSL certificates checked by your\n"
+#| "browser against a given set of recognized [[!wikipedia\n"
+#| "Certificate_authority desc=\"certificate authorities\"]]).\n"
+#| "If you get a security exception message such as this one you might be victim of\n"
+#| "a man-in-the-middle attack and should not bypass it unless you have another\n"
+#| "trusted way of checking the certificate's fingerprint with the people running\n"
+#| "the service.\n"
msgid ""
"Usually, this is automatically done throught SSL certificates checked by your\n"
"browser against a given set of recognized [[!wikipedia\n"
"Certificate_authority desc=\"certificate authorities\"]]).\n"
-"If you get a security exception message such as this one you might be victim of\n"
-"a man-in-the-middle attack and should not bypass it unless you have another\n"
+"If you get a security exception message such as this one you might be the victim of\n"
+"a man-in-the-middle attack and should not bypass the warning unless you have another\n"
"trusted way of checking the certificate's fingerprint with the people running\n"
"the service.\n"
msgstr ""
@@ -344,18 +358,32 @@ msgid "[[!img ssl_warning.png link=no alt=\"This Connection is Untrusted\"]]\n"
msgstr "[[!img ssl_warning.png link=no alt=\"Dieser Verbindung wird nicht vertraut\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "But on top of that the certificate authorities model of trust on Internet "
+#| "is susceptible to various methods of compromise."
msgid ""
-"But on top of that the certificate authorities model of trust on Internet is "
-"susceptible to various methods of compromise."
+"But on top of that the certificate authorities model of trust on the "
+"Internet is susceptible to various methods of compromise."
msgstr ""
"Allerdings kommt noch hinzu, dass das Vertrauensmodell mit "
"Zertifizierungsstellen im Internet anfällig gegenüber zahlreicher Methoden "
"der Kompromittierung ist."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, on March 15, 2011, Comodo, one of the major SSL certificates "
+#| "company, reported that a user account with an affiliate registration "
+#| "authority had been compromised. It was then used to create a new user "
+#| "account that issued nine certificate signing requests for seven domains: "
+#| "mail.google.com, login.live.com, www.google.com, login.yahoo.com (three "
+#| "certificates), login.skype.com, addons.mozilla.org, and global trustee. "
+#| "See [Comodo: The Recent RA Compromise](http://blogs.comodo.com/it-"
+#| "security/data-security/the-recent-ra-compromise/)."
msgid ""
"For example, on March 15, 2011, Comodo, one of the major SSL certificates "
-"company, reported that a user account with an affiliate registration "
+"authorities, reported that a user account with an affiliate registration "
"authority had been compromised. It was then used to create a new user "
"account that issued nine certificate signing requests for seven domains: "
"mail.google.com, login.live.com, www.google.com, login.yahoo.com (three "
@@ -374,15 +402,25 @@ msgstr ""
"security/the-recent-ra-compromise/)."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly "
+#| "issued certificates to a malicious party or parties. Later on, it came to "
+#| "light that they were apparently compromised months before or perhaps even "
+#| "in May of 2009 if not earlier. Rogue certificates were issued for domains "
+#| "such as google.com, mozilla.org, torproject.org, login.yahoo.com and many "
+#| "more. See, [The Tor Project: The DigiNotar Debacle, and what you should "
+#| "do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-"
+#| "you-should-do-about-it)."
msgid ""
"Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly "
"issued certificates to a malicious party or parties. Later on, it came to "
-"light that they were apparently compromised months before or perhaps even in "
-"May of 2009 if not earlier. Rogue certificates were issued for domains such "
-"as google.com, mozilla.org, torproject.org, login.yahoo.com and many more. "
-"See, [The Tor Project: The DigiNotar Debacle, and what you should do about "
-"it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-"
-"do-about-it)."
+"light that they were apparently compromised months before, perhaps as far "
+"back as May of 2009, or even earlier. Rogue certificates were issued for "
+"domains such as google.com, mozilla.org, torproject.org, login.yahoo.com and "
+"many more. See [The Tor Project: The DigiNotar Debacle, and what you should "
+"do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-"
+"should-do-about-it)."
msgstr ""
"Später im Jahr 2011 stellte DigiNotar, ein dänisches Unternehmen für SSL-"
"Zertifikate, fehlerhafterweise Zertifikate für eine oder mehrere bösartige "
@@ -465,12 +503,19 @@ msgstr ""
"einem Angriff gegen Sie zusammenarbeiten."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tor tries to protect against traffic analysis, where an attacker tries to "
+#| "learn whom to investigate, but Tor can't protect against traffic "
+#| "confirmation (also known as end-to-end correlation), where an attacker "
+#| "tries to confirm an hypothesis by monitoring the right locations in the "
+#| "network and then doing the math."
msgid ""
"Tor tries to protect against traffic analysis, where an attacker tries to "
"learn whom to investigate, but Tor can't protect against traffic "
"confirmation (also known as end-to-end correlation), where an attacker tries "
-"to confirm an hypothesis by monitoring the right locations in the network "
-"and then doing the math."
+"to confirm a hypothesis by monitoring the right locations in the network and "
+"then doing the math."
msgstr ""
"Tor versucht dort vor Datenflussanalyse zu schützen, wo ein Angreifer "
"versucht zu lernen, wer zu untersuchen ist. Aber Tor kann nicht vor "
@@ -496,13 +541,19 @@ msgid "Tails doesn't encrypt your documents by default\n"
msgstr "Tails verschlüsselt Ihre Dokumente standardmäßig nicht\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The documents that you might save on storage devices will not be "
+#| "encrypted by default, except in the [[encrypted persistent volume|doc/"
+#| "first_steps/persistence]]. But Tails provides you with tools to encrypt "
+#| "your documents, such as GnuPG, or encrypt your storage device, such as "
+#| "LUKS. It is likely that the files you may create will keep tracks that "
+#| "they were created using Tails."
msgid ""
"The documents that you might save on storage devices will not be encrypted "
"by default, except in the [[encrypted persistent volume|doc/first_steps/"
-"persistence]]. But Tails provides you with tools to encrypt your documents, "
-"such as GnuPG, or encrypt your storage device, such as LUKS. It is likely "
-"that the files you may create will keep tracks that they were created using "
-"Tails."
+"persistence]]. But Tails provides you with tools to encrypt your documents, "
+"such as GnuPG, or encrypt your storage devices, such as LUKS."
msgstr ""
"Standardmäßig werden Dokumente, die Sie möglicherweise auf einem Datenträger "
"speichern, nicht verschlüsselt, außer im [[verschlüsselten beständigen "
@@ -513,6 +564,12 @@ msgstr ""
"erstellt wurden."
#. type: Plain text
+msgid ""
+"It is also likely that the files you may create will contain evidence that "
+"they were created using Tails."
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid ""
"**If you need to access the local hard-disks** of the computer you are using, be\n"
@@ -532,16 +589,32 @@ msgstr ""
#. type: Plain text
msgid ""
-"Numerous files format store hidden data or metadata inside of the files. "
-"Text processors or PDF files could store the name of the author, the date "
+"Numerous files formats store hidden data or metadata inside of the files. "
+"Word processing or PDF files could store the name of the author, the date "
"and time of creation of the file, and sometimes even parts of the editing "
-"history of the file… those hidden data depend on the file format and the "
-"software used. Please note also, that the Subject: as well as the rest of "
-"the header lines of your OpenPGP encrypted e-mail messages are not "
-"encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-"
-"enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's for backwards "
-"compatibility with the original SMTP protocol. Unfortunately no RFC standard "
-"exists yet for Subject encryption."
+"history of the file, depending on the file format and the software used."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Numerous files format store hidden data or metadata inside of the files. "
+#| "Text processors or PDF files could store the name of the author, the date "
+#| "and time of creation of the file, and sometimes even parts of the editing "
+#| "history of the file… those hidden data depend on the file format and the "
+#| "software used. Please note also, that the Subject: as well as the rest of "
+#| "the header lines of your OpenPGP encrypted e-mail messages are not "
+#| "encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-"
+#| "enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's for backwards "
+#| "compatibility with the original SMTP protocol. Unfortunately no RFC "
+#| "standard exists yet for Subject encryption."
+msgid ""
+"Please note also, that the Subject: as well as the rest of the header lines "
+"of your OpenPGP encrypted e-mail messages are not encrypted. This is not a "
+"bug of Tails or the [OpenPGP](http://www.mozilla-enigmail.org/forum/"
+"viewtopic.php?f=3&t=328) protocol; it's due to backwards compatibility with "
+"the original SMTP protocol. Unfortunately no RFC standard exists yet for "
+"Subject: line encryption."
msgstr ""
"Eine Vielzahl an Dateiformaten speichern versteckte Daten oder Metadaten in "
"den Dateien. Textverarbeitungsprogramme oder PDF Dateien könnten den Namen "
@@ -557,15 +630,25 @@ msgstr ""
"Betreffzeile gestatten."
#. type: Plain text
-msgid ""
-"Images file formats, like TIFF of JPEG, probably take the prize in this "
-"field. Those files, created by digital cameras or mobile phones, contain a "
-"metadata format called EXIF which can include the date, time and sometimes "
-"the GPS coordinates of the picture, the brand and serial number of the "
-"device which took it as well as a thumbnail of the original image. Image "
-"processing software tend to keep those data intact. Internet is full of "
-"cropped or blurred images for which the EXIF thumbnail still contains the "
-"full original picture."
+#, fuzzy
+#| msgid ""
+#| "Images file formats, like TIFF of JPEG, probably take the prize in this "
+#| "field. Those files, created by digital cameras or mobile phones, contain "
+#| "a metadata format called EXIF which can include the date, time and "
+#| "sometimes the GPS coordinates of the picture, the brand and serial number "
+#| "of the device which took it as well as a thumbnail of the original image. "
+#| "Image processing software tend to keep those data intact. Internet is "
+#| "full of cropped or blurred images for which the EXIF thumbnail still "
+#| "contains the full original picture."
+msgid ""
+"Image file formats, like TIFF of JPEG, probably take the prize for most "
+"hidden data. These files, created by digital cameras or mobile phones, "
+"contain a metadata format called EXIF which can include the date, time and "
+"sometimes the GPS coordinates when the picture was taken, the brand and "
+"serial number of the device which took it, as well as a thumbnail of the "
+"original image. Image processing software tends to keep this metadata "
+"intact. The internet is full of cropped or blurred images in which the "
+"included EXIF thumbnail still shows the original picture."
msgstr ""
"Bilddateiformate, wie TIFF oder JPEG, schießen hier möglicherweise den Vogel "
"ab. Diese Dateien, die von Digitalkameras oder Handys erstellt werden, "
@@ -594,12 +677,19 @@ msgid "Tor doesn't protect you from a global adversary\n"
msgstr "Tor schützt Sie nicht vor einem globalen Angreifer\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "A global passive adversary would be a person or an entity able to monitor "
+#| "at the same time the traffic between all the computers in a network. By "
+#| "studying, for example, the timing and volume patterns of the different "
+#| "communications across the network, it would be statistically possible to "
+#| "identify Tor circuits and thus matching Tor users and destination servers."
msgid ""
"A global passive adversary would be a person or an entity able to monitor at "
"the same time the traffic between all the computers in a network. By "
"studying, for example, the timing and volume patterns of the different "
"communications across the network, it would be statistically possible to "
-"identify Tor circuits and thus matching Tor users and destination servers."
+"identify Tor circuits and thus match Tor users and destination servers."
msgstr ""
"Ein globaler passiver Angreifer wäre die Person oder Institution mit der "
"Fähigkeit, gleichzeitig den gesamten Datenverkehr aller Computer in einem "
@@ -619,10 +709,16 @@ msgstr ""
"Webbrowsing, Internet-Chat oder SSH-Verbindungen zu schaffen."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For more expert information see [Tor Project: The Second-Generation Onion "
+#| "Router](https://svn.torproject.org/svn/projects/design-paper/tor-design."
+#| "pdf), part 3. Design goals and assumptions."
msgid ""
-"For more expert information see [Tor Project: The Second-Generation Onion "
-"Router](https://svn.torproject.org/svn/projects/design-paper/tor-design."
-"pdf), part 3. Design goals and assumptions."
+"For more expert information see the Tor design paper, \"[Tor Project: The "
+"Second-Generation Onion Router](https://svn.torproject.org/svn/projects/"
+"design-paper/tor-design.pdf)\", specifically, \"Part 3. Design goals and "
+"assumptions.\""
msgstr ""
"Für weiterführende Information siehe [Tor Project: The Second-Generation "
"Onion Router](https://svn.torproject.org/svn/projects/design-paper/tor-"
@@ -639,11 +735,17 @@ msgid "Tails doesn't magically separate your different contextual identities\n"
msgstr "Tails besitzt keinen magischen Mechanismus, um Ihre Identitäten für verschiedene Kontexte zu trennen\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "It is usually not advisable to use the same Tails session to perform two "
+#| "tasks or endorse two contextual identities that you really want to keep "
+#| "separate from another. For example hiding your location to check your "
+#| "email and publishing anonymously a document."
msgid ""
"It is usually not advisable to use the same Tails session to perform two "
"tasks or endorse two contextual identities that you really want to keep "
-"separate from another. For example hiding your location to check your email "
-"and publishing anonymously a document."
+"separate from one another. For example hiding your location to check your "
+"email and anonymously publishing a document."
msgstr ""
"Im Allgemeinen sei davon abgeraten, die selbe Tails-Sitzung für zwei "
"verschiedene Aufgaben oder zwei kontextabhängige Identitäten zu verwenden, "
@@ -652,15 +754,25 @@ msgstr ""
"die anonyme Veröffentlichung eines Dokuments."
#. type: Plain text
-msgid ""
-"First, because Tor tends to reuse the same circuits, for example amongst a "
+#, fuzzy
+#| msgid ""
+#| "First, because Tor tends to reuse the same circuits, for example amongst "
+#| "a same browsing session. Since the exit node of a circuit knows both the "
+#| "destination server (and possibly the content of the communication if not "
+#| "encrypted) and the address of the previous relay it received the "
+#| "communication from, it makes it easier to correlate the several browsing "
+#| "requests as part of a same circuit and possibly made by a same user. If "
+#| "you are facing a global adversary as described above, it might then also "
+#| "be in position to do this correlation."
+msgid ""
+"First, because Tor tends to reuse the same circuits, for example, within the "
"same browsing session. Since the exit node of a circuit knows both the "
-"destination server (and possibly the content of the communication if not "
-"encrypted) and the address of the previous relay it received the "
-"communication from, it makes it easier to correlate the several browsing "
-"requests as part of a same circuit and possibly made by a same user. If you "
-"are facing a global adversary as described above, it might then also be in "
-"position to do this correlation."
+"destination server (and possibly the content of the communication if it's "
+"not encrypted) and the address of the previous relay it received the "
+"communication from, it makes it easier to correlate several browsing "
+"requests as part of a same circuit and possibly made by the same user. If "
+"you are facing a global adversary as described above, it might then also be "
+"in a position to do this correlation."
msgstr ""
"Erstens, da Tor dazu tendiert die selbe Verbindung zu verwenden, "
"beispielsweise innerhalb der selben Browser-Sitzung. Da das Ausgangsrelais "
@@ -673,9 +785,15 @@ msgstr ""
"Durchführung dieser Korrelation in der Lage sein."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Second, in case of a security hole or a misuse in using Tails or one of "
+#| "its application, information about your session could be leaked. That "
+#| "could reveal that the same person was behind the various actions made "
+#| "during the session."
msgid ""
-"Second, in case of a security hole or a misuse in using Tails or one of its "
-"application, information about your session could be leaked. That could "
+"Second, in case of a security hole or an error in using Tails or one of its "
+"applications, information about your session could be leaked. That could "
"reveal that the same person was behind the various actions made during the "
"session."
msgstr ""
@@ -708,9 +826,14 @@ msgid "Tails doesn't make your crappy passwords stronger\n"
msgstr "Tails macht Ihre schlechten Passwörter nicht sicherer\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tor allows you to be anonymous online; Tails allows you to leave no trace "
+#| "on the computer you're using. But again, **neither of both are magic "
+#| "spells for computer security**."
msgid ""
"Tor allows you to be anonymous online; Tails allows you to leave no trace on "
-"the computer you're using. But again, **neither of both are magic spells for "
+"the computer you're using. But again, **neither or both are magic spells for "
"computer security**."
msgstr ""
"Tor ermöglicht Ihnen Anonymität im Internet; Tails ermöglicht Ihnen, keine "
@@ -736,10 +859,15 @@ msgid "Tails is a work in progress\n"
msgstr "Tails ist ständig in Bearbeitung\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tails, as well as all the software it includes, are on continuous "
+#| "development and might contain programming errors or security holes. "
+#| "[[Stay tuned|download#stay_tuned]] to Tails development."
msgid ""
-"Tails, as well as all the software it includes, are on continuous "
-"development and might contain programming errors or security holes. [[Stay "
-"tuned|download#stay_tuned]] to Tails development."
+"Tails, as well as all the software it includes, are continuously being "
+"developed and may contain programming errors or security holes. [[Stay tuned|"
+"download#stay_tuned]] to Tails development."
msgstr ""
"Tails und die gesamte mitgelieferte Software werden ständig weiterentwickelt "
"und können Programmierfehler oder Sicherheitslücken enthalten. [[Halten Sie "
diff --git a/wiki/src/doc/about/warning.fr.po b/wiki/src/doc/about/warning.fr.po
index 6fa6da8..5171fe1 100644
--- a/wiki/src/doc/about/warning.fr.po
+++ b/wiki/src/doc/about/warning.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-03 11:42+0300\n"
+"POT-Creation-Date: 2015-10-11 18:23+0300\n"
"PO-Revision-Date: 2015-07-01 19:16-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -235,12 +235,18 @@ msgstr ""
"vous utilisez Tails.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "**The destination server that you are contacting through Tor** can know whether your\n"
+#| "communication comes out from a Tor exit node by consulting the publicly\n"
+#| "available list of exit nodes that might contact it. For example using the [Tor\n"
+#| "Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) of\n"
+#| "the Tor Project.\n"
msgid ""
"**The destination server that you are contacting through Tor** can know whether your\n"
-"communication comes out from a Tor exit node by consulting the publicly\n"
+"communication comes from a Tor exit node by consulting the publicly\n"
"available list of exit nodes that might contact it. For example using the [Tor\n"
-"Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) of\n"
+"Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) from\n"
"the Tor Project.\n"
msgstr ""
"**Le serveur de destination auquel vous vous connectez via Tor** peut savoir\n"
@@ -327,13 +333,21 @@ msgstr ""
"avec soin l'authenticité des serveurs.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Usually, this is automatically done throught SSL certificates checked by your\n"
+#| "browser against a given set of recognized [[!wikipedia\n"
+#| "Certificate_authority desc=\"certificate authorities\"]]).\n"
+#| "If you get a security exception message such as this one you might be victim of\n"
+#| "a man-in-the-middle attack and should not bypass it unless you have another\n"
+#| "trusted way of checking the certificate's fingerprint with the people running\n"
+#| "the service.\n"
msgid ""
"Usually, this is automatically done throught SSL certificates checked by your\n"
"browser against a given set of recognized [[!wikipedia\n"
"Certificate_authority desc=\"certificate authorities\"]]).\n"
-"If you get a security exception message such as this one you might be victim of\n"
-"a man-in-the-middle attack and should not bypass it unless you have another\n"
+"If you get a security exception message such as this one you might be the victim of\n"
+"a man-in-the-middle attack and should not bypass the warning unless you have another\n"
"trusted way of checking the certificate's fingerprint with the people running\n"
"the service.\n"
msgstr ""
@@ -351,17 +365,31 @@ msgid "[[!img ssl_warning.png link=no alt=\"This Connection is Untrusted\"]]\n"
msgstr "[[!img ssl_warning.png link=no alt=\"Cette connexion n'est pas certifiée\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "But on top of that the certificate authorities model of trust on Internet "
+#| "is susceptible to various methods of compromise."
msgid ""
-"But on top of that the certificate authorities model of trust on Internet is "
-"susceptible to various methods of compromise."
+"But on top of that the certificate authorities model of trust on the "
+"Internet is susceptible to various methods of compromise."
msgstr ""
"Mais en plus, le modèle d'autorité de certification sur internet est "
"susceptible d'être compromis par des méthodes variées."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, on March 15, 2011, Comodo, one of the major SSL certificates "
+#| "company, reported that a user account with an affiliate registration "
+#| "authority had been compromised. It was then used to create a new user "
+#| "account that issued nine certificate signing requests for seven domains: "
+#| "mail.google.com, login.live.com, www.google.com, login.yahoo.com (three "
+#| "certificates), login.skype.com, addons.mozilla.org, and global trustee. "
+#| "See [Comodo: The Recent RA Compromise](http://blogs.comodo.com/it-"
+#| "security/data-security/the-recent-ra-compromise/)."
msgid ""
"For example, on March 15, 2011, Comodo, one of the major SSL certificates "
-"company, reported that a user account with an affiliate registration "
+"authorities, reported that a user account with an affiliate registration "
"authority had been compromised. It was then used to create a new user "
"account that issued nine certificate signing requests for seven domains: "
"mail.google.com, login.live.com, www.google.com, login.yahoo.com (three "
@@ -379,15 +407,25 @@ msgstr ""
"recent-ra-compromise/)."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly "
+#| "issued certificates to a malicious party or parties. Later on, it came to "
+#| "light that they were apparently compromised months before or perhaps even "
+#| "in May of 2009 if not earlier. Rogue certificates were issued for domains "
+#| "such as google.com, mozilla.org, torproject.org, login.yahoo.com and many "
+#| "more. See, [The Tor Project: The DigiNotar Debacle, and what you should "
+#| "do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-"
+#| "you-should-do-about-it)."
msgid ""
"Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly "
"issued certificates to a malicious party or parties. Later on, it came to "
-"light that they were apparently compromised months before or perhaps even in "
-"May of 2009 if not earlier. Rogue certificates were issued for domains such "
-"as google.com, mozilla.org, torproject.org, login.yahoo.com and many more. "
-"See, [The Tor Project: The DigiNotar Debacle, and what you should do about "
-"it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-"
-"do-about-it)."
+"light that they were apparently compromised months before, perhaps as far "
+"back as May of 2009, or even earlier. Rogue certificates were issued for "
+"domains such as google.com, mozilla.org, torproject.org, login.yahoo.com and "
+"many more. See [The Tor Project: The DigiNotar Debacle, and what you should "
+"do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-"
+"should-do-about-it)."
msgstr ""
"Plus tard en 2011, DigiNotar, une entreprise allemande qui délivre des "
"certificats SSL, à malencontreusement distribué des certificats à des gens "
@@ -468,12 +506,19 @@ msgstr ""
"destinataire lui-même) coopère pour vous pièger."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tor tries to protect against traffic analysis, where an attacker tries to "
+#| "learn whom to investigate, but Tor can't protect against traffic "
+#| "confirmation (also known as end-to-end correlation), where an attacker "
+#| "tries to confirm an hypothesis by monitoring the right locations in the "
+#| "network and then doing the math."
msgid ""
"Tor tries to protect against traffic analysis, where an attacker tries to "
"learn whom to investigate, but Tor can't protect against traffic "
"confirmation (also known as end-to-end correlation), where an attacker tries "
-"to confirm an hypothesis by monitoring the right locations in the network "
-"and then doing the math."
+"to confirm a hypothesis by monitoring the right locations in the network and "
+"then doing the math."
msgstr ""
"Tor essaye de protéger contre l'analyse de trafic, quand un attaquant essaye "
"de déterminer qui il doit écouter, mais Tor ne protège pas contre les "
@@ -498,13 +543,19 @@ msgid "Tails doesn't encrypt your documents by default\n"
msgstr "Tails ne chiffre pas vos documents par défaut\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "The documents that you might save on storage devices will not be "
+#| "encrypted by default, except in the [[encrypted persistent volume|doc/"
+#| "first_steps/persistence]]. But Tails provides you with tools to encrypt "
+#| "your documents, such as GnuPG, or encrypt your storage device, such as "
+#| "LUKS. It is likely that the files you may create will keep tracks that "
+#| "they were created using Tails."
msgid ""
"The documents that you might save on storage devices will not be encrypted "
"by default, except in the [[encrypted persistent volume|doc/first_steps/"
-"persistence]]. But Tails provides you with tools to encrypt your documents, "
-"such as GnuPG, or encrypt your storage device, such as LUKS. It is likely "
-"that the files you may create will keep tracks that they were created using "
-"Tails."
+"persistence]]. But Tails provides you with tools to encrypt your documents, "
+"such as GnuPG, or encrypt your storage devices, such as LUKS."
msgstr ""
"Les documents que vous pouvez sauvegarder sur des volumes de stockage, ne "
"seront pas chiffrés par défaut, sauf si vous utilisez la [[partition "
@@ -515,6 +566,12 @@ msgstr ""
"indiquant qu'ils furent créés en utilisant Tails."
#. type: Plain text
+msgid ""
+"It is also likely that the files you may create will contain evidence that "
+"they were created using Tails."
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid ""
"**If you need to access the local hard-disks** of the computer you are using, be\n"
@@ -534,16 +591,32 @@ msgstr ""
#. type: Plain text
msgid ""
-"Numerous files format store hidden data or metadata inside of the files. "
-"Text processors or PDF files could store the name of the author, the date "
+"Numerous files formats store hidden data or metadata inside of the files. "
+"Word processing or PDF files could store the name of the author, the date "
"and time of creation of the file, and sometimes even parts of the editing "
-"history of the file… those hidden data depend on the file format and the "
-"software used. Please note also, that the Subject: as well as the rest of "
-"the header lines of your OpenPGP encrypted e-mail messages are not "
-"encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-"
-"enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's for backwards "
-"compatibility with the original SMTP protocol. Unfortunately no RFC standard "
-"exists yet for Subject encryption."
+"history of the file, depending on the file format and the software used."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Numerous files format store hidden data or metadata inside of the files. "
+#| "Text processors or PDF files could store the name of the author, the date "
+#| "and time of creation of the file, and sometimes even parts of the editing "
+#| "history of the file… those hidden data depend on the file format and the "
+#| "software used. Please note also, that the Subject: as well as the rest of "
+#| "the header lines of your OpenPGP encrypted e-mail messages are not "
+#| "encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-"
+#| "enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's for backwards "
+#| "compatibility with the original SMTP protocol. Unfortunately no RFC "
+#| "standard exists yet for Subject encryption."
+msgid ""
+"Please note also, that the Subject: as well as the rest of the header lines "
+"of your OpenPGP encrypted e-mail messages are not encrypted. This is not a "
+"bug of Tails or the [OpenPGP](http://www.mozilla-enigmail.org/forum/"
+"viewtopic.php?f=3&t=328) protocol; it's due to backwards compatibility with "
+"the original SMTP protocol. Unfortunately no RFC standard exists yet for "
+"Subject: line encryption."
msgstr ""
"De nombreux formats de fichiers contiennent des données cachées ou méta-"
"données en leur sein. Des traitements de textes ou des PDF peuvent contenir "
@@ -558,15 +631,25 @@ msgstr ""
"RFC n'existe à l'heure actuelle pour le chiffrement des sujets."
#. type: Plain text
-msgid ""
-"Images file formats, like TIFF of JPEG, probably take the prize in this "
-"field. Those files, created by digital cameras or mobile phones, contain a "
-"metadata format called EXIF which can include the date, time and sometimes "
-"the GPS coordinates of the picture, the brand and serial number of the "
-"device which took it as well as a thumbnail of the original image. Image "
-"processing software tend to keep those data intact. Internet is full of "
-"cropped or blurred images for which the EXIF thumbnail still contains the "
-"full original picture."
+#, fuzzy
+#| msgid ""
+#| "Images file formats, like TIFF of JPEG, probably take the prize in this "
+#| "field. Those files, created by digital cameras or mobile phones, contain "
+#| "a metadata format called EXIF which can include the date, time and "
+#| "sometimes the GPS coordinates of the picture, the brand and serial number "
+#| "of the device which took it as well as a thumbnail of the original image. "
+#| "Image processing software tend to keep those data intact. Internet is "
+#| "full of cropped or blurred images for which the EXIF thumbnail still "
+#| "contains the full original picture."
+msgid ""
+"Image file formats, like TIFF of JPEG, probably take the prize for most "
+"hidden data. These files, created by digital cameras or mobile phones, "
+"contain a metadata format called EXIF which can include the date, time and "
+"sometimes the GPS coordinates when the picture was taken, the brand and "
+"serial number of the device which took it, as well as a thumbnail of the "
+"original image. Image processing software tends to keep this metadata "
+"intact. The internet is full of cropped or blurred images in which the "
+"included EXIF thumbnail still shows the original picture."
msgstr ""
"Les formats d'images comme TIFF ou JPEG remporte sans doute la palme en la "
"matière. Ces fichiers, créés par des appareils photos numériques ou des "
@@ -595,12 +678,19 @@ msgid "Tor doesn't protect you from a global adversary\n"
msgstr "Tor ne vous protège pas face à un adversaire global\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "A global passive adversary would be a person or an entity able to monitor "
+#| "at the same time the traffic between all the computers in a network. By "
+#| "studying, for example, the timing and volume patterns of the different "
+#| "communications across the network, it would be statistically possible to "
+#| "identify Tor circuits and thus matching Tor users and destination servers."
msgid ""
"A global passive adversary would be a person or an entity able to monitor at "
"the same time the traffic between all the computers in a network. By "
"studying, for example, the timing and volume patterns of the different "
"communications across the network, it would be statistically possible to "
-"identify Tor circuits and thus matching Tor users and destination servers."
+"identify Tor circuits and thus match Tor users and destination servers."
msgstr ""
"Un adversaire global passif serait une personne ou une entité capable de "
"regarder et donc de comparer le trafic entre tous les ordinateurs d'un "
@@ -620,10 +710,16 @@ msgstr ""
"le web, le chat, ou les connexions SSH."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For more expert information see [Tor Project: The Second-Generation Onion "
+#| "Router](https://svn.torproject.org/svn/projects/design-paper/tor-design."
+#| "pdf), part 3. Design goals and assumptions."
msgid ""
-"For more expert information see [Tor Project: The Second-Generation Onion "
-"Router](https://svn.torproject.org/svn/projects/design-paper/tor-design."
-"pdf), part 3. Design goals and assumptions."
+"For more expert information see the Tor design paper, \"[Tor Project: The "
+"Second-Generation Onion Router](https://svn.torproject.org/svn/projects/"
+"design-paper/tor-design.pdf)\", specifically, \"Part 3. Design goals and "
+"assumptions.\""
msgstr ""
"Pour des infos plus approfondies voir (en anglais) [Tor Project: The Second-"
"Generation Onion Router](https://svn.torproject.org/svn/projects/design-"
@@ -640,11 +736,17 @@ msgid "Tails doesn't magically separate your different contextual identities\n"
msgstr "Tails ne sépare pas de façon magique vos différentes identités contextuelles\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "It is usually not advisable to use the same Tails session to perform two "
+#| "tasks or endorse two contextual identities that you really want to keep "
+#| "separate from another. For example hiding your location to check your "
+#| "email and publishing anonymously a document."
msgid ""
"It is usually not advisable to use the same Tails session to perform two "
"tasks or endorse two contextual identities that you really want to keep "
-"separate from another. For example hiding your location to check your email "
-"and publishing anonymously a document."
+"separate from one another. For example hiding your location to check your "
+"email and anonymously publishing a document."
msgstr ""
"Il est généralement déconseillé d'utiliser la même session de Tails pour "
"effectuer deux tâches, ou pour endosser deux identités contextuelles, que "
@@ -653,15 +755,25 @@ msgstr ""
"sur le web."
#. type: Plain text
-msgid ""
-"First, because Tor tends to reuse the same circuits, for example amongst a "
+#, fuzzy
+#| msgid ""
+#| "First, because Tor tends to reuse the same circuits, for example amongst "
+#| "a same browsing session. Since the exit node of a circuit knows both the "
+#| "destination server (and possibly the content of the communication if not "
+#| "encrypted) and the address of the previous relay it received the "
+#| "communication from, it makes it easier to correlate the several browsing "
+#| "requests as part of a same circuit and possibly made by a same user. If "
+#| "you are facing a global adversary as described above, it might then also "
+#| "be in position to do this correlation."
+msgid ""
+"First, because Tor tends to reuse the same circuits, for example, within the "
"same browsing session. Since the exit node of a circuit knows both the "
-"destination server (and possibly the content of the communication if not "
-"encrypted) and the address of the previous relay it received the "
-"communication from, it makes it easier to correlate the several browsing "
-"requests as part of a same circuit and possibly made by a same user. If you "
-"are facing a global adversary as described above, it might then also be in "
-"position to do this correlation."
+"destination server (and possibly the content of the communication if it's "
+"not encrypted) and the address of the previous relay it received the "
+"communication from, it makes it easier to correlate several browsing "
+"requests as part of a same circuit and possibly made by the same user. If "
+"you are facing a global adversary as described above, it might then also be "
+"in a position to do this correlation."
msgstr ""
"Tout d'abord, parce que Tor tend à réutiliser le même circuit, pour une même "
"session de navigation par exemple. Comme le nœud de sortie \"connaît\" à la "
@@ -673,9 +785,15 @@ msgstr ""
"pourrait également être en mesure de faire cette corrélation."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Second, in case of a security hole or a misuse in using Tails or one of "
+#| "its application, information about your session could be leaked. That "
+#| "could reveal that the same person was behind the various actions made "
+#| "during the session."
msgid ""
-"Second, in case of a security hole or a misuse in using Tails or one of its "
-"application, information about your session could be leaked. That could "
+"Second, in case of a security hole or an error in using Tails or one of its "
+"applications, information about your session could be leaked. That could "
"reveal that the same person was behind the various actions made during the "
"session."
msgstr ""
@@ -714,9 +832,14 @@ msgid "Tails doesn't make your crappy passwords stronger\n"
msgstr "Tails ne renforce aucunement la faiblesse de vos mots de passe\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tor allows you to be anonymous online; Tails allows you to leave no trace "
+#| "on the computer you're using. But again, **neither of both are magic "
+#| "spells for computer security**."
msgid ""
"Tor allows you to be anonymous online; Tails allows you to leave no trace on "
-"the computer you're using. But again, **neither of both are magic spells for "
+"the computer you're using. But again, **neither or both are magic spells for "
"computer security**."
msgstr ""
"Tor vous permet d'utiliser internet de manière anonyme; Tails vous permet de "
@@ -743,10 +866,15 @@ msgid "Tails is a work in progress\n"
msgstr "Tails est toujours en construction\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tails, as well as all the software it includes, are on continuous "
+#| "development and might contain programming errors or security holes. "
+#| "[[Stay tuned|download#stay_tuned]] to Tails development."
msgid ""
-"Tails, as well as all the software it includes, are on continuous "
-"development and might contain programming errors or security holes. [[Stay "
-"tuned|download#stay_tuned]] to Tails development."
+"Tails, as well as all the software it includes, are continuously being "
+"developed and may contain programming errors or security holes. [[Stay tuned|"
+"download#stay_tuned]] to Tails development."
msgstr ""
"Tails, de même que tous les logiciels qu'il contient, sont continuellement "
"en développement et peuvent contenir des erreurs de programmation ou des "
diff --git a/wiki/src/doc/about/warning.mdwn b/wiki/src/doc/about/warning.mdwn
index 8245024..38be935 100644
--- a/wiki/src/doc/about/warning.mdwn
+++ b/wiki/src/doc/about/warning.mdwn
@@ -93,9 +93,9 @@ conditions|first_steps/startup_options/bridge_mode]] can help you hide the fact
that you are using Tor.
**The destination server that you are contacting through Tor** can know whether your
-communication comes out from a Tor exit node by consulting the publicly
+communication comes from a Tor exit node by consulting the publicly
available list of exit nodes that might contact it. For example using the [Tor
-Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) of
+Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) from
the Tor Project.
**So using Tails doesn't make you look like any random Internet user.**
@@ -131,18 +131,18 @@ authenticity.
Usually, this is automatically done throught SSL certificates checked by your
browser against a given set of recognized [[!wikipedia
Certificate_authority desc="certificate authorities"]]).
-If you get a security exception message such as this one you might be victim of
-a man-in-the-middle attack and should not bypass it unless you have another
+If you get a security exception message such as this one you might be the victim of
+a man-in-the-middle attack and should not bypass the warning unless you have another
trusted way of checking the certificate's fingerprint with the people running
the service.
[[!img ssl_warning.png link=no alt="This Connection is Untrusted"]]
-But on top of that the certificate authorities model of trust on Internet is
+But on top of that the certificate authorities model of trust on the Internet is
susceptible to various methods of compromise.
For example, on March 15, 2011,
-Comodo, one of the major SSL certificates company, reported that a user account
+Comodo, one of the major SSL certificates authorities, reported that a user account
with an affiliate registration authority had been compromised. It was then used
to create a new user account that issued nine certificate signing requests for
seven domains: mail.google.com, login.live.com, www.google.com, login.yahoo.com
@@ -152,9 +152,9 @@ Compromise](http://blogs.comodo.com/it-security/data-security/the-recent-ra-comp
Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly issued
certificates to a malicious party or parties. Later on, it came to light that
-they were apparently compromised months before or perhaps even in May of 2009 if
-not earlier. Rogue certificates were issued for domains such as google.com,
-mozilla.org, torproject.org, login.yahoo.com and many more. See, [The Tor
+they were apparently compromised months before, perhaps as far back as May of 2009,
+or even earlier. Rogue certificates were issued for domains such as google.com,
+mozilla.org, torproject.org, login.yahoo.com and many more. See [The Tor
Project: The DigiNotar Debacle, and what you should do about
it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-do-about-it).
@@ -189,7 +189,7 @@ cooperate to attack you.
Tor tries to protect against traffic analysis, where an attacker tries to learn
whom to investigate, but Tor can't protect against traffic confirmation (also
-known as end-to-end correlation), where an attacker tries to confirm an
+known as end-to-end correlation), where an attacker tries to confirm a
hypothesis by monitoring the right locations in the network and then doing the
math.
@@ -201,9 +201,11 @@ Tails doesn't encrypt your documents by default
===============================================
The documents that you might save on storage devices will not be encrypted by
-default, except in the [[encrypted persistent volume|doc/first_steps/persistence]]. But Tails provides you with tools to encrypt your documents, such as
-GnuPG, or encrypt your storage device, such as LUKS. It is likely that the files
-you may create will keep tracks that they were created using Tails.
+default, except in the [[encrypted persistent volume|doc/first_steps/persistence]].
+But Tails provides you with tools to encrypt your documents, such as
+GnuPG, or encrypt your storage devices, such as LUKS.
+
+It is also likely that the files you may create will contain evidence that they were created using Tails.
**If you need to access the local hard-disks** of the computer you are using, be
conscious that you might then leave trace of your activities with Tails on it.
@@ -211,18 +213,24 @@ conscious that you might then leave trace of your activities with Tails on it.
Tails doesn't clear the metadata of your documents for you and doesn't encrypt the Subject: and other headers of your encrypted e-mail messages
===========================================================================================
-Numerous files format store hidden data or metadata inside of the files. Text
-processors or PDF files could store the name of the author, the date and time of
+Numerous files formats store hidden data or metadata inside of the files. Word
+processing or PDF files could store the name of the author, the date and time of
creation of the file, and sometimes even parts of the editing history of the
-file… those hidden data depend on the file format and the software used. Please note also, that the Subject: as well as the rest of the header lines of your OpenPGP encrypted e-mail messages are not encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's for backwards compatibility with the original SMTP protocol. Unfortunately no RFC standard exists yet for Subject encryption.
+file, depending on the file format and the software used.
+
+Please note also, that the Subject: as well as the rest of the header lines of your
+OpenPGP encrypted e-mail messages are not encrypted. This is not a bug of Tails or
+the [OpenPGP](http://www.mozilla-enigmail.org/forum/viewtopic.php?f=3&t=328) protocol;
+it's due to backwards compatibility with the original SMTP protocol. Unfortunately no
+RFC standard exists yet for Subject: line encryption.
-Images file formats, like TIFF of JPEG, probably take the prize in this field.
-Those files, created by digital cameras or mobile phones, contain a metadata
+Image file formats, like TIFF of JPEG, probably take the prize for most hidden data.
+These files, created by digital cameras or mobile phones, contain a metadata
format called EXIF which can include the date, time and sometimes the GPS
-coordinates of the picture, the brand and serial number of the device which took
-it as well as a thumbnail of the original image. Image processing software tend
-to keep those data intact. Internet is full of cropped or blurred images for
-which the EXIF thumbnail still contains the full original picture.
+coordinates when the picture was taken, the brand and serial number of the device which took
+it, as well as a thumbnail of the original image. Image processing software tends
+to keep this metadata intact. The internet is full of cropped or blurred images in
+which the included EXIF thumbnail still shows the original picture.
**Tails doesn't clear the metadata of your files for you**. Yet. Still it's in
Tails' design goal to help you do that. For example, Tails already comes with
@@ -235,15 +243,15 @@ A global passive adversary would be a person or an entity able to monitor at the
same time the traffic between all the computers in a network. By studying, for
example, the timing and volume patterns of the different communications across
the network, it would be statistically possible to identify Tor circuits and
-thus matching Tor users and destination servers.
+thus match Tor users and destination servers.
It is part of Tor's initial trade-off not to address such a threat in order to
create a low-latency communication service usable for web browsing, Internet
chat or SSH connections.
-For more expert information see [Tor Project: The Second-Generation Onion
-Router](https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf),
-part 3. Design goals and assumptions.
+For more expert information see the Tor design paper, "[Tor Project: The Second-Generation Onion
+Router](https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf)",
+specifically, "Part 3. Design goals and assumptions."
<a id="identities"></a>
@@ -252,19 +260,19 @@ Tails doesn't magically separate your different contextual identities
It is usually not advisable to use the same Tails session to perform two tasks
or endorse two contextual identities that you really want to keep separate
-from another. For example hiding your location to check your email and
-publishing anonymously a document.
+from one another. For example hiding your location to check your email and
+anonymously publishing a document.
-First, because Tor tends to reuse the same circuits, for example amongst a same
+First, because Tor tends to reuse the same circuits, for example, within the same
browsing session. Since the exit node of a circuit knows both the destination
-server (and possibly the content of the communication if not encrypted) and the
+server (and possibly the content of the communication if it's not encrypted) and the
address of the previous relay it received the communication from, it makes it
-easier to correlate the several browsing requests as part of a same circuit and
-possibly made by a same user. If you are facing a global adversary as described
-above, it might then also be in position to do this correlation.
+easier to correlate several browsing requests as part of a same circuit and
+possibly made by the same user. If you are facing a global adversary as described
+above, it might then also be in a position to do this correlation.
-Second, in case of a security hole or a misuse in using Tails or one of its
-application, information about your session could be leaked. That could reveal
+Second, in case of a security hole or an error in using Tails or one of its
+applications, information about your session could be leaked. That could reveal
that the same person was behind the various actions made during the session.
**The solution to both threats is to shutdown and restart Tails** every time
@@ -280,7 +288,7 @@ Tails doesn't make your crappy passwords stronger
=================================================
Tor allows you to be anonymous online; Tails allows you to leave no trace on the
-computer you're using. But again, **neither of both are magic spells for computer
+computer you're using. But again, **neither or both are magic spells for computer
security**.
If you use weak passwords, they can be guessed by brute-force attacks with or
@@ -291,6 +299,6 @@ Weak_password#Examples_of_weak_passwords desc="Wikipedia: Weak Passwords"]].
Tails is a work in progress
===========================
-Tails, as well as all the software it includes, are on continuous development
-and might contain programming errors or security holes. [[Stay
+Tails, as well as all the software it includes, are continuously being developed
+and may contain programming errors or security holes. [[Stay
tuned|download#stay_tuned]] to Tails development.
diff --git a/wiki/src/doc/about/warning.pt.po b/wiki/src/doc/about/warning.pt.po
index 929a468..2526fea 100644
--- a/wiki/src/doc/about/warning.pt.po
+++ b/wiki/src/doc/about/warning.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-03 11:42+0300\n"
+"POT-Creation-Date: 2015-10-11 18:23+0300\n"
"PO-Revision-Date: 2014-11-24 16:47+0100\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -231,12 +231,18 @@ msgstr ""
"o fato de que você está usando Tor.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "**The destination server that you are contacting through Tor** can know whether your\n"
+#| "communication comes out from a Tor exit node by consulting the publicly\n"
+#| "available list of exit nodes that might contact it. For example using the [Tor\n"
+#| "Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) of\n"
+#| "the Tor Project.\n"
msgid ""
"**The destination server that you are contacting through Tor** can know whether your\n"
-"communication comes out from a Tor exit node by consulting the publicly\n"
+"communication comes from a Tor exit node by consulting the publicly\n"
"available list of exit nodes that might contact it. For example using the [Tor\n"
-"Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) of\n"
+"Bulk Exit List tool](https://check.torproject.org/cgi-bin/TorBulkExitList.py) from\n"
"the Tor Project.\n"
msgstr ""
"**O servidor de destino ao qual você está conectando através do Tor** pode saber se\n"
@@ -319,13 +325,21 @@ msgstr ""
"a autenticidade do servidor.\n"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "Usually, this is automatically done throught SSL certificates checked by your\n"
+#| "browser against a given set of recognized [[!wikipedia\n"
+#| "Certificate_authority desc=\"certificate authorities\"]]).\n"
+#| "If you get a security exception message such as this one you might be victim of\n"
+#| "a man-in-the-middle attack and should not bypass it unless you have another\n"
+#| "trusted way of checking the certificate's fingerprint with the people running\n"
+#| "the service.\n"
msgid ""
"Usually, this is automatically done throught SSL certificates checked by your\n"
"browser against a given set of recognized [[!wikipedia\n"
"Certificate_authority desc=\"certificate authorities\"]]).\n"
-"If you get a security exception message such as this one you might be victim of\n"
-"a man-in-the-middle attack and should not bypass it unless you have another\n"
+"If you get a security exception message such as this one you might be the victim of\n"
+"a man-in-the-middle attack and should not bypass the warning unless you have another\n"
"trusted way of checking the certificate's fingerprint with the people running\n"
"the service.\n"
msgstr ""
@@ -343,17 +357,31 @@ msgid "[[!img ssl_warning.png link=no alt=\"This Connection is Untrusted\"]]\n"
msgstr "[[!img ssl_warning.png link=no alt=\"Esta conexão não é confiável\"]]\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "But on top of that the certificate authorities model of trust on Internet "
+#| "is susceptible to various methods of compromise."
msgid ""
-"But on top of that the certificate authorities model of trust on Internet is "
-"susceptible to various methods of compromise."
+"But on top of that the certificate authorities model of trust on the "
+"Internet is susceptible to various methods of compromise."
msgstr ""
"Mas acima disto ainda está o fato de que o modelo de confiança baseado em "
"autoridades certificadoras é suscetível a vários métodos de comprometimento."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, on March 15, 2011, Comodo, one of the major SSL certificates "
+#| "company, reported that a user account with an affiliate registration "
+#| "authority had been compromised. It was then used to create a new user "
+#| "account that issued nine certificate signing requests for seven domains: "
+#| "mail.google.com, login.live.com, www.google.com, login.yahoo.com (three "
+#| "certificates), login.skype.com, addons.mozilla.org, and global trustee. "
+#| "See [Comodo: The Recent RA Compromise](http://blogs.comodo.com/it-"
+#| "security/data-security/the-recent-ra-compromise/)."
msgid ""
"For example, on March 15, 2011, Comodo, one of the major SSL certificates "
-"company, reported that a user account with an affiliate registration "
+"authorities, reported that a user account with an affiliate registration "
"authority had been compromised. It was then used to create a new user "
"account that issued nine certificate signing requests for seven domains: "
"mail.google.com, login.live.com, www.google.com, login.yahoo.com (three "
@@ -371,15 +399,25 @@ msgstr ""
"security/data-security/the-recent-ra-compromise/) (em inglês)."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly "
+#| "issued certificates to a malicious party or parties. Later on, it came to "
+#| "light that they were apparently compromised months before or perhaps even "
+#| "in May of 2009 if not earlier. Rogue certificates were issued for domains "
+#| "such as google.com, mozilla.org, torproject.org, login.yahoo.com and many "
+#| "more. See, [The Tor Project: The DigiNotar Debacle, and what you should "
+#| "do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-"
+#| "you-should-do-about-it)."
msgid ""
"Later in 2011, DigiNotar, a Dutch SSL certificate company, incorrectly "
"issued certificates to a malicious party or parties. Later on, it came to "
-"light that they were apparently compromised months before or perhaps even in "
-"May of 2009 if not earlier. Rogue certificates were issued for domains such "
-"as google.com, mozilla.org, torproject.org, login.yahoo.com and many more. "
-"See, [The Tor Project: The DigiNotar Debacle, and what you should do about "
-"it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-"
-"do-about-it)."
+"light that they were apparently compromised months before, perhaps as far "
+"back as May of 2009, or even earlier. Rogue certificates were issued for "
+"domains such as google.com, mozilla.org, torproject.org, login.yahoo.com and "
+"many more. See [The Tor Project: The DigiNotar Debacle, and what you should "
+"do about it](https://blog.torproject.org/blog/diginotar-debacle-and-what-you-"
+"should-do-about-it)."
msgstr ""
"Ainda em 2011 a DigiNotar, uma companhia holandesa de certificação SSL, "
"emitiu incorretamente certificados para terceiros maliciosos. Mais tarde, "
@@ -460,12 +498,19 @@ msgstr ""
"para te atacar."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tor tries to protect against traffic analysis, where an attacker tries to "
+#| "learn whom to investigate, but Tor can't protect against traffic "
+#| "confirmation (also known as end-to-end correlation), where an attacker "
+#| "tries to confirm an hypothesis by monitoring the right locations in the "
+#| "network and then doing the math."
msgid ""
"Tor tries to protect against traffic analysis, where an attacker tries to "
"learn whom to investigate, but Tor can't protect against traffic "
"confirmation (also known as end-to-end correlation), where an attacker tries "
-"to confirm an hypothesis by monitoring the right locations in the network "
-"and then doing the math."
+"to confirm a hypothesis by monitoring the right locations in the network and "
+"then doing the math."
msgstr ""
"Tor tenta proteger contra análise de tráfego, na qual um atacante tenta "
"descobrir quem deve investigar, mas o Tor não pode protegê-lo/a contra "
@@ -500,10 +545,8 @@ msgstr "Tails não criptografa seus documentos por padrão\n"
msgid ""
"The documents that you might save on storage devices will not be encrypted "
"by default, except in the [[encrypted persistent volume|doc/first_steps/"
-"persistence]]. But Tails provides you with tools to encrypt your documents, "
-"such as GnuPG, or encrypt your storage device, such as LUKS. It is likely "
-"that the files you may create will keep tracks that they were created using "
-"Tails."
+"persistence]]. But Tails provides you with tools to encrypt your documents, "
+"such as GnuPG, or encrypt your storage devices, such as LUKS."
msgstr ""
"Os documentos que você pode salvar em dispositivos de armazenamento não "
"serão criptografados por padrão. No entanto, o Tails fornece a você "
@@ -513,6 +556,12 @@ msgstr ""
"Tails."
#. type: Plain text
+msgid ""
+"It is also likely that the files you may create will contain evidence that "
+"they were created using Tails."
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid ""
"**If you need to access the local hard-disks** of the computer you are using, be\n"
@@ -532,16 +581,32 @@ msgstr ""
#. type: Plain text
msgid ""
-"Numerous files format store hidden data or metadata inside of the files. "
-"Text processors or PDF files could store the name of the author, the date "
+"Numerous files formats store hidden data or metadata inside of the files. "
+"Word processing or PDF files could store the name of the author, the date "
"and time of creation of the file, and sometimes even parts of the editing "
-"history of the file… those hidden data depend on the file format and the "
-"software used. Please note also, that the Subject: as well as the rest of "
-"the header lines of your OpenPGP encrypted e-mail messages are not "
-"encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-"
-"enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's for backwards "
-"compatibility with the original SMTP protocol. Unfortunately no RFC standard "
-"exists yet for Subject encryption."
+"history of the file, depending on the file format and the software used."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Numerous files format store hidden data or metadata inside of the files. "
+#| "Text processors or PDF files could store the name of the author, the date "
+#| "and time of creation of the file, and sometimes even parts of the editing "
+#| "history of the file… those hidden data depend on the file format and the "
+#| "software used. Please note also, that the Subject: as well as the rest of "
+#| "the header lines of your OpenPGP encrypted e-mail messages are not "
+#| "encrypted. This is not a bug of Tails or the [OpenPGP](http://www.mozilla-"
+#| "enigmail.org/forum/viewtopic.php?f=3&t=328) protocol; it's for backwards "
+#| "compatibility with the original SMTP protocol. Unfortunately no RFC "
+#| "standard exists yet for Subject encryption."
+msgid ""
+"Please note also, that the Subject: as well as the rest of the header lines "
+"of your OpenPGP encrypted e-mail messages are not encrypted. This is not a "
+"bug of Tails or the [OpenPGP](http://www.mozilla-enigmail.org/forum/"
+"viewtopic.php?f=3&t=328) protocol; it's due to backwards compatibility with "
+"the original SMTP protocol. Unfortunately no RFC standard exists yet for "
+"Subject: line encryption."
msgstr ""
"Vários formatos de arquivo armazenam dados ou metadados dentro dos arquivos. "
"Processadores de texto ou arquivos PDF podem armazenar o nome do autor/a, a "
@@ -555,15 +620,25 @@ msgstr ""
"Infelizmente ainda não existe padrão RFC para criptografia do campo Assunto."
#. type: Plain text
-msgid ""
-"Images file formats, like TIFF of JPEG, probably take the prize in this "
-"field. Those files, created by digital cameras or mobile phones, contain a "
-"metadata format called EXIF which can include the date, time and sometimes "
-"the GPS coordinates of the picture, the brand and serial number of the "
-"device which took it as well as a thumbnail of the original image. Image "
-"processing software tend to keep those data intact. Internet is full of "
-"cropped or blurred images for which the EXIF thumbnail still contains the "
-"full original picture."
+#, fuzzy
+#| msgid ""
+#| "Images file formats, like TIFF of JPEG, probably take the prize in this "
+#| "field. Those files, created by digital cameras or mobile phones, contain "
+#| "a metadata format called EXIF which can include the date, time and "
+#| "sometimes the GPS coordinates of the picture, the brand and serial number "
+#| "of the device which took it as well as a thumbnail of the original image. "
+#| "Image processing software tend to keep those data intact. Internet is "
+#| "full of cropped or blurred images for which the EXIF thumbnail still "
+#| "contains the full original picture."
+msgid ""
+"Image file formats, like TIFF of JPEG, probably take the prize for most "
+"hidden data. These files, created by digital cameras or mobile phones, "
+"contain a metadata format called EXIF which can include the date, time and "
+"sometimes the GPS coordinates when the picture was taken, the brand and "
+"serial number of the device which took it, as well as a thumbnail of the "
+"original image. Image processing software tends to keep this metadata "
+"intact. The internet is full of cropped or blurred images in which the "
+"included EXIF thumbnail still shows the original picture."
msgstr ""
"Formatos de arquivo de imagem, como o TIFF ou JPEG, provavelmente ganham o "
"prêmio nessa categoria. Tais arquivos, criados por câmeras digitais ou "
@@ -591,12 +666,19 @@ msgid "Tor doesn't protect you from a global adversary\n"
msgstr "Tor não te protege de um adversário global\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "A global passive adversary would be a person or an entity able to monitor "
+#| "at the same time the traffic between all the computers in a network. By "
+#| "studying, for example, the timing and volume patterns of the different "
+#| "communications across the network, it would be statistically possible to "
+#| "identify Tor circuits and thus matching Tor users and destination servers."
msgid ""
"A global passive adversary would be a person or an entity able to monitor at "
"the same time the traffic between all the computers in a network. By "
"studying, for example, the timing and volume patterns of the different "
"communications across the network, it would be statistically possible to "
-"identify Tor circuits and thus matching Tor users and destination servers."
+"identify Tor circuits and thus match Tor users and destination servers."
msgstr ""
"Um adversário global e passivo seria uma pessoa ou entidade capaz de "
"monitorar ao mesmo tempo o tráfego entre todos os computadores de uma rede. "
@@ -615,10 +697,16 @@ msgstr ""
"navegação na web, bate-papo via Internet e conexões SSH."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For more expert information see [Tor Project: The Second-Generation Onion "
+#| "Router](https://svn.torproject.org/svn/projects/design-paper/tor-design."
+#| "pdf), part 3. Design goals and assumptions."
msgid ""
-"For more expert information see [Tor Project: The Second-Generation Onion "
-"Router](https://svn.torproject.org/svn/projects/design-paper/tor-design."
-"pdf), part 3. Design goals and assumptions."
+"For more expert information see the Tor design paper, \"[Tor Project: The "
+"Second-Generation Onion Router](https://svn.torproject.org/svn/projects/"
+"design-paper/tor-design.pdf)\", specifically, \"Part 3. Design goals and "
+"assumptions.\""
msgstr ""
"Para mais informações para especializadas, veja [Tor Project: The Second-"
"Generation Onion Router](https://svn.torproject.org/svn/projects/design-"
@@ -635,11 +723,17 @@ msgid "Tails doesn't magically separate your different contextual identities\n"
msgstr "Tails não separa magicamente suas diferentes identidades contextuais\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "It is usually not advisable to use the same Tails session to perform two "
+#| "tasks or endorse two contextual identities that you really want to keep "
+#| "separate from another. For example hiding your location to check your "
+#| "email and publishing anonymously a document."
msgid ""
"It is usually not advisable to use the same Tails session to perform two "
"tasks or endorse two contextual identities that you really want to keep "
-"separate from another. For example hiding your location to check your email "
-"and publishing anonymously a document."
+"separate from one another. For example hiding your location to check your "
+"email and anonymously publishing a document."
msgstr ""
"Usualmente não é recomendável usar a mesma sessão do Tails para realizar "
"duas tarefas ou aproximar duas identidades contextuais que você realmente "
@@ -647,15 +741,25 @@ msgstr ""
"localização para checar seu email e publicar um documento anonimamente."
#. type: Plain text
-msgid ""
-"First, because Tor tends to reuse the same circuits, for example amongst a "
+#, fuzzy
+#| msgid ""
+#| "First, because Tor tends to reuse the same circuits, for example amongst "
+#| "a same browsing session. Since the exit node of a circuit knows both the "
+#| "destination server (and possibly the content of the communication if not "
+#| "encrypted) and the address of the previous relay it received the "
+#| "communication from, it makes it easier to correlate the several browsing "
+#| "requests as part of a same circuit and possibly made by a same user. If "
+#| "you are facing a global adversary as described above, it might then also "
+#| "be in position to do this correlation."
+msgid ""
+"First, because Tor tends to reuse the same circuits, for example, within the "
"same browsing session. Since the exit node of a circuit knows both the "
-"destination server (and possibly the content of the communication if not "
-"encrypted) and the address of the previous relay it received the "
-"communication from, it makes it easier to correlate the several browsing "
-"requests as part of a same circuit and possibly made by a same user. If you "
-"are facing a global adversary as described above, it might then also be in "
-"position to do this correlation."
+"destination server (and possibly the content of the communication if it's "
+"not encrypted) and the address of the previous relay it received the "
+"communication from, it makes it easier to correlate several browsing "
+"requests as part of a same circuit and possibly made by the same user. If "
+"you are facing a global adversary as described above, it might then also be "
+"in a position to do this correlation."
msgstr ""
"Primeiramente, porque o Tor tende a reutilizar os mesmos circuitos, por "
"exemplo em uma mesma sessão de navegação. Uma vez que o nó de saída de um "
@@ -667,9 +771,15 @@ msgstr ""
"descrito acima, ele também pode estar em posição de realizar esta correlação."
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Second, in case of a security hole or a misuse in using Tails or one of "
+#| "its application, information about your session could be leaked. That "
+#| "could reveal that the same person was behind the various actions made "
+#| "during the session."
msgid ""
-"Second, in case of a security hole or a misuse in using Tails or one of its "
-"application, information about your session could be leaked. That could "
+"Second, in case of a security hole or an error in using Tails or one of its "
+"applications, information about your session could be leaked. That could "
"reveal that the same person was behind the various actions made during the "
"session."
msgstr ""
@@ -702,9 +812,14 @@ msgid "Tails doesn't make your crappy passwords stronger\n"
msgstr "Tails não transforma suas senhas fracas em fortes\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tor allows you to be anonymous online; Tails allows you to leave no trace "
+#| "on the computer you're using. But again, **neither of both are magic "
+#| "spells for computer security**."
msgid ""
"Tor allows you to be anonymous online; Tails allows you to leave no trace on "
-"the computer you're using. But again, **neither of both are magic spells for "
+"the computer you're using. But again, **neither or both are magic spells for "
"computer security**."
msgstr ""
"Tor permite que você seja anônimo online; Tails permite que você não deixe "
@@ -730,10 +845,15 @@ msgid "Tails is a work in progress\n"
msgstr "Tails é um trabalho em progresso\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Tails, as well as all the software it includes, are on continuous "
+#| "development and might contain programming errors or security holes. "
+#| "[[Stay tuned|download#stay_tuned]] to Tails development."
msgid ""
-"Tails, as well as all the software it includes, are on continuous "
-"development and might contain programming errors or security holes. [[Stay "
-"tuned|download#stay_tuned]] to Tails development."
+"Tails, as well as all the software it includes, are continuously being "
+"developed and may contain programming errors or security holes. [[Stay tuned|"
+"download#stay_tuned]] to Tails development."
msgstr ""
"Tails, assim como todo software nele incluso, está em desenvolvimento "
"contínuo e pode conter erros de programação e brechas de segurança. [[Fique "
diff --git a/wiki/src/doc/anonymous_internet/electrum.de.po b/wiki/src/doc/anonymous_internet/electrum.de.po
index 50981ec..ab7e6db 100644
--- a/wiki/src/doc/anonymous_internet/electrum.de.po
+++ b/wiki/src/doc/anonymous_internet/electrum.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-03 14:08+0100\n"
+"POT-Creation-Date: 2015-10-04 16:24+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"
@@ -83,7 +83,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To learn how to use *Electrum*, read the [documentation on the *Electrum* "
-"wiki](http://electrum.orain.org/)."
+"wiki](http://docs.electrum.org)."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/anonymous_internet/electrum.fr.po b/wiki/src/doc/anonymous_internet/electrum.fr.po
index eb48530..65953ab 100644
--- a/wiki/src/doc/anonymous_internet/electrum.fr.po
+++ b/wiki/src/doc/anonymous_internet/electrum.fr.po
@@ -6,11 +6,10 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-07-07 16:34+0300\n"
-"PO-Revision-Date: 2015-04-21 23:23-0000\n"
+"POT-Creation-Date: 2015-10-04 16:24+0300\n"
+"PO-Revision-Date: 2015-10-12 19:57-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -38,7 +37,7 @@ msgid ""
msgstr ""
"Votre portefeuille peut être récupéré entièrement grâce à une phrase de "
"passe, appelée *graine*. Vous pouvez alors utiliser votre portefeuille "
-"depuis différent appareils et éviter de perdre des bitcoins à cause d'une "
+"depuis différents appareils et éviter de perdre des bitcoins à cause d'une "
"erreur de sauvegarde ou d'une défaillance de votre ordinateur."
#. type: Bullet: ' - '
@@ -64,7 +63,7 @@ msgid ""
"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
"anonymous</a>.</p>\n"
msgstr ""
-"<p>Le Bitcoin n'est <a href=\"https://bitcoin.org/fr/faq#is-bitcoin-anonymous\"> pas\n"
+"<p>Le Bitcoin n'est <a href=\"https://bitcoin.org/fr/faq#bitcoin-est-il-anonyme\"> pas\n"
"anonyme</a>.</p>\n"
#. type: Plain text
@@ -99,12 +98,15 @@ msgstr ""
"</span>.\n"
#. type: Plain text
+#| msgid ""
+#| "To learn how to use *Electrum*, read the [documentation on the *Electrum* "
+#| "wiki](http://electrum.orain.org/)."
msgid ""
"To learn how to use *Electrum*, read the [documentation on the *Electrum* "
-"wiki](http://electrum.orain.org/)."
+"wiki](http://docs.electrum.org)."
msgstr ""
"Pour apprendre à utiliser *Electrum*, consultez la [documentation du wiki "
-"d'*Electrum*](https://electrum.org/fr/)."
+"d'*Electrum*](http://docs.electrum.org) (en anglais)."
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/anonymous_internet/electrum.mdwn b/wiki/src/doc/anonymous_internet/electrum.mdwn
index 7a4011f..73cac2e 100644
--- a/wiki/src/doc/anonymous_internet/electrum.mdwn
+++ b/wiki/src/doc/anonymous_internet/electrum.mdwn
@@ -28,7 +28,7 @@ To start <span class="application">Electrum</span> choose
</span>.
To learn how to use *Electrum*, read the [documentation on the
-*Electrum* wiki](http://electrum.orain.org/).
+*Electrum* wiki](http://docs.electrum.org).
<div class="caution">
diff --git a/wiki/src/doc/anonymous_internet/electrum.pt.po b/wiki/src/doc/anonymous_internet/electrum.pt.po
index 50981ec..ab7e6db 100644
--- a/wiki/src/doc/anonymous_internet/electrum.pt.po
+++ b/wiki/src/doc/anonymous_internet/electrum.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-03 14:08+0100\n"
+"POT-Creation-Date: 2015-10-04 16:24+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"
@@ -83,7 +83,7 @@ msgstr ""
#. type: Plain text
msgid ""
"To learn how to use *Electrum*, read the [documentation on the *Electrum* "
-"wiki](http://electrum.orain.org/)."
+"wiki](http://docs.electrum.org)."
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/anonymous_internet/unsafe_browser.de.po b/wiki/src/doc/anonymous_internet/unsafe_browser.de.po
index 5976456..e433ea1 100644
--- a/wiki/src/doc/anonymous_internet/unsafe_browser.de.po
+++ b/wiki/src/doc/anonymous_internet/unsafe_browser.de.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-07-10 08:22+0200\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"
-"Language: \n"
+"Project-Id-Version: Tails\n"
+"POT-Creation-Date: 2014-11-04 22:26+0100\n"
+"PO-Revision-Date: 2015-10-07 18:39+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Logging in to captive portals\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Anmelden bei Captive Portals\"]]\n"
#. type: Plain text
msgid ""
@@ -32,6 +32,16 @@ msgid ""
"page. None of that works when Tor is used, so a browser with unrestricted "
"network access is necessary."
msgstr ""
+"Viele öffentlich zugängliche Internetverbindungen (auf die üblicherweise "
+"über eine drahtlose Netzwerkverbindung zugegriffen werden kann) verlangen "
+"von ihren Nutzenden, sich zu registrieren und anzumelden, um Internetzugriff "
+"zu erhalten. Dies umfasst sowohl kostenlose als auch kostenpflichtige "
+"Dienste, die z. B. in Internetcafé's, Bibliotheken, Flughäfen, Hotels, "
+"Universtitäten usw. aufgefunden werden können. Normalerweise werden in "
+"solchen Situationen *Captive Portals* jegliche Anfragen zu Websites abfangen "
+"und den Webbrowser zu einer Loginseite weiterleiten. Nichts davon "
+"funktioniert, wenn Tor benutzt wird, somit ist ein Browser mit "
+"uneingeschränktem Internetzugriff nötig."
#. type: Plain text
#, no-wrap
@@ -43,6 +53,13 @@ msgid ""
" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Unsafe Web Browser</span></span>.\n"
msgstr ""
+"Tails enthält einen <span class=\"application\">Unsicheren Browser</span> für diesen\n"
+"Zweck, dieser kann über das Menü\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Anwendungen</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Internet</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Unsicherer Web Browser</span></span> \n"
+"gestartet werden.\n"
#. type: Plain text
#, no-wrap
@@ -50,11 +67,13 @@ msgid ""
"The <span class=\"application\">Unsafe Browser</span> has a red and yellow theme\n"
"to differentiate it from [[<span class=\"application\">Tor Browser</span>|Tor_Browser]].\n"
msgstr ""
+"Der <span class=\"application\">Unsichere Browser</span> hat ein rotes und gelbes Farbschema\n"
+"um vom [[<span class=\"application\">Tor Browser</span>|Tor_Browser]] zu unterscheiden.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr ""
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
@@ -63,25 +82,28 @@ msgid ""
"anonymous</strong>. Use it only to log in to captive portals or to\n"
"[[browse web pages on the local network|advanced_topics/lan#browser]].</p>\n"
msgstr ""
+"<p><strong>Der <span class=\"application\">Unsichere Browser</span> ist nicht\n"
+"anonym</strong>. Nutzen Sie ihn nur, um sich in Captive Portals einzuloggen oder um\n"
+"[[Webseiten im lokalen Netzwerk anzusehen|advanced_topics/lan#browser]].</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet/unsafe_browser/chroot.inline\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/anonymous_internet/unsafe_browser/chroot.inline.de\" raw=\"yes\"]]\n"
#. type: Plain text
msgid "Security recommendations:"
-msgstr ""
+msgstr "Sicherheitsempfehlungen:"
#. type: Bullet: '* '
msgid ""
@@ -90,6 +112,10 @@ msgid ""
"mistake one browser for the other, which could have catastrophic "
"consequences."
msgstr ""
+"Führen Sie diesen Browser nicht zur zeitgleich mit dem [[<span class="
+"\"application\">Tor Browser</span>|Tor_Browser]] aus. Dies macht es einfach, "
+"einen Browser nicht mit dem anderen zu verwechseln, was verheerende Folgen "
+"haben könnte."
#. type: Bullet: '* '
msgid ""
@@ -100,3 +126,10 @@ msgid ""
"navigation toolbar. The lack of the onion icon is another such visual "
"reminder."
msgstr ""
+"Wenn [[Windows Camouflage|doc/first_steps/startup_options/"
+"windows_camouflage]] benutzt wird, ist das rote Farbschema deaktiviert, um "
+"weniger Aufmerksamkeit zu erregen. Es ist dennoch möglich, den <span class="
+"\"application\">Unsicheren Browser</span> in Ruhe zu erkennen, da er die "
+"englische Wikipedia als voreingestellte (und einzige) Suchmaschine in der "
+"Adresszeile besitzt. Das Fehlen des Zwiebellogos ist ein weitere optische "
+"Erinnerung."
diff --git a/wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.de.po b/wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.de.po
index dceeaf3..5bdaf73 100644
--- a/wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.de.po
+++ b/wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.de.po
@@ -22,4 +22,6 @@ msgid ""
"<p>If you download files using the <span class=\"application\">Unsafe\n"
"Browser</span> it is not possible to access them outside of the <span\n"
"class=\"application\">Unsafe Browser</span> itself.</p>\n"
-msgstr ""
+msgstr "<p>Falls Sie Dateien mit dem <span class=\"application\">Unsicheren\n"
+"Browser</span> herunterladen, ist es nicht möglich auf diese außerhalb des\n"
+"<span class=\"application\">Unsicheren Browsers</span> zuzugreifen.</p>\n"
diff --git a/wiki/src/doc/first_steps/bug_reporting.de.po b/wiki/src/doc/first_steps/bug_reporting.de.po
index a6f2489..aea07d8 100644
--- a/wiki/src/doc/first_steps/bug_reporting.de.po
+++ b/wiki/src/doc/first_steps/bug_reporting.de.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-08-09 14:27+0300\n"
-"PO-Revision-Date: 2015-01-28 17:50+0100\n"
+"POT-Creation-Date: 2015-09-30 16:26+0300\n"
+"PO-Revision-Date: 2015-10-04 19:49+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Language Team <tails@boum.org>\n"
"Language: de\n"
@@ -225,7 +225,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"support/talk/languages.inline\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"support/talk/languages.inline.de\" raw=\"yes\"]]\n"
#. type: Title -
#, no-wrap
@@ -236,16 +236,17 @@ msgstr "Optionale E-Mail-Addresse\n"
msgid ""
"Giving us an email address allows us to contact you to clarify the problem. "
"This is needed for the vast majority of the reports we receive as most "
-"reports without any contact information are useless. On the other hand it "
-"also provides an opportunity for eavesdroppers, like your email or Internet "
+"reports without any contact information are useless. But note that it also "
+"provides an opportunity for eavesdroppers, like your email or Internet "
"provider, to confirm that you are using Tails."
msgstr ""
"Wenn Sie uns eine E-Mail-Adresse angeben, ermöglichen Sie es uns, mit Ihnen "
"in Kontakt zu treten um das Problem zu klären. Dies wird für die "
"überwiegende Mehrheit der Berichte die wir bekommen benötigt, da die meisten "
-"Berichte ohne Kontaktinformation unbrauchbar sind. Jedoch bietet dies auch "
-"eine Möglichkeit zur Überwachung, z.B. von Ihrem E-Mail- oder "
-"Internetprovider, um zu bestätigen, dass Sie Tails benutzen."
+"Berichte ohne Kontaktinformation unbrauchbar sind. Nehmen Sie jedoch zur "
+"Kenntnis, das dies auch eine Möglichkeit zur Überwachung bietet, z.B. von "
+"Ihrem E-Mail- oder Internetprovider, um zu bestätigen, dass Sie Tails "
+"benutzen."
#. type: Title -
#, no-wrap
diff --git a/wiki/src/doc/first_steps/bug_reporting.fr.po b/wiki/src/doc/first_steps/bug_reporting.fr.po
index 1026ed5..ba82e1c 100644
--- a/wiki/src/doc/first_steps/bug_reporting.fr.po
+++ b/wiki/src/doc/first_steps/bug_reporting.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-08-09 14:27+0300\n"
+"POT-Creation-Date: 2015-09-30 16:26+0300\n"
"PO-Revision-Date: 2013-10-21 14:39-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -233,11 +233,18 @@ msgid "Optional email address\n"
msgstr "Adresse email optionnelle\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Giving us an email address allows us to contact you to clarify the "
+#| "problem. This is needed for the vast majority of the reports we receive "
+#| "as most reports without any contact information are useless. On the other "
+#| "hand it also provides an opportunity for eavesdroppers, like your email "
+#| "or Internet provider, to confirm that you are using Tails."
msgid ""
"Giving us an email address allows us to contact you to clarify the problem. "
"This is needed for the vast majority of the reports we receive as most "
-"reports without any contact information are useless. On the other hand it "
-"also provides an opportunity for eavesdroppers, like your email or Internet "
+"reports without any contact information are useless. But note that it also "
+"provides an opportunity for eavesdroppers, like your email or Internet "
"provider, to confirm that you are using Tails."
msgstr ""
"Nous donner une adresse email permet de vous contacter pour clarifier le "
@@ -351,8 +358,8 @@ msgstr "Dans Tails, lancez WhisperBack"
#. type: Bullet: '2. '
msgid "In the bug report window, expand \"technical details to include\""
msgstr ""
-"Dans la fenêtre de rapport de bug, faites dérouler \"technical details to "
-"include\""
+"Dans la fenêtre de rapport de bug, faites dérouler l'onglet \"Détails"
+"techniques à inclure\""
#. type: Bullet: '3. '
msgid "Copy everything in the \"debugging info\" box"
diff --git a/wiki/src/doc/first_steps/bug_reporting.mdwn b/wiki/src/doc/first_steps/bug_reporting.mdwn
index 26bc496..036fb72 100644
--- a/wiki/src/doc/first_steps/bug_reporting.mdwn
+++ b/wiki/src/doc/first_steps/bug_reporting.mdwn
@@ -82,7 +82,7 @@ Optional email address
Giving us an email address allows us to contact you to clarify the problem. This
is needed for the vast majority of the reports we receive as most reports
-without any contact information are useless. On the other hand it also provides
+without any contact information are useless. But note that it also provides
an opportunity for eavesdroppers, like your email or Internet provider, to
confirm that you are using Tails.
diff --git a/wiki/src/doc/first_steps/bug_reporting.pt.po b/wiki/src/doc/first_steps/bug_reporting.pt.po
index 6c05645..b7a63ff 100644
--- a/wiki/src/doc/first_steps/bug_reporting.pt.po
+++ b/wiki/src/doc/first_steps/bug_reporting.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-09 14:27+0300\n"
+"POT-Creation-Date: 2015-09-30 16:26+0300\n"
"PO-Revision-Date: 2014-06-22 08:57-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -226,11 +226,18 @@ msgid "Optional email address\n"
msgstr "Sobre nos fornecer um endereço de email\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Giving us an email address allows us to contact you to clarify the "
+#| "problem. This is needed for the vast majority of the reports we receive "
+#| "as most reports without any contact information are useless. On the other "
+#| "hand it also provides an opportunity for eavesdroppers, like your email "
+#| "or Internet provider, to confirm that you are using Tails."
msgid ""
"Giving us an email address allows us to contact you to clarify the problem. "
"This is needed for the vast majority of the reports we receive as most "
-"reports without any contact information are useless. On the other hand it "
-"also provides an opportunity for eavesdroppers, like your email or Internet "
+"reports without any contact information are useless. But note that it also "
+"provides an opportunity for eavesdroppers, like your email or Internet "
"provider, to confirm that you are using Tails."
msgstr ""
"Fornecer um endereço de email nos permite contatar você para esclarecer o "
diff --git a/wiki/src/doc/first_steps/installation/manual/mac.de.po b/wiki/src/doc/first_steps/installation/manual/mac.de.po
index 1de27f2..7cb230f 100644
--- a/wiki/src/doc/first_steps/installation/manual/mac.de.po
+++ b/wiki/src/doc/first_steps/installation/manual/mac.de.po
@@ -3,55 +3,56 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-27 16:56+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"
-"Language: \n"
+"Project-Id-Version: Tails translators\n"
+"POT-Creation-Date: 2015-09-27 21:47+0200\n"
+"PO-Revision-Date: 2015-09-29 20:16+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: LANGUAGE <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Manual installation using Mac\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Händische Installation unter Mac\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/first_steps/manual_usb_installation.intro.de\" raw=\"yes\"]]\n"
#. type: Plain text
msgid "This technique uses the command line."
-msgstr ""
+msgstr "Bei dieser Vorgehensweise wird die Kommandozeile benutzt."
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Plain text
#, no-wrap
msgid "<h2 class=\"bullet-number-one\">Find out the device name of the USB stick</h2>\n"
-msgstr ""
+msgstr "<h2 class=\"bullet-number-one\">Den Gerätenamen des USB-Sticks herausfinden</h2>\n"
#. type: Plain text
msgid ""
"The device name should be something like `/dev/disk8`, `/dev/disk9`, etc."
-msgstr ""
+msgstr "Der Gerätename sollte etwas wie `/dev/disk8`, `/dev/disk9`, usw. sein."
#. type: Plain text
msgid "If you are not sure about the exact device name, do the following:"
msgstr ""
+"Falls Sie sich bezüglich des Gerätenamens unsicher sind, tun Sie folgendes:"
#. type: Bullet: ' 1. '
msgid "Unplug the USB stick."
-msgstr ""
+msgstr "Entfernen Sie den USB-Stick vom Rechner."
#. type: Plain text
#, no-wrap
@@ -64,16 +65,23 @@ msgid ""
" </span>\n"
" 1. Execute the following command:\n"
msgstr ""
+" 1. Öffnen Sie das <span class=\"application\">Terminal</span> von\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Programme</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Dienstprogramme</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Terminal.app</span>\n"
+" </span>\n"
+" 1. Führen Sie folgenden Befehl aus:\n"
#. type: Plain text
#, no-wrap
msgid " diskutil list\n"
-msgstr ""
+msgstr " diskutil list\n"
#. type: Plain text
#, no-wrap
msgid " This returns a list of all the current storage devices. For example:\n"
-msgstr ""
+msgstr " Dies zeigt Ihnen eine Liste aller momentanen Datenträger an. Zum Beispiel:\n"
#. type: Plain text
#, no-wrap
@@ -89,10 +97,22 @@ msgid ""
" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
"</pre>\n"
msgstr ""
+"<pre>\n"
+"$ diskutil list\n"
+"/dev/disk0\n"
+" #: TYPE NAME SIZE IDENTIFIER\n"
+" 0: GUID_partition_scheme *500.1 GB disk0\n"
+" 1: EFI 209.7 MB disk0s1\n"
+" 2: Apple_HFS MacDrive 250.0 GB disk0s2\n"
+" 3: EFI 134.1 GB disk0s3\n"
+" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
+"</pre>\n"
#. type: Bullet: ' 1. '
msgid "Plug back the USB stick and run the same command as before:"
msgstr ""
+"Schließen Sie den USB-Stick wieder an und führen Sie den gleichen Befehl wie "
+"zuvor aus:"
#. type: Plain text
#, no-wrap
@@ -101,6 +121,8 @@ msgid ""
" that the size of the device corresponds to the size of your USB\n"
" stick.\n"
msgstr ""
+" Ein neues Medium sollte in der Liste Speichermedien erscheinen. Überprüfen \n"
+" Sie, dass die Größe des Speichermedium der Größe Ihres USB-Sticks entspricht.\n"
#. type: Plain text
#, no-wrap
@@ -120,17 +142,33 @@ msgid ""
" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
"</pre>\n"
msgstr ""
+"<pre>\n"
+"$ diskutil list\n"
+"/dev/disk0\n"
+" #: TYPE NAME SIZE IDENTIFIER\n"
+" 0: GUID_partition_scheme *500.1 GB disk0\n"
+" 1: EFI 209.7 MB disk0s1\n"
+" 2: Apple_HFS MacDrive 250.0 GB disk0s2\n"
+" 3: EFI 134.1 GB disk0s3\n"
+" 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4\n"
+"/dev/disk1\n"
+" #: TYPE NAME SIZE IDENTIFIER\n"
+" 0: FDisk_partition_scheme *4.0 GB disk1\n"
+" 1: Apple_HFS Untitled 1 4.0 GB disk1s1\n"
+"</pre>\n"
#. type: Plain text
msgid ""
"In this example, the USB stick is 4.0 GB and the device name is `/dev/"
"disk1`. Yours are probably different."
msgstr ""
+"In diesem Beispiel ist der USB-Stick 4.0 GB groß und der Gerätename lautet `/"
+"dev/disk1`. Ihrer ist möglicherweise anders."
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr ""
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
@@ -138,32 +176,36 @@ msgid ""
"If you are not sure about the device name you should stop proceeding or\n"
"<strong>you risk overwriting any hard disk on the system</strong>.\n"
msgstr ""
+"Falls Sie sich bezüglich des Gerätenamens nicht sicher sind, sollten Sie das Vorgehen\n"
+"abbrechen oder <strong>Sie riskieren, dass jegliche Festplatten des Systems überschrieben werden</strong>.\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid "<h2 class=\"bullet-number-two\">Unmount the USB stick</h2>\n"
-msgstr ""
+msgstr "<h2 class=\"bullet-number-two\">Den USB-Stick auswerfen</h2>\n"
#. type: Plain text
msgid ""
"Execute the following command, replacing `[device]` with the device name "
"found in step 1."
msgstr ""
+"Führen Sie folgenden Befehl aus und ersetzen Sie `[device]` mit dem "
+"Gerätenamen, den Sie in Schritt 1 herausgefunden haben."
#. type: Plain text
#, no-wrap
msgid " diskutil unmountDisk [device]\n"
-msgstr ""
+msgstr " diskutil unmountDisk [device]\n"
#. type: Plain text
#, no-wrap
msgid "<h2 class=\"bullet-number-three\">Do the copy</h2>\n"
-msgstr ""
+msgstr "<h2 class=\"bullet-number-three\">Das Kopieren durchführen</h2>\n"
#. type: Plain text
msgid ""
@@ -171,25 +213,29 @@ msgid ""
"ISO image that you want to copy and `[device]` by the device name found in "
"step 1. You can add `r` before `disk` to make the installation faster."
msgstr ""
+"Führen Sie folgenden Befehl aus und ersetzen Sie `[tails.iso]` mit dem Pfad "
+"zum ISO-Image, die Sie kopieren möchten und `[device]` mit dem in Schritt 1 "
+"gefundenen Gerätenamen. Sie können `r` vor `disk` hinzufügen um die "
+"Installation zu verschnellern."
#. type: Plain text
#, no-wrap
msgid " dd if=[tails.iso] of=[device] bs=16m && sync\n"
-msgstr ""
+msgstr " dd if=[tails.iso] of=[device] bs=16m && sync\n"
#. type: Plain text
msgid "You should get something like this:"
-msgstr ""
+msgstr "Sie sollten etwas wie folgt erhalten:"
#. type: Plain text
#, no-wrap
msgid " dd if=tails-i386-1.3.iso of=/dev/rdisk9 bs=16m && sync\n"
-msgstr ""
+msgstr " dd if=tails-i386-1.3.iso of=/dev/rdisk9 bs=16m && sync\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
-msgstr ""
+msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
@@ -203,12 +249,22 @@ msgid ""
"<span class=\"application\">Terminal</span>.\n"
"Then complete the command and execute it.\n"
msgstr ""
+"Falls Sie sich über den Pfad zum ISO-Image unsicher sind oder Sie eine\n"
+"<span class=\"guilabel\">No such file or directory</span> Fehlermeldung\n"
+"erhalten, können Sie zunächst <code>dd if=</code> eingeben\n"
+"und anschließend das Icon des ISO-Images per Drag and Drop aus einem Dateibrowser in das\n"
+"<span class=\"application\">Terminal</span> ziehen. Dies sollte den richtigen Pfad zum ISO-Image\n"
+"in das <span class=\"application\">Terminal</span> einsetzen. Vervollständigen Sie anschließend den Befehl\n"
+"und führen Sie ihn aus.\n"
#. type: Plain text
msgid ""
"If you don't see any error message, Tails is being copied onto the USB "
"stick. The whole process might take some time, generally a few minutes."
msgstr ""
+"Wenn Sie keine Fehlermeldung sehen, wird Tails auf den USB-Stick kopiert. "
+"Der gesamte Vorgang kann etwas Zeit in Anspruch nehmen, in der Regel einige "
+"Minuten."
#. type: Plain text
#, no-wrap
@@ -216,32 +272,36 @@ msgid ""
"If you get a \"Permission denied\" error, try executing the command with\n"
"<code>sudo</code>:\n"
msgstr ""
+"Falls Sie eine \"Permission denied\" Fehlermeldung erhalten, versuchen Sie den Befehl\n"
+"mit <code>sudo</code> auszuführen:\n"
#. type: Plain text
#, no-wrap
msgid "<pre>sudo dd if=[tails.iso] of=[device] bs=16m && sync</pre>\n"
-msgstr ""
+msgstr "<pre>sudo dd if=[tails.iso] of=[device] bs=16m && sync</pre>\n"
#. type: Plain text
msgid ""
"Be careful, if the device name is wrong you might overwriting any hard disk "
"on the system."
msgstr ""
+"Seien Sie vorsichtig, falls der Gerätename falsch ist, könnten Sie jegliche "
+"Festplatten des Systems überschreiben."
#. type: Plain text
#, no-wrap
msgid "<p>The installation is complete when the command prompt reappears.</p>\n"
-msgstr ""
+msgstr "<p>Die Installation ist abgeschlossen wenn die Eingabeaufforderung wieder erscheint.</p>\n"
#. type: Plain text
#, no-wrap
msgid "<h2 class=\"bullet-number-four\">Start Tails</h2>\n"
-msgstr ""
+msgstr "<h2 class=\"bullet-number-four\">Tails starten</h2>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"next\">\n"
-msgstr ""
+msgstr "<div class=\"next\">\n"
#. type: Plain text
#, no-wrap
@@ -249,43 +309,52 @@ msgid ""
"<p>After the installation completes, follow the instructions to [[start Tails on\n"
"Mac|first_steps/start_tails#usb-mac]].</p>\n"
msgstr ""
+"<p>Nachdem die Installation beendet wurde befolgen Sie folgende Anweisungen, um [[Tails auf\n"
+"Mac zu starten|first_steps/start_tails#usb-mac]].</p>\n"
#. type: Title =
#, no-wrap
msgid "Notes\n"
-msgstr ""
+msgstr "Hinweise\n"
#. type: Plain text
msgid "This method was successfully tested on the following hardware:"
msgstr ""
+"Diese Vorgehensweise wurde erfolgreich auf folgender Hardware getestet:"
#. type: Bullet: ' - '
msgid "MacBook Pro Model A1150 with OS X 10.6.8, 2006"
-msgstr ""
+msgstr "MacBook Pro Modell A1150 mit OS X 10.6.8, 2006"
#. type: Bullet: ' - '
msgid "MacBook Pro Retina 15\" Mid-2012 (aka MacBookPro10,1)"
-msgstr ""
+msgstr "MacBook Pro Retina 15\" Mid-2012 (aka MacBookPro10,1)"
#. type: Plain text
msgid ""
"The method worked on some hardware but a bug in the video support prevented "
"Tails to start successfully:"
msgstr ""
+"Diese Methode hat erfolgreich auf folgender Hardware funktioniert, aber ein "
+"Fehler in der Grafikunterstützung\n"
+"hat den erfolgreichen Start von Tails verhindert."
#. type: Bullet: ' - '
msgid "MacBook Pro Retina with OS X 10.8.3, December 2012"
-msgstr ""
+msgstr "MacBook Pro Retina mit OS X 10.8.3, Dezember 2012"
#. type: Bullet: ' - '
msgid "Macbook Pro model A1150"
-msgstr ""
+msgstr "Macbook Pro Modell A1150"
#. type: Plain text
msgid ""
"Note that Tails developers are in general not very knowledgeable about Mac. "
"Any additional information is welcome."
msgstr ""
+"Bitte beachten Sie, dass Tails Entwickler generell nicht sehr viele "
+"Kenntnisse über Mac haben. Jegliche zusätzliche Informationen sind "
+"willkommen."
#. type: Plain text
#, no-wrap
@@ -293,22 +362,24 @@ msgid ""
"<!--\n"
"An alternative method was suggested:\n"
msgstr ""
+"<!--\n"
+"Eine alternative Vorgehensweise wurde vorgeschlagen:\n"
#. type: Bullet: '1. '
msgid "Open Disk Utility"
-msgstr ""
+msgstr "Öffnen Sie das Festplattendienstprogramm"
#. type: Bullet: '1. '
msgid "Find The Drive"
-msgstr ""
+msgstr "Finden Sie das Laufwerk"
#. type: Bullet: '1. '
msgid "Format Tab"
-msgstr ""
+msgstr "Tab Formatieren"
#. type: Bullet: '1. '
msgid "Source is ISO File"
-msgstr ""
+msgstr "Quelle ist die ISO Datei"
#. type: Plain text
#, no-wrap
@@ -316,3 +387,5 @@ msgid ""
"1. Destination is USB Drive\n"
"-->\n"
msgstr ""
+"1. Ziel ist der USB Stick\n"
+"-->\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
index 3c26ac3..8e9a6fe 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-09-01 10:05+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"
-"Language: \n"
+"PO-Revision-Date: 2015-10-11 10:58+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Introduction to GNOME and the Tails desktop\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Einführung in GNOME und den Tails Desktop\"]]\n"
#. type: Plain text
msgid ""
@@ -27,39 +27,44 @@ msgid ""
"version 3.4 in [Fallback mode](https://help.gnome.org/users/gnome-help/3.4/"
"fallback-mode.html.en)."
msgstr ""
+"Tails verwendet als Desktopumgebung [GNOME](https://www.gnome.org) in "
+"Version 3.4 im [Ausweichmodus](https://help.gnome.org/users/gnome-help/3.4/"
+"fallback-mode.html.de)."
#. type: Plain text
msgid ""
"This page describes some important features of the desktop in the context of "
"Tails."
msgstr ""
+"Diese Seite beschreibt einige wichtige Funktionen des Desktops im Bezug auf "
+"Tails."
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
-msgstr ""
+msgstr "[[!toc levels=2]]\n"
#. type: Title =
#, no-wrap
msgid "Top navigation bar\n"
-msgstr ""
+msgstr "Obere Navigationsleiste\n"
#. type: Plain text
msgid "In the upper left corner of the screen there are two menus:"
-msgstr ""
+msgstr "In der linken oberen Ecke werden zwei Menüs angezeigt:"
#. type: Bullet: ' - '
msgid "the <span class=\"guimenu\">Applications</span> menu"
-msgstr ""
+msgstr "das <span class=\"guimenu\">Anwendungen</span>-Menü"
#. type: Bullet: ' - '
msgid "the <span class=\"guimenu\">Places</span> menu"
-msgstr ""
+msgstr "das <span class=\"guimenu\">Orte</span>-Menü"
#. type: Title -
#, no-wrap
msgid "Applications menu\n"
-msgstr ""
+msgstr "Anwendungsmenü\n"
#. type: Plain text
#, no-wrap
@@ -67,26 +72,28 @@ msgid ""
"The <span class=\"guimenu\">Applications</span> menu provides shortcuts to the\n"
"[[included software|about/features]] and to GNOME configuration utilities.\n"
msgstr ""
+"Das <span class=\"guimenu\">Anwendungen</span>-Menü bietet Ihnen Verknüpfungen zu der\n"
+"[[enthaltenen Software|about/features]] sowie zu den GNOME Konfigurationswerkzeugen.\n"
#. type: Plain text
#, no-wrap
msgid "[[!img applications.png link=no alt=\"Applications menu\"]]\n"
-msgstr ""
+msgstr "[[!img applications.png link=no alt=\"Anwendungsmenü\"]]\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"help\"></a>\n"
-msgstr ""
+msgstr "<a id=\"help\"></a>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"icon\">\n"
-msgstr ""
+msgstr "<div class=\"icon\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!img help-browser.png link=no]]\n"
-msgstr ""
+msgstr "[[!img help-browser.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -99,11 +106,18 @@ msgid ""
" </div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Hilfe</span>: Um auf die GNOME Desktop Hilfe zuzugreifen, wählen Sie\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Zubehör</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Hilfe</span></span>\n"
+" </div>\n"
+"</div>\n"
#. type: Title ###
#, no-wrap
msgid "System Tools submenu"
-msgstr ""
+msgstr "Systemwerkzeuge-Untermenü"
#. type: Plain text
#, no-wrap
@@ -111,11 +125,13 @@ msgid ""
"The <span class=\"guisubmenu\">System Tools</span> submenu allows you to customize\n"
"the GNOME desktop or the system.\n"
msgstr ""
+"Das <span class=\"guisubmenu\">Systemwerkzeuge</span>-Untermenü erlaubt es Ihnen,\n"
+"den GNOME-Desktop oder das System anzupassen.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"next\">\n"
-msgstr ""
+msgstr "<div class=\"next\">\n"
#. type: Plain text
msgid ""
@@ -123,20 +139,24 @@ msgid ""
"the documentation on [[persistence|persistence]] to learn which "
"configuration can be made persistent across separate working sessions."
msgstr ""
+"Standardmäßig werden alle diese Konfigurationen beim Herunterfahren von "
+"Tails zurückgesetzt. Lesen Sie die Dokumentation zum [[beständigen "
+"Speicherbereich|persistence]], um zu erfahren, welche Konfigurationen über "
+"mehrere Arbeitssitzungen hinweg dauerhaft gesichert werden können."
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
msgid "Among other utilities, it includes:"
-msgstr ""
+msgstr "Zusammen mit anderen Werkzeugen enthält es:"
#. type: Plain text
#, no-wrap
msgid "[[!img preferences-system.png link=no]]\n"
-msgstr ""
+msgstr "[[!img preferences-system.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -152,11 +172,21 @@ msgid ""
" </div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Systemeinstellungen</span>:\n"
+" Um verschiedene Systemeinstellungen, zum Beispiel zu Tastatur, Maus und Touchpad oder\n"
+" Bildschirmen anzupassen, wählen Sie\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Systemwerkzeuge</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Einstellungen</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Systemeinstellungen</span></span>\n"
+" </div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img seahorse.png link=no]]\n"
-msgstr ""
+msgstr "[[!img seahorse.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -171,11 +201,20 @@ msgid ""
" </div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Seahorse</span>:\n"
+" Um Ihre OpenPGP Schlüssel zu verwalten, wählen Sie\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Systemwerkzeuge</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Einstellungen</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Passwörter und Verschlüsselung</span></span>\n"
+" </div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img synaptic.png link=no]]\n"
-msgstr ""
+msgstr "[[!img synaptic.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -190,11 +229,20 @@ msgid ""
" </div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+" <span class=\"guimenuitem\">Synaptic-Paketverwaltung</span>:\n"
+" um Softwarepakete zu installieren, entfernen oder zu aktualisieren, wählen Sie\n"
+" <span class=\"menuchoice\">\n"
+" <span class=\"guisubmenu\">Systemwerkzeuge</span>&nbsp;▸\n"
+" <span class=\"guisubmenu\">Systemverwaltung</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Synaptic-Paketverwaltung</span></span>\n"
+" </div>\n"
+"</div>\n"
#. type: Title -
#, no-wrap
msgid "Places menu\n"
-msgstr ""
+msgstr "Orte-Menü\n"
#. type: Plain text
#, no-wrap
@@ -202,11 +250,13 @@ msgid ""
"The <span class=\"guimenu\">Places</span> menu provides direct access to different\n"
"storage media.\n"
msgstr ""
+"Das <span class=\"guimenu\">Orte</span>-Menü bietet Ihnen direkten Zugang zu verschiedenen\n"
+"Speichermedien.\n"
#. type: Plain text
#, no-wrap
msgid "[[!img places.png link=no alt=\"Places menu\"]]\n"
-msgstr ""
+msgstr "[[!img places.png link=no alt=\"Orte-Menü\"]]\n"
#. type: Plain text
#, no-wrap
@@ -216,27 +266,33 @@ msgid ""
" <span class=\"guimenu\">Places</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Connect to Server…</span></span>\n"
msgstr ""
+"Um sich mit einem FTP oder SFTP Server zu verbinden, wählen Sie\n"
+"<span class=\"menuchoice\">\n"
+" <span class=\"guimenu\">Orte</span>&nbsp;▸\n"
+" <span class=\"guimenuitem\">Verbindung zu Server…</span></span>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"app_shortcuts\"></a>\n"
-msgstr ""
+msgstr "<a id=\"app_shortcuts\"></a>\n"
#. type: Title -
#, no-wrap
msgid "Applications shortcuts\n"
-msgstr ""
+msgstr "Anwendungsverknüpfungen\n"
#. type: Plain text
msgid ""
"On the right of these two menu entries, a few shortcuts allow to launch the "
"most frequently used applications."
msgstr ""
+"Auf der rechten Seite dieser beiden Menüeinträge ermöglichen Ihnen ein paar "
+"Verknüpfungen, die am meisten verwendeten Anwendungen zu starten."
#. type: Plain text
#, no-wrap
msgid "[[!img tor-browser.png link=no]]\n"
-msgstr ""
+msgstr "[[!img tor-browser.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -247,16 +303,21 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Tor-Browser</strong>: Surfen Sie im World Wide Web<br/>\n"
+"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/Tor_Browser]]\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"claws_mail\"></a>\n"
-msgstr ""
+msgstr "<a id=\"claws_mail\"></a>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img claws-mail.png link=no]]\n"
-msgstr ""
+msgstr "[[!img claws-mail.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -266,11 +327,15 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>Claws Mail</strong>: E-Mail-Programm<br />\n"
+"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/claws_mail]]\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img pidgin.png link=no]]\n"
-msgstr ""
+msgstr "[[!img pidgin.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -281,11 +346,16 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Pidgin</strong>: Sofortnachrichtendienst-Client<br/>\n"
+"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/pidgin]]\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img keepassx.png link=no]]\n"
-msgstr ""
+msgstr "[[!img keepassx.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -296,16 +366,21 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>KeePassX</strong>: Passwortmanager<br/>\n"
+"[[Lesen Sie die entsprechende Dokumentation|encryption_and_privacy/manage_passwords]]\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"terminal\"></a>\n"
-msgstr ""
+msgstr "<a id=\"terminal\"></a>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img gnome-terminal.png link=no]]\n"
-msgstr ""
+msgstr "[[!img gnome-terminal.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -313,11 +388,13 @@ msgid ""
"<div class=\"text\"><strong>GNOME Terminal</strong>: use the command line</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>GNOME Terminal</strong>: Verwenden Sie die Befehlszeile</div>\n"
+"</div>\n"
#. type: Title -
#, no-wrap
msgid "Notification area\n"
-msgstr ""
+msgstr "Benachrichtigungsbereich\n"
#. type: Plain text
msgid ""
@@ -325,21 +402,25 @@ msgid ""
"offers an interface for some system feature or running application. You are "
"encouraged to check these icons out with the left and right mouse buttons."
msgstr ""
+"In der rechten oberen Ecke werden Sie einige Symbole finden, von denen jedes "
+"eine Bedienoberfläche für einige Systemfunktionen oder laufende Programme "
+"bietet. Wir ermutigen Sie, diese Symbole mit der linken und rechten "
+"Maustaste zu erkunden."
#. type: Plain text
#, no-wrap
msgid "[[!img tor-on.png link=no]]\n"
-msgstr ""
+msgstr "[[!img tor-on.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!img tor-starting.png link=no]]\n"
-msgstr ""
+msgstr "[[!img tor-starting.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!img tor-off.png link=no]]\n"
-msgstr ""
+msgstr "[[!img tor-off.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -350,6 +431,11 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Vidalia</strong>: Grafische Steuerung für Tor<br/>\n"
+"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/vidalia]]\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -357,11 +443,13 @@ msgid ""
"<a id=\"florence\"></a>\n"
"<div class=\"icon\">\n"
msgstr ""
+"<a id=\"florence\"></a>\n"
+"<div class=\"icon\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!img florence.png link=no]]\n"
-msgstr ""
+msgstr "[[!img florence.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -372,21 +460,26 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Florence</strong>: Bildschirmstastatur<br/>\n"
+"[[Lesen Sie die entsprechende Dokumentation|encryption_and_privacy/virtual_keyboard]]\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img gpgApplet-text.png link=no]]\n"
-msgstr ""
+msgstr "[[!img gpgApplet-text.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!img gpgApplet.png link=no]]\n"
-msgstr ""
+msgstr "[[!img gpgApplet.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!img gpgApplet-seal.png link=no]]\n"
-msgstr ""
+msgstr "[[!img gpgApplet-seal.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -396,6 +489,10 @@ msgid ""
"documentation|encryption_and_privacy/gpgapplet]]</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>Tails OpenPGP-Applet</strong>: Verschlüsseln und entschlüsseln\n"
+"Sie die Zwischenablage mit OpenPGP<br/> [[Lesen Sie die entsprechende\n"
+"Dokumentation|encryption_and_privacy/gpgapplet]]</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -403,11 +500,13 @@ msgid ""
"<a id=\"audio\"></a>\n"
"<div class=\"icon\">\n"
msgstr ""
+"<a id=\"audio\"></a>\n"
+"<div class=\"icon\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!img sound.png link=no]]\n"
-msgstr ""
+msgstr "[[!img sound.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -416,11 +515,14 @@ msgid ""
"volume</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>Tonlautstärke</strong>: Steuern Sie die\n"
+"Lautstärke vom Ton</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img power.png link=no]]\n"
-msgstr ""
+msgstr "[[!img power.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -431,6 +533,11 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Energie-Manager</strong>: Informationen über Ihren Akku, wenn Sie einen Laptop\n"
+"benutzen<br/>\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -438,16 +545,18 @@ msgid ""
"<a id=\"keyboard_layout\"></a>\n"
"<div class=\"icon\">\n"
msgstr ""
+"<a id=\"keyboard_layout\"></a>\n"
+"<div class=\"icon\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!img keyboard-en.png link=no]]\n"
-msgstr ""
+msgstr "[[!img keyboard-en.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!img keyboard-de.png link=no]]\n"
-msgstr ""
+msgstr "[[!img keyboard-de.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -457,21 +566,25 @@ msgid ""
"Right-click to configure a different keyboard layout.</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Tastaturlayout</strong>: Aktuelles Tastaturlayout<br/>\n"
+"Rechtsklicken Sie, um ein anderes Tastaturlayout einzustellen.</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img network-idle.png link=no]]\n"
-msgstr ""
+msgstr "[[!img network-idle.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!img network-wired.png link=no]]\n"
-msgstr ""
+msgstr "[[!img network-wired.png link=no]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!img network-wireless.png link=no]]\n"
-msgstr ""
+msgstr "[[!img network-wireless.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -483,6 +596,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Netzwerk-Manager</strong>: Verwalten Sie Ihre drahtlosen oder kabelgebundenen\n"
+"Netzwerkverbindungen<br/>\n"
+"[[Lesen Sie die entsprechende Dokumentation|anonymous_internet/networkmanager]]\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
@@ -490,11 +609,13 @@ msgid ""
"<a id=\"shutdown\"></a>\n"
"<div class=\"icon\">\n"
msgstr ""
+"<a id=\"shutdown\"></a>\n"
+"<div class=\"icon\">\n"
#. type: Plain text
#, no-wrap
msgid "[[!img shutdown.png link=no]]\n"
-msgstr ""
+msgstr "[[!img shutdown.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -503,31 +624,39 @@ msgid ""
"system</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>System herunterfahren</strong>: Fahren Sie das System herunter oder starten Sie es\n"
+"neu</div>\n"
+"</div>\n"
#. type: Title =
#, no-wrap
msgid "Bottom panel\n"
-msgstr ""
+msgstr "Fußleiste\n"
#. type: Plain text
msgid "On the left of the bottom panel are displayed buttons for open windows."
msgstr ""
+"Im linken Bereich der Fußleiste werden Schaltflächen für geöffnete Fenster "
+"angezeigt."
#. type: Plain text
msgid ""
"On the right of the bottom panel, a set of four similar rectangle icons "
"gives access to four different workspaces."
msgstr ""
+"Im rechten Bereich der Fußleiste sehen Sie eine Anordnung vier gleicher, "
+"rechteckiger Symbole, die Zugriff zu vier verschiedenen Arbeitsbereichen "
+"bieten."
#. type: Title =
#, no-wrap
msgid "Desktop shortcuts\n"
-msgstr ""
+msgstr "Desktopverknüpfungen\n"
#. type: Plain text
#, no-wrap
msgid "[[!img computer.png link=no]]\n"
-msgstr ""
+msgstr "[[!img computer.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -535,11 +664,13 @@ msgid ""
"<div class=\"text\"><strong>Computer</strong>: access storage media</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>Computer</strong>: Greifen Sie auf Speichermedien zu</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img user-home.png link=no]]\n"
-msgstr ""
+msgstr "[[!img user-home.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -548,11 +679,14 @@ msgid ""
"user's folder</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>amnesia's Home</strong>: Verknüpfung zum Ordner\n"
+"des Standardkontos</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img emptytrash.png link=no]]\n"
-msgstr ""
+msgstr "[[!img emptytrash.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -561,11 +695,14 @@ msgid ""
"moved</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>Trash</strong>: Wohin die \"gelöschten\" Dateien verschoben\n"
+"werden</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img system-help.png link=no]]\n"
-msgstr ""
+msgstr "[[!img system-help.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -574,11 +711,14 @@ msgid ""
"Tails website and documentation</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\"><strong>Tails-Dokumentation</strong>: Eine lokale Kopie der\n"
+"Tails Website und Dokumentation öffnen</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "[[!img whisperback.png link=no]]\n"
-msgstr ""
+msgstr "[[!img whisperback.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -588,25 +728,30 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
+"<div class=\"text\">\n"
+"<strong>Einen Fehler melden</strong>: Helfen Sie mit, [[Probleme|/support]] in Tails zu lösen\n"
+"</div>\n"
+"</div>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"nautilus\"></a>\n"
-msgstr ""
+msgstr "<a id=\"nautilus\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Managing files with Nautilus\n"
-msgstr ""
+msgstr "Dateien mit Nautilus verwalten\n"
#. type: Plain text
msgid "Nautilus is GNOME's file manager, FTP, SFTP client and more."
msgstr ""
+"Nautilus ist die Dateiverwaltung, der FTP und SFTP Client usw. für GNOME"
#. type: Plain text
#, no-wrap
msgid "[[!img nautilus.png link=no]]\n"
-msgstr ""
+msgstr "[[!img nautilus.png link=no]]\n"
#. type: Plain text
msgid ""
@@ -614,3 +759,7 @@ msgid ""
"menu at top right corner of the screen. To move files or folders, you can "
"drag them from one window and drop them to another."
msgstr ""
+"Um lokale Dateien zu verwalten, folgen Sie den Verknüpfungen vom Desktop "
+"oder aus dem **Orte**-Menü im oberen, linken Eck des Fensterbereichs. Um "
+"Dateien oder Ordner zu verschieben, können Sie sie aus einem Fenster in das "
+"nächste ziehen und loslassen."
diff --git a/wiki/src/doc/first_steps/persistence/configure.de.po b/wiki/src/doc/first_steps/persistence/configure.de.po
index a5c473d..55d4495 100644
--- a/wiki/src/doc/first_steps/persistence/configure.de.po
+++ b/wiki/src/doc/first_steps/persistence/configure.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-24 17:32+0300\n"
+"POT-Creation-Date: 2015-10-13 12:48+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"
@@ -457,15 +457,22 @@ msgstr ""
msgid ""
"If you [[install additional programs|doc/advanced_topics/"
"additional_software]], this feature allows you to download them once and "
-"reinstall them during future working sessions, even offline. Note that those "
-"packages are not automatically installed when restarting Tails."
+"reinstall them during future working sessions, even offline."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you activate this feature, it is recommended to activate the\n"
-"<span class=\"guilabel\">APT Lists</span> feature as well.\n"
+"To reinstall these packages automatically when restarting Tails, use the\n"
+"[[<span class=\"guilabel\">Additional software packages</span> persistence\n"
+"feature|configure#additional_software]].\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"If you activate the <span class=\"guilabel\">APT Packages</span> persistence feature,\n"
+"it is recommended to activate the <span class=\"guilabel\">APT Lists</span> feature as well.\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/configure.fr.po b/wiki/src/doc/first_steps/persistence/configure.fr.po
index ff47d67..1c42e2b 100644
--- a/wiki/src/doc/first_steps/persistence/configure.fr.po
+++ b/wiki/src/doc/first_steps/persistence/configure.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sPACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-20 20:57+0200\n"
+"POT-Creation-Date: 2015-10-13 12:48+0300\n"
"PO-Revision-Date: 2015-06-12 11:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -564,11 +564,16 @@ msgstr ""
"sauvegardés sur le volume persistant.\n"
#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "If you [[install additional programs|doc/advanced_topics/"
+#| "additional_software]], this feature allows you to download them once and "
+#| "reinstall them during future working sessions, even offline. Note that "
+#| "those packages are not automatically installed when restarting Tails."
msgid ""
"If you [[install additional programs|doc/advanced_topics/"
"additional_software]], this feature allows you to download them once and "
-"reinstall them during future working sessions, even offline. Note that those "
-"packages are not automatically installed when restarting Tails."
+"reinstall them during future working sessions, even offline."
msgstr ""
"Si vous [[installez des logiciels additionnels|doc/advanced_topics/"
"additional_software]], cette option vous permet de n'avoir besoin de les "
@@ -579,8 +584,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you activate this feature, it is recommended to activate the\n"
-"<span class=\"guilabel\">APT Lists</span> feature as well.\n"
+"To reinstall these packages automatically when restarting Tails, use the\n"
+"[[<span class=\"guilabel\">Additional software packages</span> persistence\n"
+"feature|configure#additional_software]].\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you activate this feature, it is recommended to activate the\n"
+#| "<span class=\"guilabel\">APT Lists</span> feature as well.\n"
+msgid ""
+"If you activate the <span class=\"guilabel\">APT Packages</span> persistence feature,\n"
+"it is recommended to activate the <span class=\"guilabel\">APT Lists</span> feature as well.\n"
msgstr ""
"Si vous activez cette option, il est recommandé d'activer également l'option\n"
"<span class=\"guilabel\">Listes d'APT</span>.\n"
diff --git a/wiki/src/doc/first_steps/persistence/configure.mdwn b/wiki/src/doc/first_steps/persistence/configure.mdwn
index 092fe12..f65bc37 100644
--- a/wiki/src/doc/first_steps/persistence/configure.mdwn
+++ b/wiki/src/doc/first_steps/persistence/configure.mdwn
@@ -236,11 +236,14 @@ When this feature is activated, the packages that you install using the
If you
[[install additional programs|doc/advanced_topics/additional_software]],
this feature allows you to download them once and reinstall them
-during future working sessions, even offline. Note that those
-packages are not automatically installed when restarting Tails.
+during future working sessions, even offline.
-If you activate this feature, it is recommended to activate the
-<span class="guilabel">APT Lists</span> feature as well.
+To reinstall these packages automatically when restarting Tails, use the
+[[<span class="guilabel">Additional software packages</span> persistence
+feature|configure#additional_software]].
+
+If you activate the <span class="guilabel">APT Packages</span> persistence feature,
+it is recommended to activate the <span class="guilabel">APT Lists</span> feature as well.
<a id="apt_lists"></a>
diff --git a/wiki/src/doc/first_steps/persistence/configure.pt.po b/wiki/src/doc/first_steps/persistence/configure.pt.po
index 61be825..f3c6bdc 100644
--- a/wiki/src/doc/first_steps/persistence/configure.pt.po
+++ b/wiki/src/doc/first_steps/persistence/configure.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-24 17:32+0300\n"
+"POT-Creation-Date: 2015-10-13 12:48+0300\n"
"PO-Revision-Date: 2014-07-17 15:53-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -568,8 +568,7 @@ msgstr ""
msgid ""
"If you [[install additional programs|doc/advanced_topics/"
"additional_software]], this feature allows you to download them once and "
-"reinstall them during future working sessions, even offline. Note that those "
-"packages are not automatically installed when restarting Tails."
+"reinstall them during future working sessions, even offline."
msgstr ""
"Se você instalar programas adicionais, esta funcionalidade permite que você "
"baixe-os somente uma vez e reinstale em sessões de trabalho futuras, mesmo "
@@ -579,8 +578,19 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"If you activate this feature, it is recommended to activate the\n"
-"<span class=\"guilabel\">APT Lists</span> feature as well.\n"
+"To reinstall these packages automatically when restarting Tails, use the\n"
+"[[<span class=\"guilabel\">Additional software packages</span> persistence\n"
+"feature|configure#additional_software]].\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "If you activate this feature, it is recommended to activate the\n"
+#| "<span class=\"guilabel\">APT Lists</span> feature as well.\n"
+msgid ""
+"If you activate the <span class=\"guilabel\">APT Packages</span> persistence feature,\n"
+"it is recommended to activate the <span class=\"guilabel\">APT Lists</span> feature as well.\n"
msgstr "Se você ativar esta funcionalidade, é recomendável que ative também a funcionalidade de <span class=\"guilabel\">Listas APT</span>.\n"
#. type: Plain text
diff --git a/wiki/src/doc/first_steps/persistence/warnings.de.po b/wiki/src/doc/first_steps/persistence/warnings.de.po
index 222b45d..fcaa25b 100644
--- a/wiki/src/doc/first_steps/persistence/warnings.de.po
+++ b/wiki/src/doc/first_steps/persistence/warnings.de.po
@@ -3,38 +3,38 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-02-23 14:55+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"
-"Language: \n"
+"PO-Revision-Date: 2015-10-04 20:33+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Warnings about persistence\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Warnungen zum verschlüsselten beständigen Speicherbereich\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"sensitive_documents\"></a>\n"
-msgstr ""
+msgstr "<a id=\"sensitive_documents\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Storing sensitive documents\n"
-msgstr ""
+msgstr "Speicherung sensibler Dokumente\n"
#. type: Plain text
#, no-wrap
@@ -43,22 +43,28 @@ msgid ""
"the device can know that there is a persistent volume on it. Take into consideration\n"
"that you can be forced or tricked to give out its passphrase.\n"
msgstr ""
+"**Der beständige Speicherbreich ist nicht versteckt.** Angreifende im Besitz\n"
+"des Geräts könnten wissen, dass ein beständiger Speicherbereich vorhanden ist.\n"
+"Bedenken Sie, dass Sie gezwungen oder durch einen Trick dazu gebracht werden\n"
+"könnten, das Passwort herauszugeben.\n"
#. type: Plain text
msgid ""
"Read also our instructions to [[securely delete the persistent volume|"
"delete]]."
msgstr ""
+"Lesen Sie auch unsere Anleitung zum [[sicheren Löschen des beständigen "
+"Speicherbereichs|delete]]."
#. type: Plain text
#, no-wrap
msgid "<a id=\"overwriting_configurations\"></a>\n"
-msgstr ""
+msgstr "<a id=\"overwriting_configurations\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Overwriting configurations\n"
-msgstr ""
+msgstr "Überschreiben von Konfigurationen\n"
#. type: Plain text
msgid ""
@@ -67,12 +73,19 @@ msgid ""
"the programs included in Tails, it can break this security or render these "
"programs unusable."
msgstr ""
+"Die in Tails enthaltenen Programme sind im Bezug auf Sicherheit sorgfältig "
+"konfiguriert worden. Falls Sie den beständigen Speicherbereich nutzen, um "
+"die Konfigurationen der in Tails enthaltenen Programme zu überschreiben, "
+"könnte dies diese Sicherheit gefährden oder diese Programme unbenutzbar "
+"machen."
#. type: Plain text
msgid ""
"Be especially careful when using the [[Dotfiles|persistence/"
"configure#dotfiles]] feature."
msgstr ""
+"Seien Sie besonders vorsichtig, wenn Sie mit der [[Dotfiles|persistence/"
+"configure#dotfiles]]-Funktion arbeiten."
#. type: Plain text
#, no-wrap
@@ -81,16 +94,19 @@ msgid ""
"distinguish one Tails user from another. <strong>Changing the default\n"
"configurations can break your anonymity.</strong>\n"
msgstr ""
+"Hinzu kommt, dass die Anonymität von Tor und Tails darauf basiert,\n"
+"es schwieriger zu machen, die Nutzenden von Tails voneinander zu unterscheiden.\n"
+"<strong>Das Verändern der Standardkonfiguration kann Ihre Anonymität gefährden.</strong>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"installing_programs\"></a>\n"
-msgstr ""
+msgstr "<a id=\"installing_programs\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Installing additional programs\n"
-msgstr ""
+msgstr "Installation zusätzlicher Programme\n"
#. type: Plain text
msgid ""
@@ -100,16 +116,23 @@ msgid ""
"protections built-in Tails.** Tails developers may not want or may not be "
"capable of helping you to solve those problems."
msgstr ""
+"Um Ihre Anonymität zu schützen und keine Spuren zu hinterlassen, werden die "
+"Programme von den Tails Entwickelnden mit Sorgfalt ausgewählt und so "
+"konfiguriert, dass sie gut zusammen funktionieren. **Die Installation "
+"zusätzlicher Programme könnte zu unvorhersehbaren Problemen führen und die "
+"Vorsichtsmaßnahmen, die in Tails eingebaut wurden, zerstören.** Die "
+"Entwickelnden von Tails wollen oder können Ihnen möglicherweise nicht "
+"helfen, solche Probleme zu beheben."
#. type: Plain text
#, no-wrap
msgid "<a id=\"browser_plugins\"></a>\n"
-msgstr ""
+msgstr "<a id=\"browser_plugins\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Browser plugins\n"
-msgstr ""
+msgstr "Browser-Erweiterungen\n"
#. type: Plain text
msgid ""
@@ -118,16 +141,20 @@ msgid ""
"mind. **If you install other plugins or change their configuration, you can "
"break your anonymity.**"
msgstr ""
+"In einem System wie Tails ist der Webbrowser ein zentraler Bestandteil. Die "
+"im Browser enthaltenen Plugins sind sorgfältig ausgewählt und im Bezug auf "
+"Sicherheit konfiguriert worden. **Falls Sie andere Plugins installieren oder "
+"die Konfiguration ändern, könnten Sie Ihre Anonymität verlieren.**"
#. type: Plain text
#, no-wrap
msgid "<a id=\"minimum\"></a>\n"
-msgstr ""
+msgstr "<a id=\"minimum\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Use to the minimum\n"
-msgstr ""
+msgstr "Minimale Benutzung\n"
#. type: Plain text
#, no-wrap
@@ -137,16 +164,20 @@ msgid ""
"features of the persistent volume are optional and need to be explicitly\n"
"activated. Only the files and folders that you specify are saved.\n"
msgstr ""
+"**Benutzen Sie den beständigen Speicherbereich nur wenn es notwendig ist und in minimalen Ausmaßen.**\n"
+"Es ist immer möglich, Tails ohne die Aktivierung des beständigen Speicherbereichs zu starten.\n"
+"Alle Funktionen des beständigen Speicherbereichs sind optional und müssen explizit aktiviert werden.\n"
+"Nur die Ordner und Dateien, die von Ihnen angegeben sind, werden gespeichert.\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"open_other_systems\"></a>\n"
-msgstr ""
+msgstr "<a id=\"open_other_systems\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Opening the persistent volume from other operating systems\n"
-msgstr ""
+msgstr "Öffnen des beständigen Speicherbereichs mit anderen Betriebssystemen\n"
#. type: Plain text
#, no-wrap
@@ -157,3 +188,7 @@ msgid ""
"Other operating systems should probably not be trusted to handle\n"
"sensitive information or leave no trace.\n"
msgstr ""
+"**Es ist möglich, den beständigen Speicherbereich\n"
+"von einem anderen Betriebssystem aus zu öffnen, dies könnte jedoch Ihre Sicherheit gefährden.**\n"
+"Anderen Betriebssystemen sollte nicht vertraut werden, mit sensiblen Informationen umzugehen\n"
+"oder keine Spuren zu hinterlassen.\n"
diff --git a/wiki/src/doc/first_steps/reset/mac.de.po b/wiki/src/doc/first_steps/reset/mac.de.po
index de3eb88..1c85c4f 100644
--- a/wiki/src/doc/first_steps/reset/mac.de.po
+++ b/wiki/src/doc/first_steps/reset/mac.de.po
@@ -3,90 +3,99 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-07-07 16:38+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"
-"Language: \n"
+"PO-Revision-Date: 2015-10-11 20:17+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\" Einen USB-Stick oder eine SD-Karte mit Mac OSX zurücksetzen\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/first_steps/usb_reset.intro.de\" raw=\"yes\"]]\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"disk_utility\"></a>\n"
-msgstr ""
+msgstr "<a id=\"disk_utility\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Using <span class=\"application\">Disk Utility</span>\n"
-msgstr ""
+msgstr "Mit Hilfe des <span class=\"application\">Festplattendienstprogramms</span>\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr ""
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
msgid ""
-"<strong>You might overwrite any hard disk on the computer.</strong> If at "
-"some\n"
+"<strong>You might overwrite any hard disk on the computer.</strong> If at some\n"
"point you are not sure about which device to choose, stop proceeding.\n"
msgstr ""
+"<strong>Sie könnten jegliche Festplatten des Computers überschreiben.</strong> Falls Sie\n"
+"sich an irgendeinem Punkt unsicher darüber sind, welches Medium Sie wählen sollen, brechen Sie den Vorgang ab.\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Bullet: '1. '
-msgid "Make sure that the USB stick or SD card that you want to reset is unplugged."
+msgid ""
+"Make sure that the USB stick or SD card that you want to reset is unplugged."
msgstr ""
+"Stellen Sie sicher, dass der USB-Stick bzw. die SD-Karte, die Sie "
+"zurücksetzen möchten, nicht angeschlossen ist."
#. type: Bullet: '2. '
msgid "Start <span class=\"application\">Disk Utility</span>."
msgstr ""
+"Starten Sie das <span class=\"application\">Festplattendienstprogramm</span>."
#. type: Plain text
#, no-wrap
msgid ""
-" A list of all the storage devices on the computer appears in the left "
-"pane\n"
+" A list of all the storage devices on the computer appears in the left pane\n"
" of the window.\n"
-msgstr ""
+msgstr " Eine Liste aller Speichermedien des Computers erscheint im linken Bereich des Fensters.\n"
#. type: Bullet: '3. '
msgid "Plug the USB stick or SD card that you want to reset."
msgstr ""
+"Schließen Sie den USB-Stick oder die SD-Karte an, die Sie zurücksetzen "
+"möchten."
#. type: Plain text
#, no-wrap
msgid ""
" A new device appears in the list of storage devices. This new device\n"
-" corresponds to the USB stick or SD card that you plugged in. Click on "
-"it.\n"
+" corresponds to the USB stick or SD card that you plugged in. Click on it.\n"
msgstr ""
+" Ein neues Medium erscheint in der Liste der Speichermedien. Dieses Medium\n"
+" entspricht dem USB-Stick oder der SD-Karte, die Sie angeschlossen haben. Wählen Sie es aus.\n"
#. type: Bullet: '4. '
msgid ""
"In the list of storage devices, verify that the device corresponds to the "
"device that you want to reset, its brand, its size, etc."
msgstr ""
+"Stellen Sie in der Liste der Speichermedien sicher, dass das Medium jenes "
+"ist, welches Sie zurücksetzen möchten, seinen Hersteller, seine Größe, usw."
#. type: Bullet: '5. '
msgid ""
@@ -94,9 +103,14 @@ msgid ""
"in the right pane and click on the <span class=\"button\">Erase</span> "
"button on the bottom right."
msgstr ""
+"Um das Medium zurückzusetzen, wählen Sie den Reiter <span class=\"guilabel"
+"\">Löschen</span> im rechten Fensterbereich aus und klicken Sie auf die "
+"<span class=\"button\">Löschen</span>-Schaltfläche unten links."
#. type: Bullet: '6. '
msgid ""
"In the confirmation dialog, click on the <span class=\"button\">Erase</span> "
"button to confirm."
msgstr ""
+"Wählen Sie im Bestätigungs-Dialogfenster die Schaltfläche <span class="
+"\"button\">Löschen</span> aus, um zu bestätigen."
diff --git a/wiki/src/doc/first_steps/start_tails.de.po b/wiki/src/doc/first_steps/start_tails.de.po
index 835b1d7..47ceb9f 100644
--- a/wiki/src/doc/first_steps/start_tails.de.po
+++ b/wiki/src/doc/first_steps/start_tails.de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails Translation\n"
"POT-Creation-Date: 2015-08-12 18:59+0300\n"
-"PO-Revision-Date: 2015-06-16 16:48+0100\n"
+"PO-Revision-Date: 2015-10-20 21:09+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: LANGUAGE <tails-l10n@boum.org>\n"
"Language: de\n"
@@ -31,36 +31,31 @@ msgid ""
"Now that you have a Tails device, you can shutdown your computer and start "
"using Tails without altering your existing operating system."
msgstr ""
-"Jetzt, da Sie Tails auf ein Startmedium übertragen haben, können Sie Ihren "
-"Computer herunterfahren und mit der Verwendung von Tails beginnen, ohne Ihr "
-"existierendes Betriebssystem zu verändern."
+"Nun, da Sie ein Tails Medium haben, können Sie Ihren Computer herunterfahren "
+"und mit der Verwendung von Tails beginnen, ohne Ihr existierendes "
+"Betriebssystem zu verändern."
#. type: Plain text
msgid "If Tails starts successfully, the Tails boot menu appears:"
-msgstr ""
+msgstr "Wenn Tails erfolgreich startet, erscheint das Tails Startmenü:"
#. type: Plain text
#, no-wrap
msgid "[[!img tails_boot_menu.png]]\n"
-msgstr ""
+msgstr "[[!img tails_boot_menu.png]]\n"
#. type: Title =
#, no-wrap
msgid "If you are using a DVD\n"
-msgstr "Von einer DVD\n"
+msgstr "Wenn Sie eine DVD verwenden\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Put the Tails DVD into the CD/DVD drive and restart the computer. You "
-#| "should see a welcome screen prompting you to choose your language."
msgid ""
"Put the Tails DVD into the CD/DVD drive and restart the computer. You should "
"the Tails boot menu."
msgstr ""
"Legen Sie die Tails DVD in das CD/DVD Laufwerk ein und starten Sie dann den "
-"Computer neu. Sie sollten einen Startbildschirm sehen, der Sie zur Wahl "
-"einer Sprache auffordert. "
+"Computer neu. Sie sollten das Tails Startmenü sehen."
#. type: Plain text
msgid ""
@@ -79,14 +74,14 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "If you are using a USB stick or SD card\n"
-msgstr "Von einem USB-Stick oder einer SD-Karte\n"
+msgstr "Wenn Sie einen USB-Stick oder eine SD-Karte verwenden\n"
#. type: Plain text
msgid ""
"According to your type of computer, read the instructions for either [[PC|"
"start_tails#usb-pc]] or [[Mac|start_tails#usb-mac]]."
msgstr ""
-"Je nachdem was für einen Computer Sie verwenden lesen Sie entweder die "
+"Je nachdem was für einen Computer Sie verwenden, lesen Sie entweder die "
"Anleitung zu [[PC|start_tails#usb-pc]] oder [[Mac|start_tails#usb-mac]]."
#. type: Plain text
@@ -100,31 +95,15 @@ msgid "PC"
msgstr "PC"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Shutdown the computer, plug your device, and start the computer. You "
-#| "should see a welcome screen prompting you to choose your language."
msgid ""
"Shutdown the computer, plug your device, and start the computer. You should "
"see the Tails boot menu."
msgstr ""
-"Fahren Sie den Rechner herunter, schließen Sie Ihr Speichermedium an und "
-"starten Sie den Rechner. Sie sollten einen Startbildschirm sehen, der Sie "
-"zur Wahl einer Sprache auffordert."
+"Fahren Sie den Computer herunter, schließen Sie Ihr Speichermedium an und "
+"starten Sie den Computer. Sie sollten das Tails Startmenü sehen."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "If your computer does not automatically do so, you might need to edit the BIOS\n"
-#| "settings. Restart your computer, and watch for a message telling you which key\n"
-#| "to press to enter the BIOS setup. It will usually be one of <span\n"
-#| "class=\"keycap\">F1</span>, <span class=\"keycap\">F2</span>, <span\n"
-#| "class=\"keycap\">Del</span>, <span class=\"keycap\">Esc</span> or\n"
-#| "<span class=\"keycap\">F10</span>. Press this key while your computer is booting to edit your BIOS settings.\n"
-#| "You need to edit the <span class=\"guilabel\">Boot Order</span>. Depending on your computer you should see an\n"
-#| "entry for <span class=\"guilabel\">removable drive</span> or <span class=\"guilabel\">USB media</span>. Move this to the top of the list to\n"
-#| "force the computer to attempt to start from your device before starting from the\n"
-#| "internal hard disk. Save your changes and continue.\n"
+#, no-wrap
msgid ""
"If your computer does not automatically do so, you might need to edit the BIOS\n"
"settings. Restart your computer, and watch for a message telling you which key\n"
@@ -133,16 +112,12 @@ msgid ""
"class=\"keycap\">Del</span>, <span class=\"keycap\">Esc</span> or\n"
"<span class=\"keycap\">F10</span>. Press this key while your computer is booting to edit your BIOS settings.\n"
msgstr ""
-"Wenn Ihr Computer dies nicht automatisch macht, ist vielleicht eine Änderung der BIOS Einstellungen\n"
-"notwendig. Starten Sie den Computer neu und halten Sie nach einer Nachricht Ausschau, welche Taste\n"
+"Wenn Ihr Computer dies nicht automatisch macht, müssen Sie vielleicht die BIOS Einstellungen\n"
+"ändern. Starten Sie den Computer neu und halten Sie nach einem Hinweis Ausschau, welche Taste\n"
"Sie drücken müssen, um in das BIOS Setup zu gelangen. Normalerweise ist es eine der folgenden Tasten:\n"
"<span class=\"keycap\">F1</span>, <span class=\"keycap\">F2</span>, <span class=\"keycap\">Entf</span>,\n"
-"<span class=\"keycap\">ESC</span> oder <span class=\"keycap\">F10</span>. Halten Sie diese Taste gedrückt\n"
-"während der Computer startet, um die BIOS Einstellungen zu verändern. Sie müssen die <span class=\"guilabel\">\n"
-"Startreihenfolge</span> (Boot Order) ändern. Abhängig von Ihrem Computer sollten Sie einen Eintrag, wie <span\n"
-"class=\"guilabel\">removable drive</span> oder <span class=\"guilabel\">USB media</span>, sehen. Setzen Sie\n"
-"diesen an den Anfang der Liste, um den Computer anzuweisen, zu versuchen, zuerst von Ihrem Speichermedium zu starten,\n"
-"bevor von der internen Festplatte gestartet wird. Speichern Sie die Änderungen und fahren Sie fort.\n"
+"<span class=\"keycap\">ESC</span> oder <span class=\"keycap\">F10</span>. Halten Sie diese Taste gedrückt,\n"
+"während der Computer startet, um die BIOS Einstellungen zu ändern.\n"
#. type: Plain text
msgid ""
@@ -154,43 +129,28 @@ msgstr ""
"versuchen."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "If your computer does not automatically do so, you might need to edit the BIOS\n"
-#| "settings. Restart your computer, and watch for a message telling you which key\n"
-#| "to press to enter the BIOS setup. It will usually be one of <span\n"
-#| "class=\"keycap\">F1</span>, <span class=\"keycap\">F2</span>, <span\n"
-#| "class=\"keycap\">Del</span>, <span class=\"keycap\">Esc</span> or\n"
-#| "<span class=\"keycap\">F10</span>. Press this key while your computer is booting to edit your BIOS settings.\n"
-#| "You need to edit the <span class=\"guilabel\">Boot Order</span>. Depending on your computer you should see an\n"
-#| "entry for <span class=\"guilabel\">removable drive</span> or <span class=\"guilabel\">USB media</span>. Move this to the top of the list to\n"
-#| "force the computer to attempt to start from your device before starting from the\n"
-#| "internal hard disk. Save your changes and continue.\n"
+#, no-wrap
msgid ""
"1. You need to edit the <span class=\"guilabel\">Boot Order</span>. Depending on your computer you should see an\n"
"entry for <span class=\"guilabel\">removable drive</span> or <span class=\"guilabel\">USB media</span>. Move this to the top of the list to\n"
"force the computer to attempt to start from your device before starting from the\n"
"internal hard disk. Save your changes and continue.\n"
msgstr ""
-"Wenn Ihr Computer dies nicht automatisch macht, ist vielleicht eine Änderung der BIOS Einstellungen\n"
-"notwendig. Starten Sie den Computer neu und halten Sie nach einer Nachricht Ausschau, welche Taste\n"
-"Sie drücken müssen, um in das BIOS Setup zu gelangen. Normalerweise ist es eine der folgenden Tasten:\n"
-"<span class=\"keycap\">F1</span>, <span class=\"keycap\">F2</span>, <span class=\"keycap\">Entf</span>,\n"
-"<span class=\"keycap\">ESC</span> oder <span class=\"keycap\">F10</span>. Halten Sie diese Taste gedrückt\n"
-"während der Computer startet, um die BIOS Einstellungen zu verändern. Sie müssen die <span class=\"guilabel\">\n"
-"Startreihenfolge</span> (Boot Order) ändern. Abhängig von Ihrem Computer sollten Sie einen Eintrag, wie <span\n"
-"class=\"guilabel\">removable drive</span> oder <span class=\"guilabel\">USB media</span>, sehen. Setzen Sie\n"
-"diesen an den Anfang der Liste, um den Computer anzuweisen, zu versuchen, zuerst von Ihrem Speichermedium zu starten,\n"
+"1. Sie müssen die <span class=\"guilabel\">Startreihenfolge</span> (Boot Order) ändern. Abhängig von Ihrem Computer sollten Sie einen\n"
+"Eintrag wie <span class=\"guilabel\">removable drive</span> oder <span class=\"guilabel\">USB media</span> sehen. Setzen Sie\n"
+"diesen an den Anfang der Liste, um den Computer anzuweisen, zuerst zu versuchen, von Ihrem Speichermedium zu starten,\n"
"bevor von der internen Festplatte gestartet wird. Speichern Sie die Änderungen und fahren Sie fort.\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "For more detailed instruction on how to boot from USB you can read [About.com: How To Boot your Computer from a Bootable USB Device](http://pcsupport.about.com/od/tipstricks/ht/bootusbflash.htm)."
+#, no-wrap
msgid ""
" For more detailed instruction on how to boot from USB you can read [About.com:\n"
"How To Boot your Computer from a Bootable USB\n"
"Device](http://pcsupport.about.com/od/tipstricks/ht/bootusbflash.htm).\n"
-msgstr "Für genauere Anweisungen wie man von USB startet, lesen Sie [wiki.ubuntuusers.de: Live-USB](http://wiki.ubuntuusers.de/Live-USB)."
+msgstr ""
+" Für genauere Anweisungen wie man von USB startet, lesen Sie \n"
+"[wiki.ubuntuusers.de: Live-USB]\n"
+"(http://wiki.ubuntuusers.de/Live-USB).\n"
#. type: Plain text
#, no-wrap
@@ -199,10 +159,13 @@ msgid ""
"following BIOS configurations. Try restarting after each change, as\n"
"each one might solve your problem.\n"
msgstr ""
+" Falls das Ändern der Startreihenfolge nicht ausreicht, können Sie auch\n"
+"die folgenden BIOS Einstellungen probieren. Versuchen Sie nach jeder Änderung\n"
+"neu zu starten, da jede einzelne Ihr Problem möglicherweise lösen könnte.\n"
#. type: Bullet: '2. '
msgid "Disable Fast boot and Secure boot."
-msgstr ""
+msgstr "Deaktivieren Sie Fast Boot und Secure Boot."
#. type: Bullet: '3. '
msgid ""
@@ -211,18 +174,23 @@ msgid ""
"try to configure it to start with legacy BIOS. Try any of the following "
"options if available:"
msgstr ""
+"Wenn der Computer eingstellt ist, mit Legacy BIOS zu starten, versuchen Sie "
+"ihn zu konfigurieren, mit UEFI zu starten. Anderenfalls, wenn der Computer "
+"eingestellt ist, mit UEFI zu starten, versuchen Sie ihn zu konfigurieren, "
+"mit Legacy BIOS zu starten. Versuchen Sie, falls verfügbar, jede dieser "
+"Optionen:"
#. type: Bullet: ' - '
msgid "Enable Legacy mode"
-msgstr ""
+msgstr "Aktivieren Sie den Legacy Modus"
#. type: Bullet: ' - '
msgid "Enable CSM boot"
-msgstr ""
+msgstr "Aktivieren Sie CSM Boot"
#. type: Bullet: ' - '
msgid "Disable UEFI"
-msgstr ""
+msgstr "Deaktivieren Sie UEFI"
#. type: Plain text
#, no-wrap
@@ -230,12 +198,17 @@ msgid ""
" You might have to undo these changes to start your usual operating\n"
"system again after your Tails session.\n"
msgstr ""
+" Möglicherweise müssen Sie diese Änderungen rückgängig machen, um Ihr\n"
+"reguläres Betriebssystem nach Ihrer Tails Sitzung erneut zu starten.\n"
#. type: Bullet: '4. '
msgid ""
"You can also try to upgrade your BIOS version. Your computer vendor probably "
"has instructions on how to do that on their website."
msgstr ""
+"Sie können auch versuchen, Ihre BIOS Version zu aktualisieren. Ihr "
+"Computerhersteller hat möglicherweise Anweisungen auf der Website, wie dies "
+"erledigt wird."
#. type: Plain text
#, no-wrap
@@ -257,12 +230,12 @@ msgid ""
msgstr ""
"Fahren Sie den Computer herunter, schließen Sie Ihr Speichermedium an, starten\n"
"Sie den Computer neu und halten Sie sofort <span class=\"keycap\">Option</span> gedrückt\n"
-"bis ein Bootmenü erscheint. Wählen Sie in diesem Menü den Eintrag der \n"
+"bis ein Bootmenü erscheint. Wählen Sie in diesem Menü den Eintrag, der \n"
"<span class=\"guimenuitem\">Boot EFI</span> lautet und wie ein USB-Stick aussieht.\n"
#. type: Plain text
msgid "Then you should see the Tails boot menu."
-msgstr ""
+msgstr "Anschließend sollten Sie das Tails Startmenü sehen."
#. type: Plain text
msgid ""
@@ -286,9 +259,9 @@ msgid ""
"instructions</a>.\n"
msgstr ""
"Die Installation von rEFInd ersetzt Ihren ursprünglichen Bootloader.<br/>\n"
-"Dies kann zur Folge haben, dass Ihr Mac nicht mehr startet. Es wird empfohlen\n"
-"ein komplettes Backup zu erstellen und zu wissen, wie man es wiederherstellt.\n"
-"Lesen Sie hierzu <a href=\"https://support.apple.com/kb/HT1427\">die Anleitungen von Apple</a>.\n"
+"Dies kann zur Folge haben, dass Ihr Mac nicht mehr startet. Es wird empfohlen, ein komplettes Backup zu erstellen und zu wissen, wie \n"
+"es wiederhergestellt werden kann. Lesen Sie hierzu <a href=\"https://support.apple.com/kb/HT1427\">die Anleitungen von\n"
+"Apple</a>.\n"
#. type: Plain text
#, no-wrap
@@ -306,7 +279,7 @@ msgid ""
"first_steps/bug_reporting/tails_does_not_start]]."
msgstr ""
"Lesen Sie unsere [[Melderichtlinien, falls Tails nicht startet|doc/"
-"first_steps/bug_reporting/tails_does_not_start]]."
+"first_steps/bug_reporting/tails_does_not_start.de]]."
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/get/signing_key_transition.inline.de.po b/wiki/src/doc/get/signing_key_transition.inline.de.po
index 1029c0e..310f246 100644
--- a/wiki/src/doc/get/signing_key_transition.inline.de.po
+++ b/wiki/src/doc/get/signing_key_transition.inline.de.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-03-22 13:32+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"
-"Language: \n"
+"PO-Revision-Date: 2015-09-15 22:37+0100\n"
+"Last-Translator: spriver <spriver@autistici.org>\n"
+"Language-Team: DE <LL@li.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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
@@ -30,8 +30,13 @@ msgid ""
"to [[import and verify the new signing\n"
"key|news/signing_key_transition#index1h1]].</p>\n"
msgstr ""
+"<p>Tails ist zwischen Tails 1.3 (24. Februar) und Tails 1.3.1 (31. März) [[zu einem neuen\n"
+"Signaturschlüssel|news/signing_key_transition]] gewechselt.\n"
+"Falls Sie den vorherigen Signaturschlüssel besessen haben, stellen Sie sicher,\n"
+"dass Sie den [[neuen Signaturschlüssel importieren und\n"
+"verifizieren|news/signing_key_transition#index1h1]].</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
diff --git a/wiki/src/doc/get/trusting_tails_signing_key.de.po b/wiki/src/doc/get/trusting_tails_signing_key.de.po
index 244f1fb..b4f689a 100644
--- a/wiki/src/doc/get/trusting_tails_signing_key.de.po
+++ b/wiki/src/doc/get/trusting_tails_signing_key.de.po
@@ -3,28 +3,28 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-03-23 02:53+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"
-"Language: \n"
+"PO-Revision-Date: 2015-10-03 11:56+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: DE <LL@li.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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Trusting Tails signing key\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Dem Signaturschlüssel von Tails vertrauen\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/get/signing_key_transition.inline\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/get/signing_key_transition.inline.de\" raw=\"yes\"]]\n"
#. type: Plain text
msgid ""
@@ -32,6 +32,10 @@ msgid ""
"none of them is a perfect and magic solution. Feel free to explore them "
"according to your possibilities and technical skills."
msgstr ""
+"Wir werden Ihnen drei Vorgehensweisen, von der einfachsten bis zur "
+"sichersten, vorstellen. Nochmals, keine von diesen ist eine magische "
+"Komplettlösung. Zögern Sie nicht, sie entsprechend Ihrer Möglichkeiten und "
+"technischer Kenntnisse kennenzulernen."
#. type: Plain text
msgid ""
@@ -40,11 +44,16 @@ msgid ""
"build in it will be built once and for all. Still, you will have to check "
"the ISO image every time you download a new one!"
msgstr ""
+"Bitte beachten Sie, dass alle Versionen von Tails mit dem gleichen Schlüssel "
+"signiert sind, weshalb Sie den Schlüssel nicht jedes Mal aufs Neue "
+"verifizieren müssen und Sie das Vertrauen, welches Sie möglicherweise "
+"zunehmend in ihn aufbauen, ein für alle Mal tun. Dennoch werden Sie das ISO-"
+"Image jedes Mal, wenn Sie ein neues herunterladen, überprüfen müssen."
#. type: Title #
#, no-wrap
msgid "Correlates several downloads of Tails signing key"
-msgstr ""
+msgstr "Verschiedene Downloads des Tails Signaturschlüssels vergleichen"
#. type: Plain text
msgid ""
@@ -52,6 +61,9 @@ msgid ""
"would be to download it several times, from several locations, several "
"computers, possibly several countries, etc."
msgstr ""
+"Eine einfache Methode, um das Vertrauen, das Sie in den Signaturschlüssel "
+"von Tails haben können, zu erhöhen, wäre das Herunterladen von verschiedenen "
+"Standorten, Computern und möglicherweise aus verschiedenen Ländern, usw."
#. type: Plain text
msgid ""
@@ -59,6 +71,10 @@ msgid ""
"directory on a USB stick. Then run the following command from a terminal to "
"check whether all the keys are identical:"
msgstr ""
+"Beispielsweise könnten Sie sie jedes Mal mit einem anderen Namen im gleichen "
+"Verzeichnis auf einem USB-Stick speichern. Führen Sie anschließend folgenden "
+"Befehl in einem Terminal aus, um zu überprüfen, ob die Schlüssel alle "
+"identisch sind:"
#. type: Plain text
#, no-wrap
@@ -66,10 +82,12 @@ msgid ""
" cd [your download directory]\n"
" diff -qs --from-file tails-signing*.key\n"
msgstr ""
+" cd [Ihr Downloadverzeichnis]\n"
+" diff -qs --from-file tails-signing*.key\n"
#. type: Plain text
msgid "This command would output something like this:"
-msgstr ""
+msgstr "Die Ausgabe des Befehls würde etwa wie folgt sein:"
#. type: Plain text
#, no-wrap
@@ -78,17 +96,24 @@ msgid ""
" Files tails-signing-desktop.key and tails-signing-library.key are identical\n"
" Files tails-signing-desktop.key and tails-signing-seattle.key are identical\n"
msgstr ""
+" Files tails-signing-desktop.key and tails-signing-laptop.key are identical\n"
+" Files tails-signing-desktop.key and tails-signing-library.key are identical\n"
+" Files tails-signing-desktop.key and tails-signing-seattle.key are identical\n"
#. type: Plain text
msgid ""
"You would then need to check that every line reports identical key files."
msgstr ""
+"Sie müssten dann überprüfen, dass jede Zeile identische Schlüsseldateien "
+"anzeigt."
#. type: Plain text
msgid ""
"If at least a key differs from the rest, the command would output "
"accordingly:"
msgstr ""
+"Wenn sich mindestens ein Schlüssel vom Rest unterscheidet, würde die Ausgabe "
+"entsprechend lauten:"
#. type: Plain text
#, no-wrap
@@ -97,17 +122,23 @@ msgid ""
" Files tails-signing-desktop.key and tails-signing-library.key are identical\n"
" Files tails-signing-desktop.key and tails-signing-seattle.key differ\n"
msgstr ""
+" Files tails-signing-desktop.key and tails-signing-laptop.key are identical\n"
+" Files tails-signing-desktop.key and tails-signing-library.key are identical\n"
+" Files tails-signing-desktop.key and tails-signing-seattle.key differ\n"
#. type: Plain text
msgid ""
"You could also use this technique to compare keys downloaded by your friends "
"or other people you trust."
msgstr ""
+"Sie können diese Vorgehensweise auch benutzen, um Schlüssel zu vergleichen, "
+"die von befreundeten Personen oder Menschen, denen Sie vertrauen, "
+"heruntergeladen wurden."
#. type: Title #
#, no-wrap
msgid "Using the OpenPGP Web of Trust"
-msgstr ""
+msgstr "Benutzung des OpenPGP Web of Trust"
#. type: Plain text
msgid ""
@@ -115,6 +146,10 @@ msgid ""
"in a stronger way than what standard HTTPS offers you, you will need to use "
"the OpenPGP Web of Trust."
msgstr ""
+"Wenn Sie besonders vorsichtig sein und den Tails Signaturschlüssel wirklich "
+"auf eine sicherere Weise verifizieren wollen, als es Ihnen übliches HTTPS "
+"bietet, möchten, wird es nötig sein, dass Sie das OpenPGP Web of Trust "
+"nutzen."
#. type: Plain text
msgid ""
@@ -125,6 +160,13 @@ msgid ""
"several times to be vulnerable to attacks [[as explained on our warning page|"
"about/warning#man-in-the-middle]]."
msgstr ""
+"Eine der grundlegenden Probleme von üblichem HTTPS ist, dass das Vertrauen, "
+"welches wir in eine Webseite setzen, von Zertifizierungsstellen abhängt: "
+"Eine hierarchische und geschlossene Gruppe von Firmen und staatlichen "
+"Institutionen, die durch Webbrowser verifiziert werden. Dieses "
+"Vertrauensmodell wird schon lange kritisiert und ist erwiesenermaßen durch "
+"Angriffe verwundbar, [[wie wir es auf unserer Warnungsseite beschreiben|"
+"about/warning#man-in-the-middle]]."
#. type: Plain text
msgid ""
@@ -132,6 +174,10 @@ msgid ""
"website, and that designation of trust should be done on the basis of human "
"interaction."
msgstr ""
+"Stattdessen glauben wir, dass den Nutzenden bezüglich dem Vertrauen zu einer "
+"Webseite die letztendliche Entscheidung überlassen werden sollte und dass "
+"die Bereitstellung von Vertrauen auf der Basis von menschlicher Interaktion "
+"geschehen sollte."
#. type: Plain text
msgid ""
@@ -139,6 +185,9 @@ msgid ""
"decentralized trust model based on OpenPGP keys. Let's see that with an "
"example."
msgstr ""
+"Das OpenPGP [[!wikipedia_de Web_of_Trust desc=\"Web of Trust\"]] ist ein auf "
+"OpenPGP-Schlüsseln basierendes, dezentrales Vertrauensmodell. Werfen wir mit "
+"einem Beispiel einen Blick darauf."
#. type: Plain text
#, no-wrap
@@ -146,6 +195,8 @@ msgid ""
"*You're a friend of Alice and really trust her way of managing OpenPGP keys.\n"
"You're trusting Alice's key.*\n"
msgstr ""
+"*Sie sind mit Alice befreundet und vertrauen ihr wirklich, wie sie ihre OpenPGP Schlüssel verwaltet.\n"
+"Sie vertrauen Alice's Schlüssel.*\n"
#. type: Plain text
#, no-wrap
@@ -153,6 +204,8 @@ msgid ""
"*Furthermore, Alice met Bob, a Tails developer, in a conference, and signed\n"
"Bob's key. Alice is trusting Bob's key.*\n"
msgstr ""
+"*Hinzu kommt, dass Alice Bob, einen Tails Entwickler, bei einer Konferenz trifft und\n"
+"Bob's Schlüssel signiert. Alice vertraut Bob's Schlüssel.*\n"
#. type: Plain text
#, no-wrap
@@ -160,12 +213,17 @@ msgid ""
"*Bob is a Tails developer who directly owns the Tails signing key. Bob fully\n"
"trusts Tails signing key.*\n"
msgstr ""
+"*Bob ist ein Tails Entwickler, welcher direkt den Tails Signaturschlüssel besitzt. Bob\n"
+"vertraut dem Tails Signaturschlüssel vollständig.*\n"
#. type: Plain text
msgid ""
"This scenario creates a trust path from you to Tails signing key that could "
"allow you to trust it without having to depend on certificate authorities."
msgstr ""
+"Dieses Szenario erzeugt einen Vertrauenspfad von Ihnen zum Tails "
+"Signaturschlüssel, welcher es Ihnen erlauben kann, ihm ohne die Abhängigkeit "
+"von Zertifizierungsstellen zu vertrauen."
#. type: Plain text
msgid ""
@@ -173,6 +231,10 @@ msgid ""
"intelligent supervision by users. The technical details of creating, "
"managing and trusting OpenPGP keys is outside of the scope of this document."
msgstr ""
+"Dieses Vertrauensmodell ist auch nicht perfekt und benötigt sowohl Vorsicht "
+"als auch intelligente Kontrolle durch Nutzende. Die technischen Details über "
+"das Erstellen, Verwalten und Vertrauen von OpenPGP Schlüssel übersteigt den "
+"Umfang dieses Dokuments."
#. type: Plain text
msgid ""
@@ -180,16 +242,20 @@ msgid ""
"path to Tails signing key since it based on a network of direct human "
"relationships and the knowledge of quite complex tools such as OpenPGP."
msgstr ""
+"Wir gestehen auch ein, dass nicht alle Menschen in der Lage sein könnten, "
+"einen zuverlässigen Vertrauenspfad zum Signaturschlüssel von Tails "
+"aufzubauen, da es auf einem Netzwerk von direkten menschlichen Beziehungen "
+"und dem Fachwissen über recht komplexe Werkzeuge wie OpenPGP basiert."
#. type: Plain text
#, no-wrap
msgid "<a id=\"debian\">\n"
-msgstr ""
+msgstr "<a id=\"debian\">\n"
#. type: Title #
#, no-wrap
msgid "Check Tails signing key against the Debian keyring"
-msgstr ""
+msgstr "Überprüfen Sie den Tails Signaturschlüssel über den Schlüsselbund von Debian"
#. type: Plain text
msgid ""
@@ -198,6 +264,11 @@ msgid ""
"certify this trust relationship and make it public. Tails signing key would "
"now come along with a signature made by Alice."
msgstr ""
+"Anknüpfend an das vorherige Szenario, wo Alice Bob, einen Tails Entwickler, "
+"getroffen hat, hätte sie eine neue Signatur über den Tails Signaturschlüssel "
+"mit ihrem eigenen Schlüssel erstellen können, um dieses Vertrauensverhältnis "
+"zu zertifizieren und es öffentlich zu machen. Der Tails Signaturschlüssel "
+"würde nun zusammen mit der von Alice erstellten Signatur kommen."
#. type: Plain text
#, no-wrap
@@ -209,30 +280,39 @@ msgid ""
"verify the signatures those developers made with their own key on Tails signing\n"
"key.\n"
msgstr ""
+"Der Tails Signaturschlüssel ist tatsächlich bereits von den Schlüsseln von einigen,\n"
+"offiziellen Entwickelnden von Debian, dem Betriebssystem, auf dem Tails basiert\n"
+"signiert. Debian benutzt OpenPGP in großem Ausmaß und Sie können die Schlüssel\n"
+"von allen Entwickelnden durch die Installation des <code>debian-keyring</code> Pakets\n"
+"herunterladen. Sie können anschließend die Signaturen dieser Entwickelnden, die sie mit Ihrem\n"
+"eigenen Schlüssel auf den Signaturschlüssel von Tails erstellt haben, verifizieren.\n"
#. type: Plain text
msgid "To download the Debian keyring you can do:"
msgstr ""
+"Um den Schlüsselbund von Debian herunterzuladen können Sie folgendes tun:"
#. type: Plain text
#, no-wrap
msgid " sudo apt-get install debian-keyring\n"
-msgstr ""
+msgstr " sudo apt-get install debian-keyring\n"
#. type: Plain text
msgid ""
"To get a list of the signatures made by other people on Tails signing key "
"you can do:"
msgstr ""
+"Um eine Liste mit den Signaturen, die von anderen Menschen auf den Tails "
+"Signaturschlüssel gemacht wurden zu sehen, können Sie folgendes tun:"
#. type: Plain text
#, no-wrap
msgid " gpg --keyid-format long --list-sigs A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
-msgstr ""
+msgstr " gpg --keyid-format long --list-sigs A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
#. type: Plain text
msgid "You will get something like this:"
-msgstr ""
+msgstr "Sie werden ungefähr so etwas erhalten:"
#. type: Plain text
#, no-wrap
@@ -251,6 +331,19 @@ msgid ""
" sub 4096R/3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
" sig DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
msgstr ""
+" pub 4096R/DBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
+" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
+" uid [ unknown] Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" sig 3 DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" sig 1202821CBE2CD9C1 2015-01-19 Tails developers (signing key) <tails@boum.org>\n"
+" sig BACE15D2A57498FF 2015-01-19 [User ID not found]\n"
+" sig 9C31503C6D866396 2015-02-03 [User ID not found]\n"
+" sig BB3A68018649AA06 2015-02-04 [User ID not found]\n"
+" sig 091AB856069AAA1C 2015-02-05 [User ID not found]\n"
+" sub 4096R/98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
+" sig DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" sub 4096R/3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
+" sig DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
#. type: Plain text
msgid ""
@@ -259,17 +352,24 @@ msgid ""
"Debian keyring by their key ID: the 16 digit code between the 'sig' tag and "
"the date. You could for example do:"
msgstr ""
+"Die Zeilen, die mit '[User ID not found]' enden, sind Signaturen von "
+"Schlüsseln, die Sie noch nicht in Ihrem Schlüsselbund haben. Sie könnten "
+"versuchen, im Debian Keyring mithilfe ihrer Schlüssel-ID nach ihnen zu "
+"suchen: Der 16 Stellen lange Code zwischen 'sig' und dem Datum. Sie könnten "
+"zum Beispiel folgendes tun:"
#. type: Plain text
#, no-wrap
msgid " gpg --keyring=/usr/share/keyrings/debian-keyring.gpg --list-key 9C31503C6D866396\n"
-msgstr ""
+msgstr " gpg --keyring=/usr/share/keyrings/debian-keyring.gpg --list-key 9C31503C6D866396\n"
#. type: Plain text
msgid ""
"If this signature corresponds to a key in the Debian keyring you will get "
"something like this:"
msgstr ""
+"Falls die Signatur einem Schlüssel im Schlüsselbund von Debian entspricht, "
+"werden Sie etwas wie folgt erhalten:"
#. type: Plain text
#, no-wrap
@@ -283,26 +383,38 @@ msgid ""
" uid [ unknown] Stefano Zacchiroli <zack@pps.univ-paris-diderot.fr>\n"
" sub 4096R/0x7DFA4FED02D0E74C 2010-09-27\n"
msgstr ""
+" pub 4096R/0x9C31503C6D866396 2010-09-27\n"
+" Key fingerprint = 4900 707D DC5C 07F2 DECB 0283 9C31 503C 6D86 6396\n"
+" uid [ unknown] Stefano Zacchiroli <zack@upsilon.cc>\n"
+" uid [ unknown] Stefano Zacchiroli <zack@debian.org>\n"
+" uid [ unknown] Stefano Zacchiroli <zack@cs.unibo.it>\n"
+" uid [ unknown] Stefano Zacchiroli <zack@pps.jussieu.fr>\n"
+" uid [ unknown] Stefano Zacchiroli <zack@pps.univ-paris-diderot.fr>\n"
+" sub 4096R/0x7DFA4FED02D0E74C 2010-09-27\n"
#. type: Plain text
msgid "You can then import it in your own keyring by doing:"
msgstr ""
+"Sie können sie anschließend mit folgendem Befehl in Ihren Schlüsselbund "
+"importieren:"
#. type: Plain text
#, no-wrap
msgid " gpg --keyring=/usr/share/keyrings/debian-keyring.gpg --export 9C31503C6D866396 | gpg --import\n"
-msgstr ""
+msgstr " gpg --keyring=/usr/share/keyrings/debian-keyring.gpg --export 9C31503C6D866396 | gpg --import\n"
#. type: Plain text
msgid ""
"Now you can try to verify the signature made by this new key on Tails "
"signing key by doing:"
msgstr ""
+"Nun können Sie versuchen, die Signatur von diesem neuen Schlüssel über den "
+"Tails Signaturschlüssel zu überprüfen, indem Sie folgendes tun:"
#. type: Plain text
#, no-wrap
msgid " gpg --keyid-format long --check-sigs A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
-msgstr ""
+msgstr " gpg --keyid-format long --check-sigs A490D0F4D311A4153E2BB7CADBB802B258ACD84F\n"
#. type: Plain text
msgid ""
@@ -313,6 +425,13 @@ msgid ""
"algorithm). For example, in the following output the signature of Stefano "
"Zacchiroli on Tails signing key has been successfully verified:"
msgstr ""
+"In der Ausgabe wird der Status der Verifizierung durch eine Markierung, "
+"welche direkt \"sig\" folgt, indiziert. Ein \"!\" bedeutet, dass die "
+"Signatur erfolgreich verifiziert wurde, ein \"-\" bezeichnet eine falsche "
+"Signatur und ein \"%\" wird benutzt, wenn während der Überprüfung der "
+"Signatur ein Fehler aufgetreten ist (zum Beispiel ein nicht unterstützter "
+"Algorithmus). Beispielsweise wird in der folgenden Ausgabe der Signatur von "
+"Stefano Zacchiroli ein Tails Signaturschlüssel erfolgreich verifiziert:"
#. type: Plain text
#, no-wrap
@@ -328,16 +447,26 @@ msgid ""
" sub 4096R/3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
" sig! DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
msgstr ""
+" pub 4096R/DBB802B258ACD84F 2015-01-18 [expires: 2016-01-11]\n"
+" Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
+" uid [ unknown] Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" sig!3 DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" sig! 1202821CBE2CD9C1 2015-01-19 Tails developers (signing key) <tails@boum.org>\n"
+" sig! 9C31503C6D866396 2015-02-03 Stefano Zacchiroli <zack@upsilon.cc>\n"
+" sub 4096R/98FEC6BC752A3DB6 2015-01-18 [expires: 2016-01-11]\n"
+" sig! DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
+" sub 4096R/3C83DCB52F699C56 2015-01-18 [expires: 2016-01-11]\n"
+" sig! DBB802B258ACD84F 2015-01-18 Tails developers (offline long-term identity key) <tails@boum.org>\n"
#. type: Plain text
#, no-wrap
msgid " 3 signatures not checked due to missing keys\n"
-msgstr ""
+msgstr " 3 signatures not checked due to missing keys\n"
#. type: Title #
#, no-wrap
msgid "Get into the Web of Trust!"
-msgstr ""
+msgstr "Kommen Sie in das Web of Trust!"
#. type: Plain text
msgid ""
@@ -346,6 +475,11 @@ msgid ""
"people knowledgeable about OpenPGP, start using it yourself and build trust "
"relationships in order to find your own trust path to Tails signing key."
msgstr ""
+"Da das Web of Trust tatsächlich auf zwischenmenschlichen Beziehungen und "
+"Interaktion im realen Leben basiert, wäre es das Beste, Kontakte zu Menschen "
+"aufzubauen, die sich mit OpenPGP auskennen und zu beginnen, es selbst zu "
+"benutzen und Vertrauensverhältnisse aufzubauen, damit Sie Ihren eigenen "
+"Vertrauenspfad zum Signaturschlüssel von Tails finden."
#. type: Plain text
msgid ""
@@ -353,38 +487,49 @@ msgid ""
"\"]] or other Tails enthusiasts near you and exchange about their OpenPGP "
"practices."
msgstr ""
+"Sie könnten damit beginnen, indem Sie mit einer lokalen [[!wikipedia_de "
+"Linux_User_Group desc=\"%s\"]] oder anderen Tails Enthusiasten in Ihrer "
+"Umgebung in Kontakt treten und sich über deren OpenPGP Methoden austauschen."
#. type: Title #
#, no-wrap
msgid "Further reading on OpenPGP"
-msgstr ""
+msgstr "Weitere Literatur zu OpenPGP"
#. type: Bullet: '- '
msgid "[[!wikipedia GnuPG desc=\"Wikipedia: %s\"]], a free OpenPGP software"
msgstr ""
+"[[!wikipedia_de GnuPG desc=\"Wikipedia: %s\"]], eine freie OpenPGP Software"
#. type: Bullet: '- '
msgid "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
-msgstr ""
+msgstr "[[Apache: How To OpenPGP|http://www.apache.org/dev/openpgp.html]]"
#. type: Bullet: '- '
msgid ""
"[[Debian: Keysigning|http://www.debian.org/events/keysigning]], a tutorial "
"on signing keys of other people"
msgstr ""
+"[[Debian: Schlüsselsignierung|http://www.debian.org/events/keysigning.de."
+"html]], ein Tutorial zum Signieren der Schlüssel von anderen Personen"
#. type: Bullet: '- '
msgid ""
"[[rubin.ch: Explanation of the web of trust of PGP|http://www.rubin.ch/pgp/"
"weboftrust.en.html]]"
msgstr ""
+"[[rubin.ch: Erklärungen zum PGP Web of Trust|http://www.rubin.ch/pgp/"
+"weboftrust.de.html]]"
#. type: Bullet: '- '
msgid ""
"[[Gpg4win: Certificate inspection|http://www.gpg4win.org/doc/en/gpg4win-"
"compendium_16.html]], instructions to manage key trust with Gpg4win"
msgstr ""
+"[[Gpg4win: Zertifikatsprüfung|http://www.gpg4win.org/doc/de/gpg4win-"
+"compendium_16.html]], Anweisungen zum Verwalten von Vertrauen in Schlüssel "
+"mit Gpg4win"
#. type: Bullet: '- '
msgid "<!-- l10n placeholder for language-specific link -->"
-msgstr ""
+msgstr "<!-- l10n placeholder for language-specific link -->"
diff --git a/wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po b/wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po
index 8277fbb..8ad4c1a 100644
--- a/wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po
+++ b/wiki/src/doc/get/verify_the_iso_image_using_gnome.de.po
@@ -3,51 +3,57 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-06-28 21:22+0200\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"
-"Language: \n"
+"PO-Revision-Date: 2015-09-28 19:21+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: de <LL@li.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.6.10\n"
#. type: Content of: outside any tag (error?)
msgid ""
"[[!meta title=\"Verify the ISO image using Linux with Gnome\"]] [[!inline "
"pages=\"doc/get/signing_key_transition.inline\" raw=\"yes\"]]"
msgstr ""
+"[[!meta title=\"Verifizieren des ISO-Images mit Gnome unter Linux\"]] [[!"
+"inline pages=\"doc/get/signing_key_transition.inline.de\" raw=\"yes\"]]"
#. type: Content of: <h3>
msgid ""
"Install <code>seahorse-nautilus</code> and <code>shared-mime-info</code>"
msgstr ""
+"Installieren Sie <code>seahorse-nautilus</code> und <code>shared-mime-info</"
+"code>"
#. type: Content of: <p>
msgid ""
"You need to have recent enough versions of the <code>seahorse-nautilus</"
"code> and <code>shared-mime-info</code> packages installed."
msgstr ""
+"Sie müssen ausreichend aktuelle Versionen der Pakete <code>seahorse-"
+"nautilus</code> und <code>shared-mime-info</code> installiert haben."
#. type: Content of: <p>
msgid "These packages are already installed in Tails."
-msgstr ""
+msgstr "Diese Pakete sind bereits in Tails installiert."
#. type: Content of: <div><p>
msgid "The needed packages are available starting from:"
-msgstr ""
+msgstr "Die benötigten Pakete sind ab folgenden Versionen verfügbar:"
#. type: Content of: <div><p><ul><li>
msgid "Debian version 7 (Wheezy)"
-msgstr ""
+msgstr "Debian Version 7 (Wheezy)"
#. type: Content of: <div><p><ul><li>
msgid "Ubuntu version 15.04 (Vivid)"
-msgstr ""
+msgstr "Ubuntu Version 15.04 (Vivid)"
#. type: Content of: outside any tag (error?)
msgid ""
@@ -57,6 +63,13 @@ msgid ""
"website to add them to your list of repositories. Then, to install the "
"necessary packages, you can execute the following commands:"
msgstr ""
+"Unter Debian Wheezy sind die benötigten Pakete nur als <a href=\"http://"
+"backports.debian.org/\">Backports</a> verfügbar. Lesen Sie die <a href="
+"\"http://backports.debian.org/Instructions/\">Einrichtungsanweisungen</a> "
+"auf der Debian Backports Webseite, um sie zu Ihrer Liste von Paketquellen "
+"hinzuzufügen. Anschließend können Sie zum Installieren der benötigten "
+"Pakete\n"
+"folgende Befehle ausführen:"
#. type: Content of: <pre>
#, no-wrap
@@ -64,12 +77,16 @@ msgid ""
"sudo apt-get update\n"
"sudo apt-get install seahorse-nautilus/wheezy-backports shared-mime-info/wheezy-backports\n"
msgstr ""
+"sudo apt-get update\n"
+"sudo apt-get install seahorse-nautilus/wheezy-backports shared-mime-info/wheezy-backports\n"
#. type: Content of: outside any tag (error?)
msgid ""
"In Debian 8 (Jessie), Ubuntu 15.04 (Vivid), or later, to install the "
"necessary packages, you can execute the following commands:"
msgstr ""
+"Unter Debian 8 (Jessie), Ubuntu 15.04 (Vivid) oder neuer können Sie folgende "
+"Befehle zum Installieren der benötigten Pakete ausführen:"
#. type: Content of: <pre>
#, no-wrap
@@ -77,26 +94,33 @@ msgid ""
"sudo apt update\n"
"sudo apt install seahorse-nautilus\n"
msgstr ""
+"sudo apt update\n"
+"sudo apt install seahorse-nautilus\n"
#. type: Content of: <div><p>
msgid ""
"If you are unable to install the necessary packages, try [[verifying the ISO "
"using the command line|verify_the_iso_image_using_the_command_line]]."
msgstr ""
+"Falls sie nicht imstande sind, die benötigten Pakete zu installieren, "
+"versuchen Sie [[das ISO-Image unter Nutzung der Kommandozeile zu "
+"verifizieren|verify_the_iso_image_using_the_command_line]]."
#. type: Content of: <h3>
msgid "Get the Tails signing key"
-msgstr ""
+msgstr "Beschaffen Sie sich die den Tails Signaturschlüssel"
#. type: Content of: <p>
msgid ""
"If you are using Tails, you already have the signing key. Otherwise, first "
"download Tails signing key:"
msgstr ""
+"Wenn Sie Tails benutzen, besitzen Sie bereits den Signaturschlüssel. "
+"Anderenfalls laden Sie den Tails Signaturschlüssel zunächst herunter:"
#. type: Content of: outside any tag (error?)
msgid "[[!inline pages=\"lib/download_tails_signing_key\" raw=\"yes\"]]"
-msgstr ""
+msgstr "[[!inline pages=\"lib/download_tails_signing_key.de\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
@@ -104,16 +128,22 @@ msgid ""
"action. It will add Tails signing key to your keyring, the collection of "
"OpenPGP keys you already imported:"
msgstr ""
+"Ihr Browser sollte Ihnen vorschlagen, ihn mit \"Schlüssel importieren\" zu "
+"öffnen. Wählen Sie diese Aktion. Dadurch wird der Tails Signaturschlüssel zu "
+"Ihrem Schlüsselbund, der Sammlung der OpenPGP-Schlüssel, die Sie bereits "
+"importiert haben, hinzugefügt:"
#. type: Content of: <p>
msgid ""
"[[!img import_key.png alt=\"What should the web browser do with this file? "
"Open with: Import Key (default)\" link=\"no\"]]"
msgstr ""
+"[[!img import_key.png alt=\"Was soll der Browser mit dieser Datei tun? "
+"Öffnen mit: Schlüssel importieren (standard)\" link=\"no\"]]"
#. type: Content of: <p>
msgid "You will get notified will the following message:"
-msgstr ""
+msgstr "Sie werden durch folgende Mitteilung benachrichtigt:"
#. type: Content of: <p>
msgid ""
@@ -121,69 +151,90 @@ msgid ""
"developers (offline long-term identity key) &lt;tails@boum.org&gt;\" link="
"\"no\"]]"
msgstr ""
+"[[!img key_imported.png alt=\"Schlüssel importiert. Schlüssel für Tails "
+"Entwickler wurde importiert (offline Langzeit-Identitätsschlüssel) &lt;"
+"tails@boum.org&gt;\" link=\"no\"]]"
#. type: Content of: <h3>
msgid "Verify the ISO image"
-msgstr ""
+msgstr "Das ISO-Image verifizieren"
#. type: Content of: <p>
msgid ""
"Now, download the cryptographic signature corresponding to the ISO image you "
"want to verify:"
msgstr ""
+"Laden Sie nun die kryptografische Signatur herunter, die zu dem ISO-Image "
+"passt, das Sie verifizieren möchten:"
#. type: Content of: outside any tag (error?)
msgid "[[!inline pages=\"lib/download_stable_i386_iso_sig\" raw=\"yes\"]]"
-msgstr ""
+msgstr "[[!inline pages=\"lib/download_stable_i386_iso_sig.de\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
"Your browser should propose you to open it with \"Verify Signature\". "
"Choose this action to start the cryptographic verification:"
msgstr ""
+"Ihr Browser sollte Ihnen vorschlagen, sie mit \"Signatur verifizieren\" zu "
+"öffnen. Wählen Sie diese Aktion um die kryptografische Überprüfung zu "
+"starten:"
#. type: Content of: <p>
msgid ""
"[[!img verify_signature.png alt=\"What should the web browser do with this "
"file? Open with: Verify Signature (default)\" link=\"no\"]]"
msgstr ""
+"[[!img verify_signature.png alt=\"Was soll der Browser mit dieser Datei tun? "
+"Öffnen mit: Signatur verifizieren (standard)\" link=\"no\"]]"
#. type: Content of: <p>
msgid ""
"Browse your files to select the Tails ISO image you want to verify. Then, "
"the verification will start. It can take several minutes:"
msgstr ""
+"Durchsuchen Sie Ihre Dateien, um das Tails ISO-Image auszuwählen, welches "
+"Sie verifizieren möchten. Anschließend wird die Verifizierung gestartet. "
+"Dies kann mehrere Minuten dauern:"
#. type: Content of: <p>
msgid "[[!img verifying.png alt=\"Verifying\" link=\"no\"]]"
-msgstr ""
+msgstr "[[!img verifying.png alt=\"Verifizieren\" link=\"no\"]]"
#. type: Content of: <p>
msgid ""
"<strong>If the ISO image is correct</strong> you will get a notification "
"telling you that the signature is good:"
msgstr ""
+"<strong>Wenn das ISO-Image fehlerfrei ist</strong> werden Sie eine "
+"Benachrichtigung erhalten, dass die Signatur in Ordnung ist:"
#. type: Content of: <p>
msgid "[[!img good_signature.png alt=\"Goog Signature\" link=\"no\"]]"
-msgstr ""
+msgstr "[[!img good_signature.png alt=\"Korrekte Signatur\" link=\"no\"]]"
#. type: Content of: <div><p>
msgid "The GNOME notifications appear truncated on Tails 1.1 and later."
msgstr ""
+"Die GNOME Benachrichtigungen erscheinen unter Tails 1.1 und neuer "
+"abgeschnitten."
#. type: Content of: <div><p>
msgid "See&nbsp;[[!tails_ticket 7249]]."
-msgstr ""
+msgstr "Siehe auch&nbsp;[[!tails_ticket 7249]]."
#. type: Content of: <p>
msgid ""
"<strong>If the ISO image is not correct</strong> you will get a notification "
"telling you that the signature is bad:"
msgstr ""
+"<strong>Falls das ISO-Image nicht in Ordnung ist</strong> werden Sie eine "
+"Benachrichtigung erhalten, dass die Signatur fehlerhaft ist:"
#. type: Content of: <p>
msgid ""
"[[!img bad_signature.png alt=\"Bad Signature: Bad or forged signature.\" "
"link=\"no\"]]"
msgstr ""
+"[[!img bad_signature.png alt=\"Fehlerhafe Signatur: Fehlerhafe oder "
+"gefälschte Signatur.\" link=\"no\"]]"
diff --git a/wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.de.po b/wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.de.po
index 4edf3cf..c9b5d6d 100644
--- a/wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.de.po
+++ b/wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.de.po
@@ -3,24 +3,27 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-03-23 02:53+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"
-"Language: \n"
+"PO-Revision-Date: 2015-09-30 17:54+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: DE <LL@li.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.6.10\n"
#. type: Content of: outside any tag (error?)
msgid ""
"[[!meta title=\"Verify the ISO image using other operating systems\"]] [[!"
"inline pages=\"doc/get/signing_key_transition.inline\" raw=\"yes\"]] [[!toc]]"
msgstr ""
+"[[!meta title=\"Das ISO-Image mit anderen Betriebssystemen verifizieren\"]] "
+"[[!inline pages=\"doc/get/signing_key_transition.inline.de\" raw=\"yes\"]] "
+"[[!toc]]"
#. type: Content of: <p>
msgid ""
@@ -28,62 +31,76 @@ msgid ""
"graphical frontends for both Windows and Mac OS X. This also make it "
"possible to check the cryptographic signature with those operating systems:"
msgstr ""
+"GnuPG, eine verbreitete, freie Softwareimplementierung von OpenPGP besitzt "
+"Versionen und grafische Nutzungsoberflächen sowohl für Windows als auch für "
+"Mac OS X. Dies macht es möglich, die kryptografische Signatur auch mit "
+"diesen Betriebssystemen zu verifizieren:"
#. type: Content of: <ul><li>
msgid "[[Gpg4win|http://www.gpg4win.org/]], for Windows"
-msgstr ""
+msgstr "[[Gpg4win|http://www.gpg4win.org/]], für Windows"
#. type: Content of: <ul><li>
msgid "[[GPGTools|http://www.gpgtools.org/]], for Mac OS X"
-msgstr ""
+msgstr "[[GPGTools|http://www.gpgtools.org/]], für Mac OS X"
#. type: Content of: <p>
msgid ""
"You will find on either of those websites detailed documentation on how to "
"install and use them."
msgstr ""
+"Sie werden auf beiden dieser Webseiten detaillierte Dokumentation bezüglich "
+"der Installation und Nutzung finden."
#. type: Content of: <h3>
msgid "For Windows using Gpg4win"
-msgstr ""
+msgstr "Für Windows mit Nutzung von Gpg4win"
#. type: Content of: <p>
msgid "After installing Gpg4win, download Tails signing key:"
msgstr ""
+"Laden Sie nach der Installation von Gpg4win den Tails Signaturschlüssel "
+"herunter:"
#. type: Content of: outside any tag (error?)
msgid "[[!inline pages=\"lib/download_tails_signing_key\" raw=\"yes\"]]"
-msgstr ""
+msgstr "[[!inline pages=\"lib/download_tails_signing_key.de\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
"[[Consult the Gpg4win documentation to import it|http://www.gpg4win.org/doc/"
"en/gpg4win-compendium_15.html]]"
msgstr ""
+"[[Sehen Sie in der Gpg4win Dokumentation nach, um ihn zu importieren|http://"
+"www.gpg4win.org/doc/en/gpg4win-compendium_15.html]]"
#. type: Content of: <p>
msgid ""
"Then, download the cryptographic signature corresponding to the ISO image "
"you want to verify:"
msgstr ""
+"Laden Sie anschließend die kryptografische Signatur herunter, die zu dem ISO-"
+"Image passt, das Sie verifizieren möchten:"
#. type: Content of: outside any tag (error?)
msgid "[[!inline pages=\"lib/download_stable_i386_iso_sig\" raw=\"yes\"]]"
-msgstr ""
+msgstr "[[!inline pages=\"lib/download_stable_i386_iso_sig.de\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
"[[Consult the Gpg4win documentation to check the signature|http://www."
"gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]]"
msgstr ""
+"[[Sehen Sie in der Gpg4win Dokumentation nach, um die Signatur zu überprüfen|"
+"http://www.gpg4win.org/doc/en/gpg4win-compendium_24.html#id4]]"
#. type: Content of: <p>
msgid "If you see the following warning:"
-msgstr ""
+msgstr "Falls Sie folgende Warnung sehen:"
#. type: Content of: outside any tag (error?)
msgid "<a id=\"warning\"></a>"
-msgstr ""
+msgstr "<a id=\"warning\"></a>"
#. type: Content of: <pre>
#, no-wrap
@@ -92,6 +109,9 @@ msgid ""
"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
"The validity of the signature cannot be verified.\n"
msgstr ""
+"Not enough information to check the signature validity.\n"
+"Signed on ... by tails@boum.org (Key ID: 0x58ACD84F\n"
+"The validity of the signature cannot be verified.\n"
#. type: Content of: <p>
msgid ""
@@ -99,13 +119,20 @@ msgid ""
"signing key that you downloaded. This warning is related to the trust that "
"you put in the Tails signing key. See, [[Trusting Tails signing key|doc/get/"
"trusting_tails_signing_key]]. To remove this warning you would have to "
-"personally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign\"]]"
-"</span> the Tails signing key with your own key."
+"personally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign"
+"\"]]</span> the Tails signing key with your own key."
msgstr ""
+"Dann ist das ISO-Image dennoch in Ordnung und laut dem Tails "
+"Signaturschlüssel, den Sie heruntergeladen haben, gültig. Diese Warnung "
+"bezieht sich auf das Vertrauen, das Sie zum Tails Signaturschlüssel haben. "
+"Lesen Sie [[dem Tails Signaturschlüssel vertrauen|doc/get/"
+"trusting_tails_signing_key]]. Um diese Warnung zu beseitigen, müssten Sie "
+"den Tails Signaturschlüssel persönlich mit Ihrem eigenen Schlüssel <span "
+"class=\"definition\">[[!wikipedia Keysigning desc=\"signieren\"]]</span>."
#. type: Content of: <h3>
msgid "For Mac OS X using GPGTools"
-msgstr ""
+msgstr "Für Mac OS X mit Nutzung von GPGTool"
#. type: Content of: <p>
msgid ""
@@ -114,3 +141,7 @@ msgid ""
"To open the command line, navigate to your Applications folder, open "
"Utilities, and double click on Terminal."
msgstr ""
+"Nach der Installation von GPGTools sollte es möglich sein, der Anleitung für "
+"[[Linux mit der Kommandozeile|verify_the_iso_image_using_the_command_line]] "
+"zu folgen. Um die Kommandozeile zu öffnen, navigieren Sie zu Ihrem "
+"Anwendungsordner, öffnen Sie Dienstprgramme und doppelklicken Sie Terminal."
diff --git a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po
index c3b4c14..1699a53 100644
--- a/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po
+++ b/wiki/src/doc/get/verify_the_iso_image_using_the_command_line.de.po
@@ -3,24 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-03-23 02:53+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"
-"Language: \n"
+"PO-Revision-Date: 2015-09-25 22:03+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <LL@li.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.6.10\n"
#. type: Content of: outside any tag (error?)
msgid ""
"[[!meta title=\"Verify the ISO image using the command line\"]] [[!inline "
"pages=\"doc/get/signing_key_transition.inline\" raw=\"yes\"]]"
msgstr ""
+"[[!meta title=\"Verifizieren des ISO-Images auf der Kommandozeile\"]] [[!"
+"inline pages=\"doc/get/signing_key_transition.inline.de\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
@@ -28,24 +30,30 @@ msgid ""
"for Linux: it is installed by default under Debian, Ubuntu, Tails and many "
"other distributions."
msgstr ""
+"Sie müssen GnuPG installiert haben. GnuPG ist die gängigste Implementierung "
+"von OpenPGP für Linux: Es ist standardmäßig unter Debian, Ubuntu, Tails und "
+"vielen weiteren Distributionen installiert."
#. type: Content of: <h3>
msgid "Get the Tails signing key"
-msgstr ""
+msgstr "Beschaffen Sie sich den Tails Signaturschlüssel"
#. type: Content of: <p>
msgid "First, <strong>download Tails signing key</strong>:"
msgstr ""
+"<strong>Laden Sie zunächst den Tails Signaturschlüssel herunter</strong>:"
#. type: Content of: outside any tag (error?)
msgid "[[!inline pages=\"lib/download_tails_signing_key\" raw=\"yes\"]]"
-msgstr ""
+msgstr "[[!inline pages=\"lib/download_tails_signing_key.de\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
"Open a terminal and <strong>import Tails signing key</strong> with the "
"following commands:"
msgstr ""
+"Öffnen Sie ein Terminal und <strong>importieren Sie den Tails "
+"Signaturschlüssel</strong> mit den folgenden Befehlen:"
#. type: Content of: <pre>
#, no-wrap
@@ -53,10 +61,13 @@ msgid ""
"cd [the directory in which you downloaded the key]\n"
"gpg --keyid-format long --import tails-signing.key\n"
msgstr ""
+"cd [das Verzeichnis, in das Sie den Schlüssel heruntergeladen haben]\n"
+"gpg --keyid-format long --import tails-signing.key\n"
#. type: Content of: <p>
msgid "The output should tell you that the key was imported:"
msgstr ""
+"Die Ausgabe sollte Ihnen mitteilen, dass der Schlüssel importiert wurde:"
#. type: Content of: <pre>
#, no-wrap
@@ -65,12 +76,18 @@ msgid ""
"gpg: Total number processed: 1\n"
"gpg: imported: 1 (RSA: 1)\n"
msgstr ""
+"gpg: key DBB802B258ACD84F: public key \"Tails developers (offline long-term identity key) &lt;tails@boum.org&gt;\" imported\n"
+"gpg: Total number processed: 1\n"
+"gpg: imported: 1 (RSA: 1)\n"
#. type: Content of: <p>
msgid ""
"<strong>If you had already imported Tails signing key in the past</strong>, "
"the output should tell you that the key was not changed:"
msgstr ""
+"<strong>Falls Sie den Tails Signaturschlüssel bereits in der Vergangenheit "
+"importiert haben</strong> sollte Ihnen die Ausgabe mitteilen, dass sich der "
+"Schlüssel nicht verändert hat:"
#. type: Content of: <pre>
#, no-wrap
@@ -79,17 +96,22 @@ msgid ""
"gpg: Total number processed: 1\n"
"gpg: unchanged: 1\n"
msgstr ""
+"gpg: key DBB802B258ACD84F: \"Tails developers (offline long-term identity key) &lt;tails@boum.org&gt;\" not changed\n"
+"gpg: Total number processed: 1\n"
+"gpg: unchanged: 1\n"
#. type: Content of: <p>
msgid ""
"<strong>If you are shown the following message</strong> at the end of the "
"output:"
msgstr ""
+"<strong>Falls Ihnen folgende Nachricht</strong> am Ende der Ausgabe "
+"angezeigt wird:"
#. type: Content of: <pre>
#, no-wrap
msgid "gpg: no ultimately trusted keys found\n"
-msgstr ""
+msgstr "gpg: no ultimately trusted keys found\n"
#. type: Content of: <p>
msgid ""
@@ -98,10 +120,15 @@ msgid ""
"create an OpenPGP key for yourself yet, which of no importance to verify the "
"ISO image."
msgstr ""
+"Analysieren Sie die anderen Nachrichten wie üblich: Diese zusätzliche "
+"Nachricht bezieht sich nicht auf den Tails Signaturschlüssel, den Sie "
+"heruntergeladen haben, und bedeutet normalerweise, dass Sie bisher keinen "
+"OpenPGP Schlüssel für sich selbst erstellt haben, was keine Bedeutung für "
+"das Verifizieren des ISO-Images hat."
#. type: Content of: <h3>
msgid "Verify the ISO image"
-msgstr ""
+msgstr "Verifizieren Sie das ISO-Image"
#. type: Content of: <p>
msgid ""
@@ -109,30 +136,37 @@ msgid ""
"the ISO image you want to verify and save it in the same folder as the ISO "
"image:"
msgstr ""
+"Nun können Sie <strong>die kryptografische Signatur</strong> entsprechend "
+"des ISO-Images, das Sie verifizieren möchten, herunterladen und sie im "
+"gleichen Ordner wie das ISO-Image speichern:"
#. type: Content of: outside any tag (error?)
msgid "[[!inline pages=\"lib/download_stable_i386_iso_sig\" raw=\"yes\"]]"
-msgstr ""
+msgstr "[[!inline pages=\"lib/download_stable_i386_iso_sig.de\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
"Then, <strong>start the cryptographic verification</strong>, it can take "
"several minutes:"
msgstr ""
+"Dann können Sie <strong>die kryptografische Verifizierung starten</strong>, "
+"dies kann mehrere Minuten dauern:"
#. type: Content of: <p>
msgid "cd [the ISO image directory]"
-msgstr ""
+msgstr "cd [das Verzeichnis des ISO-Images]"
#. type: Content of: <p>
msgid "[[!inline pages=\"inc/stable_i386_gpg_verify\" raw=\"yes\"]]"
-msgstr ""
+msgstr "[[!inline pages=\"inc/stable_i386_gpg_verify\" raw=\"yes\"]]"
#. type: Content of: <p>
msgid ""
"<strong>If the ISO image is correct</strong> the output will tell you that "
"the signature is good:"
msgstr ""
+"<strong>Falls das ISO-Image in Ordnung ist</strong> wird Ihnen die Ausgabe "
+"mitteilen, dass die Signatur fehlerfrei ist:"
#. type: Content of: <pre>
#, no-wrap
@@ -143,10 +177,15 @@ msgid ""
"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
" Subkey fingerprint: BA2C 222F 44AC 00ED 9899 3893 98FE C6BC 752A 3DB6\n"
msgstr ""
+"pg: Signature made Sun 08 Feb 2015 08:17:03 PM UTC\n"
+"gpg: using RSA key 3C83DCB52F699C56\n"
+"gpg: Good signature from \"Tails developers (offline long-term identity key) &lt;tails@boum.org&gt;\" [unknown]\n"
+"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
+" Subkey fingerprint: BA2C 222F 44AC 00ED 9899 3893 98FE C6BC 752A 3DB6\n"
#. type: Content of: <p>
msgid "or:"
-msgstr ""
+msgstr "oder:"
#. type: Content of: <pre>
#, no-wrap
@@ -157,10 +196,15 @@ msgid ""
"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
" Subkey fingerprint: A509 1F72 C746 BA6B 163D 1C18 3C83 DCB5 2F69 9C56\n"
msgstr ""
+"pg: Signature made Sun 08 Feb 2015 08:17:03 PM UTC\n"
+"gpg: using RSA key 98FEC6BC752A3DB6\n"
+"gpg: Good signature from \"Tails developers (offline long-term identity key) &lt;tails@boum.org&gt;\" [unknown]\n"
+"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
+" Subkey fingerprint: A509 1F72 C746 BA6B 163D 1C18 3C83 DCB5 2F69 9C56\n"
#. type: Content of: <p>
msgid "If you see the following warning:"
-msgstr ""
+msgstr "Falls Sie folgende Warnung sehen:"
#. type: Content of: <pre>
#, no-wrap
@@ -169,6 +213,9 @@ msgid ""
"gpg: There is no indication that the signature belongs to the owner.\n"
"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
msgstr ""
+"gpg: WARNING: This key is not certified with a trusted signature!\n"
+"gpg: There is no indication that the signature belongs to the owner.\n"
+"Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F\n"
#. type: Content of: <p>
msgid ""
@@ -176,15 +223,24 @@ msgid ""
"signing key that you downloaded. This warning is related to the trust that "
"you put in the Tails signing key. See, [[Trusting Tails signing key|doc/get/"
"trusting_tails_signing_key]]. To remove this warning you would have to "
-"personally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign\"]]"
-"</span> the Tails signing key with your own key."
+"personally <span class=\"definition\">[[!wikipedia Keysigning desc=\"sign"
+"\"]]</span> the Tails signing key with your own key."
msgstr ""
+"Dann ist das Tails ISO-Image dennoch in Ordnung und entsprechend des Tails "
+"Signaturschlüssels, den Sie heruntergeladen haben, gültig. Diese Warnung "
+"bezieht sich auf das Vertrauen, dass Sie in den Tails Signaturschlüssel "
+"setzen. Lesen Sie [[dem Tails Signaturschlüssel vertrauen|doc/get/"
+"trusting_tails_signing_key]]. Um diese Warnung zu beseitigen müssten Sie den "
+"Tails Signaturschlüssel persönlich mit Ihrem eigenem Schlüssel <span class="
+"\"definition\">[[!wikipedia Keysigning desc=\"signieren\"]]</span>."
#. type: Content of: <p>
msgid ""
"<strong>If the ISO image is not correct</strong> the output will tell you "
"that the signature is bad:"
msgstr ""
+"<strong>Falls das ISO-Image nicht in Ordnung ist</strong> wird Ihnen die "
+"Ausgabe mitteilen, dass die Signatur fehlerhaft ist:"
#. type: Content of: <pre>
#, no-wrap
@@ -193,3 +249,6 @@ msgid ""
"gpg: using RSA key DBB802B258ACD84F\n"
"gpg: BAD signature from \"Tails developers (offline long-term identity key) &lt;tails@boum.org&gt;\"\n"
msgstr ""
+"gpg: Signature made Sat 30 Apr 2015 10:53:23 AM CEST\n"
+"gpg: using RSA key DBB802B258ACD84F\n"
+"gpg: BAD signature from \"Tails developers (offline long-term identity key) &lt;tails@boum.org&gt;\"\n"
diff --git a/wiki/src/inc/release_notes/1.6.de.po b/wiki/src/inc/release_notes/1.6.de.po
index b21c396..d6b3784 100644
--- a/wiki/src/inc/release_notes/1.6.de.po
+++ b/wiki/src/inc/release_notes/1.6.de.po
@@ -3,31 +3,35 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-09-22 18:35+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"
-"Language: \n"
+"PO-Revision-Date: 2015-09-30 19:47+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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.6.10\n"
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
-msgstr ""
+msgstr "Aktualisierungen und Änderungen"
#. type: Bullet: ' - '
msgid "Upgrade *Tor Browser* to version 5.0.3 (based on Firefox 38.3.0 ESR)."
msgstr ""
+"*Tor Browser* wurde auf Version 5.0.3 (basierend auf Firefox 38.3.0 ESR) "
+"aktualisiert."
#. type: Bullet: ' - '
msgid "Upgrade *I2P* to version 0.9.22 and enable its AppArmor profile."
msgstr ""
+"*I2P* wurde auf Version 0.9.22 aktualisiert und das AppArmor-Profil wurde "
+"aktiviert"
#. type: Plain text
msgid ""
@@ -36,11 +40,15 @@ msgid ""
"in the [Changelog](https://git-tails.immerda.ch/tails/plain/debian/"
"changelog)."
msgstr ""
+"Es gibt viele weitere Änderungen, die im täglichen Betrieb eines typischen "
+"Nutzenden nicht offensichtlich sind. Die technischen Details aller "
+"Änderungen sind im [Changelog](https://git-tails.immerda.ch/tails/plain/"
+"debian/changelog) aufgelistet."
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
-msgstr ""
+msgstr "Behobene Probleme"
#. type: Plain text
#, no-wrap
@@ -53,3 +61,10 @@ msgid ""
" issues, for example if a network only allows connections from a\n"
" list of authorized MAC addresses.\n"
msgstr ""
+" - Mehrere Fehler im Bezug auf das *Verschleiern von MAC-Adressen* wurden behoben:\n"
+" * Falls das Verschleiern der MAC-Adresse von einer Netzwerkschnittstelle\n"
+" fehlschlägt und die Schnittstelle nicht deaktiviert werden kann,\n"
+" werden die Netzwerkfunktionen vollständig deaktiviert\n"
+" * Es wird eine Benachrichtigung angezeigt, wenn das Verschleiern der MAC-Adresse\n"
+" zu Netzwerkproblemen führt, beispielweise wenn das Netzwerk nur Verbindungen\n"
+" von einer Liste von autorisierten MAC-Adressen zulässt.\n"
diff --git a/wiki/src/lib/download_stable_i386_iso_sig.de.html b/wiki/src/lib/download_stable_i386_iso_sig.de.html
new file mode 100644
index 0000000..eec67b4
--- /dev/null
+++ b/wiki/src/lib/download_stable_i386_iso_sig.de.html
@@ -0,0 +1,4 @@
+<p>
+<a class="download-signature" href=[[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]>
+Tails [[!inline pages="inc/stable_i386_version" raw="yes"]] Signatur</a>
+</p>
diff --git a/wiki/src/lib/download_tails_signing_key.de.html b/wiki/src/lib/download_tails_signing_key.de.html
new file mode 100644
index 0000000..b50d947
--- /dev/null
+++ b/wiki/src/lib/download_tails_signing_key.de.html
@@ -0,0 +1,4 @@
+<p>
+<a class="download-key" href="https://tails.boum.org/tails-signing.key">
+Tails Signaturschlüssel</a>
+</p>
diff --git a/wiki/src/lib/trophy-gold.png b/wiki/src/lib/trophy-gold.png
new file mode 100644
index 0000000..6f4bdbe
--- /dev/null
+++ b/wiki/src/lib/trophy-gold.png
Binary files differ
diff --git a/wiki/src/local.css b/wiki/src/local.css
index 52b8b07..0743ec8 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -1047,7 +1047,7 @@ span.guimenuitem { font-weight: bold; }
span.keycap { font-weight: bold; }
span.menuchoice { font-weight: bold; }
span.replaceable { font-style: italic; }
-div.bug, div.caution, div.next, div.note, div.tip {
+div.bug, div.caution, div.next, div.note, div.tip, div.trophy {
background-color: #FFFFF0;
border: 1px solid #E0E0DF;
padding: 0.5em 6px;
@@ -1058,12 +1058,12 @@ div.bug, div.caution, div.next, div.note, div.tip {
margin: 0 0 1.5em 0;
max-width: 38em;
}
-div.bug > p:only-child, div.caution > p:only-child, div.next > p:only-child, div.note > p:only-child, div.tip > p:only-child {
+div.bug > p:only-child, div.caution > p:only-child, div.next > p:only-child, div.note > p:only-child, div.tip > p:only-child, div.trophy > p:only-child {
display: table-cell;
height: 2.5em;
vertical-align: bottom;
}
-div.bug p:last-child, div.caution p:last-child, div.next p:last-child, div.note p:last-child, div.tip p:last-child {
+div.bug p:last-child, div.caution p:last-child, div.next p:last-child, div.note p:last-child, div.tip p:last-child, div.trophy > p:last-child {
margin-bottom: 0;
}
div.bug {
@@ -1081,6 +1081,9 @@ div.note {
div.tip {
background-image: url(lib/admon-tip.png);
}
+div.trophy {
+ background-image: url(lib/trophy-gold.png);
+}
/* Inlined 16x16 icons */
diff --git a/wiki/src/news/version_0.2.fr.po b/wiki/src/news/version_0.2.fr.po
index aacda12..a7a690f 100644
--- a/wiki/src/news/version_0.2.fr.po
+++ b/wiki/src/news/version_0.2.fr.po
@@ -3,36 +3,37 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2012-11-15 19:06+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-07 22:18+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Tue Jun 23 14:43:24 2009\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Tue Jun 23 14:43:24 2009\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid "Amnesia 0.2 released"
-msgstr ""
+msgstr "Amnesia version 0.2 est disponible"
#. type: Plain text
msgid ""
-"See the [online "
-"Changelog](http://git.immerda.ch/?p=amnesia.git;a=blob_plain;f=debian/changelog;hb=refs/tags/0.2) "
-"for details."
+"See the [online Changelog](http://git.immerda.ch/?p=amnesia.git;a=blob_plain;"
+"f=debian/changelog;hb=refs/tags/0.2) for details."
msgstr ""
+"Référez-vous au [journal des changements](http://git.immerda.ch/?p=amnesia."
+"git;a=blob_plain;f=debian/changelog;hb=refs/tags/0.2) pour plus de détails."
diff --git a/wiki/src/news/version_0.3.fr.po b/wiki/src/news/version_0.3.fr.po
index c9f1199..beefce1 100644
--- a/wiki/src/news/version_0.3.fr.po
+++ b/wiki/src/news/version_0.3.fr.po
@@ -3,40 +3,41 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2012-11-15 19:06+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-07 22:19+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Thu Nov 25 23:57:24 2009\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Thu Nov 25 23:57:24 2009\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid "Amnesia 0.3 released"
-msgstr ""
+msgstr "Amnesia version 0.3 est disponible"
#. type: Plain text
msgid ""
-"See the [online "
-"Changelog](http://git.immerda.ch/?p=amnesia.git;a=blob_plain;f=debian/changelog;hb=refs/tags/0.3) "
-"for details."
+"See the [online Changelog](http://git.immerda.ch/?p=amnesia.git;a=blob_plain;"
+"f=debian/changelog;hb=refs/tags/0.3) for details."
msgstr ""
+"Référez-vous au [journal des changements](http://git.immerda.ch/?p=amnesia."
+"git;a=blob_plain;f=debian/changelog;hb=refs/tags/0.3) pour plus de détails. "
#. type: Plain text
msgid "[[Download it, seed it!|/download]]"
-msgstr ""
+msgstr "[[Télécharger le, partagez le !|/download]]"
diff --git a/wiki/src/news/version_0.4.1.fr.po b/wiki/src/news/version_0.4.1.fr.po
index 36e483a..3c6ad17 100644
--- a/wiki/src/news/version_0.4.1.fr.po
+++ b/wiki/src/news/version_0.4.1.fr.po
@@ -3,90 +3,106 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2012-11-15 19:06+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-08 21:30+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sat Feb 06 17:00:00 2010\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Sat Feb 06 17:00:00 2010\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid "Amnesia 0.4.1 released"
-msgstr ""
+msgstr "Amnesia version 0.4.1 disponible"
#. type: Plain text
msgid "Highlighted changes:"
-msgstr ""
+msgstr "Changements importants :"
#. type: Bullet: '* '
msgid ""
"We now ship \"Hybrid\" ISO images, which can be either burnt on CD-ROM or "
"dd'd to a USB stick or hard disk."
msgstr ""
+"Nous fournissons désormais des images ISO \"hybrides\", qui peuvent à la "
+"fois être gravées sur un CD-ROM ou copiées sur une clé USB ou un disque dur."
#. type: Bullet: '* '
msgid ""
-"We now ship multilingual ISO images; initially supported (or rather "
-"wanna-be-supported) languages are: ar, zh, de, en, fr, it, pt, es."
+"We now ship multilingual ISO images; initially supported (or rather wanna-be-"
+"supported) languages are: ar, zh, de, en, fr, it, pt, es."
msgstr ""
+"Nous fournissons désormais des images ISO multilingue ; les langages "
+"supportés (ou en cours de l'être) sont : ar, zh, de, en, fr, it, pt, es."
#. type: Bullet: '* '
msgid ""
-"Icedove was replaced with claws mail, in a bit rough way; see "
-"[[todo/replace_icedove_with_claws]] for best practices and configuration "
-"advices."
+"Icedove was replaced with claws mail, in a bit rough way; see [[todo/"
+"replace_icedove_with_claws]] for best practices and configuration advices."
msgstr ""
+"Icedove a brutalement été remplacé par Claws Mail ; pour en savoir plus "
+"référez-vous à [[todo/replace_icedove_with_claws]] pour des conseils sur la "
+"configuration et les meilleures pratiques."
#. type: Bullet: '* '
msgid "Virtual keyboard: kvkbd was replaced with onBoard."
-msgstr ""
+msgstr "Clavier virtuel : kvkbd remplacé par onBoard."
#. type: Bullet: '* '
msgid "Tor controller: TorK was replaced with Vidalia."
-msgstr ""
+msgstr "Contrôleur Tor : TorK remplacé par Vidalia."
#. type: Bullet: '* '
msgid ""
"Anonymous, GnuPG-encrypted bug reporting is now made easy, thanks to "
"[WhisperBack](http://git.immerda.ch/?p=whisperback.git)."
msgstr ""
+"Les rapports du bug anonymes et chiffrés avec GPG sont maintenant faciles "
+"grâce à [WhisperBack](http://git.immerda.ch/?p=whisperback.git)."
#. type: Bullet: '* '
msgid ""
"Users are now warned at runtime when the amnesia version they are running is "
"affected by security flaws, and which ones they are."
msgstr ""
+"Les utilisateurs sont maintenant informés pendant l'utilisation que la "
+"version d'Amnesia qu'ils exécutent est affectée par des failles de sécurité, "
+"et desquelles il s'agit."
#. type: Plain text
msgid ""
-"See the [online "
-"Changelog](http://git.immerda.ch/?p=amnesia.git;a=blob_plain;f=debian/changelog;hb=refs/tags/0.4.1) "
-"for details."
+"See the [online Changelog](http://git.immerda.ch/?p=amnesia.git;a=blob_plain;"
+"f=debian/changelog;hb=refs/tags/0.4.1) for details."
msgstr ""
+"Référez-vous au [journal des changements](http://git.immerda.ch/?p=amnesia."
+"git;a=blob_plain;f=debian/changelog;hb=refs/tags/0.4.1) pour plus de "
+"détails."
#. type: Plain text
msgid "[[Download it, seed it!|/download]]"
-msgstr ""
+msgstr "[[Télécharger le, partagez le !|/download]]"
#. type: Plain text
msgid ""
"If you want PowerPC, or other architectures, to be supported, feel free to "
-"write us: <amnesia@boum.org>, preferably encrypted with our [[OpenPGP "
-"key|doc/about/openpgp_keys]]."
+"write us: <amnesia@boum.org>, preferably encrypted with our [[OpenPGP key|"
+"doc/about/openpgp_keys]]."
msgstr ""
+"Si vous souhaitez le support de PowerPC, ou d'une autre architecture, "
+"n'hésitez pas à nous écrire : <amnesia@boum.org> de préférence en chiffrant "
+"vos messages avec notre [[clé OpenGPG|doc/about/openpgp_keys]]."
diff --git a/wiki/src/news/version_1.6.de.po b/wiki/src/news/version_1.6.de.po
index e4a3891..2bbc4e9 100644
--- a/wiki/src/news/version_1.6.de.po
+++ b/wiki/src/news/version_1.6.de.po
@@ -3,37 +3,38 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-09-23 21:48+0200\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"
-"Language: \n"
+"PO-Revision-Date: 2015-09-30 20:39+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Tue Sep 22 12:34:56 2015\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Tue Sep 22 12:34:56 2015\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Tails 1.6 is out\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Tails 1.6 wurde veröffentlicht\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid "Tails, The Amnesic Incognito Live System, version 1.6, is out."
msgstr ""
+"Die Version 1.6 von Tails, dem Amnesic Incognito Live System, ist erschienen."
#. type: Plain text
msgid ""
@@ -41,39 +42,46 @@ msgid ""
"Numerous_security_holes_in_1.5.1]] and all users must [[upgrade|doc/"
"first_steps/upgrade]] as soon as possible."
msgstr ""
+"Diese Version behebt [[zahlreiche Sicherheitslücken|security/"
+"Numerous_security_holes_in_1.5.1]] und alle Benutzer müssen so schnell wie "
+"möglich [[aktualisieren|doc/first_steps/upgrade]]."
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Änderungen"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"inc/release_notes/1.6\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"inc/release_notes/1.6.de\" raw=\"yes\"]]\n"
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Bekannte Probleme"
#. type: Plain text
msgid "See the current list of [[known issues|support/known_issues]]."
msgstr ""
+"Lesen Sie sich die Liste der [[bekannten Probleme|support/known_issues]] "
+"durch."
#. type: Title #
#, no-wrap
msgid "Download or upgrade"
-msgstr ""
+msgstr "Herunterladen oder Aktualisieren"
#. type: Plain text
msgid "Go to the [[download]] or [[upgrade|doc/first_steps/upgrade/]] page."
msgstr ""
+"Gehen Sie zur [[Download|download]]-Seite oder [[Aktualisieren|doc/"
+"first_steps/upgrade/]]-Seite."
#. type: Plain text
msgid ""
@@ -81,20 +89,27 @@ msgid ""
"boot after an automatic upgrade, you can [[update your Tails manually|doc/"
"first_steps/upgrade/#manual]]."
msgstr ""
+"Wenn Sie eine Zeit lang automatisch aktualisiert haben und Ihr Tails nach "
+"einem automatischen Upgrade nicht mehr startet können Sie Ihr [[Tails "
+"manuell aktualisieren|doc/first_steps/upgrade/#manual]]."
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "Was kommt als Nächstes?"
#. type: Plain text
msgid ""
"The next Tails release is [[scheduled|contribute/calendar]] for November 3."
msgstr ""
+"Die nächste Version von Tails ist für den 3. November [[geplant|contribute/"
+"calendar]]."
#. type: Plain text
msgid "Have a look to our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
+"Werfen Sie einen Blick auf die [[!tails_roadmap]] um zu sehen, was wir als "
+"Nächstes vorhaben."
#. type: Plain text
msgid ""
@@ -102,3 +117,6 @@ msgid ""
"contribute]], for example by [[donating|contribute/how/donate]]. If you want "
"to help, come talk to us!"
msgstr ""
+"Möchten Sie helfen? Es gibt viele Möglichkeiten, mit denen [[**Sie** zu "
+"Tails beisteuern|contribute]] können, zum Beispiel indem Sie [[spenden|"
+"contribute/how/donate]]. Wenn Sie uns helfen möchten, sprechen Sie uns an!"
diff --git a/wiki/src/news/version_1.6.fr.po b/wiki/src/news/version_1.6.fr.po
index e4a3891..05271b9 100644
--- a/wiki/src/news/version_1.6.fr.po
+++ b/wiki/src/news/version_1.6.fr.po
@@ -3,37 +3,37 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-09-23 21:48+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-12 22:33+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Tue Sep 22 12:34:56 2015\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Tue Sep 22 12:34:56 2015\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Tails 1.6 is out\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Tails 1.6 est sorti\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid "Tails, The Amnesic Incognito Live System, version 1.6, is out."
-msgstr ""
+msgstr "Tails, le système live incognito et amnésique, version 1.6, est sorti"
#. type: Plain text
msgid ""
@@ -41,39 +41,44 @@ msgid ""
"Numerous_security_holes_in_1.5.1]] and all users must [[upgrade|doc/"
"first_steps/upgrade]] as soon as possible."
msgstr ""
+"Cette version corrige [[plusieurs problèmes de sécurité|security/"
+"Numerous_security_holes_in_1.5.1]] et tous les utilisateurs doivent [[mettre "
+"à jour|doc/first_steps/upgrade]] dès que possible."
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Modifications"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"inc/release_notes/1.6\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"inc/release_notes/1.6\" raw=\"yes\"]]\n"
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Problèmes connus"
#. type: Plain text
msgid "See the current list of [[known issues|support/known_issues]]."
-msgstr ""
+msgstr "Voir la liste des [[problèmes connus|support/known_issues]]."
#. type: Title #
#, no-wrap
msgid "Download or upgrade"
-msgstr ""
+msgstr "Télécharger ou mettre à jour"
#. type: Plain text
msgid "Go to the [[download]] or [[upgrade|doc/first_steps/upgrade/]] page."
msgstr ""
+"Aller à la page de [[téléchargement|upgrade] ou de [[mise à jour|doc/"
+"first_steps/upgrade/]]. "
#. type: Plain text
msgid ""
@@ -81,20 +86,27 @@ msgid ""
"boot after an automatic upgrade, you can [[update your Tails manually|doc/"
"first_steps/upgrade/#manual]]."
msgstr ""
+"Si vous n'avez pas fait de mise à jour automatique depuis longtemps et que "
+"votre Tails ne démarre après cette mise à jour automatique, vous pouvez "
+"mettre à jour Tails manuellement|doc/first_steps/upgrade/#manual]]. "
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "Et ensuite ?"
#. type: Plain text
msgid ""
"The next Tails release is [[scheduled|contribute/calendar]] for November 3."
msgstr ""
+"La prochaine version de Tails est [[prévue|contribute/calendar]] pour le 3 "
+"novembre."
#. type: Plain text
msgid "Have a look to our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
+"Jetez un œil à notre [[!tails_roadmap]] pour savoir ce que nous avons en "
+"tête."
#. type: Plain text
msgid ""
@@ -102,3 +114,6 @@ msgid ""
"contribute]], for example by [[donating|contribute/how/donate]]. If you want "
"to help, come talk to us!"
msgstr ""
+"Vous voulez aider ? **Vous** pouvez contribuer à Tails de [[pleins de "
+"manières différentes|contribute]], par exemple en faisait une [[donation|"
+"contribute/how/donate]]. Si vous voulez aider, venez discuter avec nous !"
diff --git a/wiki/src/press/media_appearances_2011.fr.po b/wiki/src/press/media_appearances_2011.fr.po
index d47880e..7f0418e 100644
--- a/wiki/src/press/media_appearances_2011.fr.po
+++ b/wiki/src/press/media_appearances_2011.fr.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-03-13 15:42+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-10 14:31+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Media appearances in 2011\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Apparitions dans les médias en 2011\"]]\n"
#. type: Bullet: '* '
msgid ""
@@ -27,6 +27,9 @@ msgid ""
"h-online.com/open/news/item/Tails-the-incognito-live-system-gets-0-9-"
"release-1381623.html) on The H Open"
msgstr ""
+"18-11-2011 : [Tails, the incognito live system, gets 0.9 release](http://www."
+"h-online.com/open/news/item/Tails-the-incognito-live-system-gets-0-9-"
+"release-1381623.html) sur The H Open"
#. type: Bullet: '* '
msgid ""
@@ -35,33 +38,47 @@ msgid ""
"pratique-n°68-–-novembredecembre-2011-–-chez-votre-marchand-de-journaux) "
"magazine."
msgstr ""
+"28-10-2011 : (en français) Un CD de Tails 0.8 était livré avec le magazine "
+"[Linux Pratique, numéro 68](http://www.linux-pratique.com/index."
+"php/2011/10/28/linux-pratique-n°68-–-novembredecembre-2011-–-chez-votre-"
+"marchand-de-journaux)."
#. type: Bullet: '* '
msgid ""
"2011-08: Linux Journal: [Tails - You Can Never Be Too Paranoid](http://www."
"linuxjournal.com/content/linux-distro-tales-you-can-never-be-too-paranoid)"
msgstr ""
+"08-2011 : Linux Journal : [Tails - You Can Never Be Too Paranoid](http://www."
+"linuxjournal.com/content/linux-distro-tales-you-can-never-be-too-paranoid)"
#. type: Bullet: '* '
msgid ""
"2011-04-27: [The Amnesic Incognito Live System: A live CD for anonymity]"
"(https://lwn.net/Articles/440279/) on lwn.net"
msgstr ""
+"27-04-2011 : [The Amnesic Incognito Live System: A live CD for anonymity]"
+"(https://lwn.net/Articles/440279/) sur lwn.net"
#. type: Bullet: '* '
msgid ""
"2011-04-20: Release announcement for Tails 0.7 on [lwn.net](https://lwn.net/"
"Articles/439371/)"
msgstr ""
+"20-04-2011 : Annonce de la version 0.7 sur [lwn.net](https://lwn.net/"
+"Articles/439371/)"
#. type: Bullet: '* '
msgid ""
"2011-04-18: Incognito is mentionned in the [Distrowatch Weekly News](http://"
"distrowatch.com/weekly.php?issue=20110418#news)"
msgstr ""
+"18-04-2011 : Incognito est mentionné dans les [actualités hebdomadaires de "
+"DistroWatch](http://distrowatch.com/weekly.php?issue=20110418#news)"
#. type: Bullet: '* '
msgid ""
"2011-04-15: Release announcement on [Distrowatch](http://distrowatch.com/?"
"newsid=06629)"
msgstr ""
+"15-04-2011 : Annonce d'une nouvelle version sur [Distrowatch](http://"
+"distrowatch.com/?newsid=06629)"
diff --git a/wiki/src/security/Numerous_security_holes_in_1.5.1.de.po b/wiki/src/security/Numerous_security_holes_in_1.5.1.de.po
index eb57493..1417987 100644
--- a/wiki/src/security/Numerous_security_holes_in_1.5.1.de.po
+++ b/wiki/src/security/Numerous_security_holes_in_1.5.1.de.po
@@ -3,49 +3,53 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails translators\n"
"POT-Creation-Date: 2015-09-22 20:40+0200\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"
-"Language: \n"
+"PO-Revision-Date: 2015-09-28 07:23+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: LANGUAGE <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sun Sep 20 01:02:03 2015\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Sun Sep 20 01:02:03 2015\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Numerous security holes in Tails 1.5.1\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Zahlreiche Sicherheitslücken in Tails 1.5.1\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag security/fixed]]\n"
-msgstr ""
+msgstr "[[!tag security/fixed]]\n"
#. type: Plain text
msgid ""
"Several security holes that affect Tails 1.5.1 are now fixed in Tails 1.6."
msgstr ""
+"Einige Seicherheitslücken, die Tails 1.5.1 betreffen, sind nun in Tails 1.6 "
+"behoben."
#. type: Plain text
msgid ""
"We **strongly** encourage you to [[upgrade to Tails 1.6|news/version_1.6]] "
"as soon as possible."
msgstr ""
+"Wir empfehlen es **dringendst**, so schnell wie möglich, auf [[Tails 1.6 zu "
+"aktualisieren|news/version_1.6]]"
#. type: Title =
#, no-wrap
msgid "Details\n"
-msgstr ""
+msgstr "Details\n"
#. type: Bullet: ' - '
msgid ""
@@ -53,28 +57,31 @@ msgid ""
"mfsa2015 105]], [[!mfsa2015 106]], [[!mfsa2015 110]], [[!mfsa2015 111]], [[!"
"mfsa2015 112]],"
msgstr ""
+"Tor Browser: [[!mfsa2015 96]], [[!mfsa2015 100]], [[!mfsa2015 101]], [[!"
+"mfsa2015 105]], [[!mfsa2015 106]], [[!mfsa2015 110]], [[!mfsa2015 111]], [[!"
+"mfsa2015 112]],"
#. type: Plain text
#, no-wrap
msgid " [[!mfsa2015 113]]\n"
-msgstr ""
+msgstr " [[!mfsa2015 113]]\n"
#. type: Bullet: ' - '
msgid "bind9: [[!debsa2015 3350]]"
-msgstr ""
+msgstr "bind9: [[!debsa2015 3350]]"
#. type: Bullet: ' - '
msgid "liblcms1: [[!cve CVE-2013-4276]]"
-msgstr ""
+msgstr "liblcms1: [[!cve CVE-2013-4276]]"
#. type: Bullet: ' - '
msgid "libldap-2.4-2: [[!debsa2015 3356]]"
-msgstr ""
+msgstr "libldap-2.4-2: [[!debsa2015 3356]]"
#. type: Bullet: ' - '
msgid "libslp1: [[!debsa2015 3353]]"
-msgstr ""
+msgstr "libslp1: [[!debsa2015 3353]]"
#. type: Bullet: ' - '
msgid "ssl-cert: [[!debbug 773815]]"
-msgstr ""
+msgstr "ssl-cert: [[!debbug 773815]]"
diff --git a/wiki/src/security/Numerous_security_holes_in_1.5.1.fr.po b/wiki/src/security/Numerous_security_holes_in_1.5.1.fr.po
index eb57493..4548e28 100644
--- a/wiki/src/security/Numerous_security_holes_in_1.5.1.fr.po
+++ b/wiki/src/security/Numerous_security_holes_in_1.5.1.fr.po
@@ -3,49 +3,53 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-09-22 20:40+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-12 21:00+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sun Sep 20 01:02:03 2015\"]]\n"
-msgstr ""
+msgstr "[[!meta date=\"Sun Sep 20 01:02:03 2015\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Numerous security holes in Tails 1.5.1\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"De nombreuses failles de sécurité dans Tails 1.5.1\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!tag security/fixed]]\n"
-msgstr ""
+msgstr "[[!tag security/fixed]]\n"
#. type: Plain text
msgid ""
"Several security holes that affect Tails 1.5.1 are now fixed in Tails 1.6."
msgstr ""
+"Plusieurs failles de sécurité affectant Tails 1.5.1 sont maintenant comblées "
+"dans Tails 1.6."
#. type: Plain text
msgid ""
"We **strongly** encourage you to [[upgrade to Tails 1.6|news/version_1.6]] "
"as soon as possible."
msgstr ""
+"Nous vous encourageons **vivement** à faire la [[mise à jour vers Tails 1.6|"
+"news/version_1.6]] dès que possible."
#. type: Title =
#, no-wrap
msgid "Details\n"
-msgstr ""
+msgstr "Détails\n"
#. type: Bullet: ' - '
msgid ""
@@ -53,28 +57,31 @@ msgid ""
"mfsa2015 105]], [[!mfsa2015 106]], [[!mfsa2015 110]], [[!mfsa2015 111]], [[!"
"mfsa2015 112]],"
msgstr ""
+"Tor Browser: [[!mfsa2015 96]], [[!mfsa2015 100]], [[!mfsa2015 101]], [[!"
+"mfsa2015 105]], [[!mfsa2015 106]], [[!mfsa2015 110]], [[!mfsa2015 111]], [[!"
+"mfsa2015 112]],"
#. type: Plain text
#, no-wrap
msgid " [[!mfsa2015 113]]\n"
-msgstr ""
+msgstr " [[!mfsa2015 113]]\n"
#. type: Bullet: ' - '
msgid "bind9: [[!debsa2015 3350]]"
-msgstr ""
+msgstr "bind9: [[!debsa2015 3350]]"
#. type: Bullet: ' - '
msgid "liblcms1: [[!cve CVE-2013-4276]]"
-msgstr ""
+msgstr "liblcms1: [[!cve CVE-2013-4276]]"
#. type: Bullet: ' - '
msgid "libldap-2.4-2: [[!debsa2015 3356]]"
-msgstr ""
+msgstr "libldap-2.4-2: [[!debsa2015 3356]]"
#. type: Bullet: ' - '
msgid "libslp1: [[!debsa2015 3353]]"
-msgstr ""
+msgstr "libslp1: [[!debsa2015 3353]]"
#. type: Bullet: ' - '
msgid "ssl-cert: [[!debbug 773815]]"
-msgstr ""
+msgstr "ssl-cert: [[!debbug 773815]]"
diff --git a/wiki/src/support/faq.fr.po b/wiki/src/support/faq.fr.po
index 1e8bb50..94939a0 100644
--- a/wiki/src/support/faq.fr.po
+++ b/wiki/src/support/faq.fr.po
@@ -7,10 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-09-23 10:54+0300\n"
-"PO-Revision-Date: 2015-09-14 20:56-0000\n"
+"PO-Revision-Date: 2015-10-10 10:45-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -1441,7 +1440,7 @@ msgstr ""
"slow>."
#. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
#| msgid ""
#| "We have relatively vague [[!tails_ticket 5991 desc=\"plans to improve\n"
#| "on this situation\"]].\n"
@@ -1449,7 +1448,7 @@ msgid ""
"We had relatively vague [[!tails_ticket 5991 desc=\"plans to improve\n"
"on this situation\"]].\n"
msgstr ""
-"Nous avons de vagues [[!tails_ticket 5991 desc=\"plans pour améliorer\n"
+"Nous avions de vagues [[!tails_ticket 5991 desc=\"plans pour améliorer\n"
"cette situation\"]].\n"
#. type: Plain text
diff --git a/wiki/src/support/known_issues.de.po b/wiki/src/support/known_issues.de.po
index 8eb4790..7bbc40c 100644
--- a/wiki/src/support/known_issues.de.po
+++ b/wiki/src/support/known_issues.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-23 23:19+0200\n"
+"POT-Creation-Date: 2015-10-21 12:28+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"
@@ -771,6 +771,7 @@ msgid ""
" - MacBook Pro Retina 11,1 (late 2013)\n"
" - MacBook Pro Retina 13-inch (early 2015)\n"
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+" - Hewlett-Packard HP ProBook 450 G0\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
" - Lenovo ThinkPad X220\n"
@@ -781,6 +782,7 @@ msgid ""
" - Samsung N150P\n"
" - Acer Aspire e1-572\n"
" - Dell Latitude E6230\n"
+" - Microsoft Surface Pro 3\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index 42fb867..4ef24e9 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-23 23:19+0200\n"
-"PO-Revision-Date: 2015-09-16 13:52-0000\n"
+"POT-Creation-Date: 2015-10-21 12:28+0300\n"
+"PO-Revision-Date: 2015-10-10 10:53-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -775,10 +775,10 @@ msgid ""
"that other operating system can see what has been displayed on the screen "
"within Tails."
msgstr ""
-"Tails n'efface pas encore la [[!wikipedia VRAM desc=\"mémoire vidéo\"]]. "
-"Quand quelqu'un utilise Tails, puis redémarre l'ordinateur avec un autre "
-"système d'exploitation, cet autre système d'exploitation peut voir ce qui a "
-"été affiché sur l'écran dans Tails."
+"Tails n'efface pas encore la [[!wikipedia_fr Mémoire_vidéo desc=\"mémoire "
+"vidéo\"]]. Quand quelqu'un utilise Tails, puis redémarre l'ordinateur avec "
+"un autre système d'exploitation, cet autre système d'exploitation peut voir "
+"ce qui a été affiché sur l'écran dans Tails."
#. type: Plain text
msgid ""
@@ -892,7 +892,29 @@ msgid "This issue has been reported on the following hardware:"
msgstr "Ce problème a été rapporté sur les ordinateurs suivants :"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - Apple when booting from a USB stick:\n"
+#| " - MacBook Air 5,1\n"
+#| " - MacBook Air 5,2 (using a device installed with Tails Installer)\n"
+#| " - MacBook Air 6,2\n"
+#| " - MacBook Pro 7,1 13-inch (mid 2010)\n"
+#| " - MacBook Pro 9,2 13-inch (mid 2012)\n"
+#| " - MacBook Pro 8,1 13-inch (late 2011)\n"
+#| " - MacBook Pro 10,2\n"
+#| " - MacBook Pro Retina 11,1 (late 2013)\n"
+#| " - MacBook Pro Retina 13-inch (early 2015)\n"
+#| " - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+#| " - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
+#| " USB stick\n"
+#| " - Lenovo ThinkPad X220\n"
+#| " - Toshiba Satellite C855D\n"
+#| " - Dell Inc. Studio 1458\n"
+#| " - Fujitsu Lifebook AH531/GFO, only on regular shutdown, emergency\n"
+#| " shutdown works\n"
+#| " - Samsung N150P\n"
+#| " - Acer Aspire e1-572\n"
+#| " - Dell Latitude E6230\n"
msgid ""
" - Apple when booting from a USB stick:\n"
" - MacBook Air 5,1\n"
@@ -905,6 +927,7 @@ msgid ""
" - MacBook Pro Retina 11,1 (late 2013)\n"
" - MacBook Pro Retina 13-inch (early 2015)\n"
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+" - Hewlett-Packard HP ProBook 450 G0\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
" - Lenovo ThinkPad X220\n"
@@ -915,6 +938,7 @@ msgid ""
" - Samsung N150P\n"
" - Acer Aspire e1-572\n"
" - Dell Latitude E6230\n"
+" - Microsoft Surface Pro 3\n"
msgstr ""
" - Apple en démarrant depuis une clé USB :\n"
" - MacBook Air 5,1\n"
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index f32f63a..84e9133 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -401,6 +401,7 @@ This issue has been reported on the following hardware:
- MacBook Pro Retina 11,1 (late 2013)
- MacBook Pro Retina 13-inch (early 2015)
- Hewlett-Packard HP Pavilion dv6 Notebook PC
+ - Hewlett-Packard HP ProBook 450 G0
- Lenovo ThinkPad X61, only on emergency shutdown when pulling out the
USB stick
- Lenovo ThinkPad X220
@@ -411,6 +412,7 @@ This issue has been reported on the following hardware:
- Samsung N150P
- Acer Aspire e1-572
- Dell Latitude E6230
+ - Microsoft Surface Pro 3
<a id="fingerprint"></a>
diff --git a/wiki/src/support/known_issues.pt.po b/wiki/src/support/known_issues.pt.po
index 51ca5cd..b0a4707 100644
--- a/wiki/src/support/known_issues.pt.po
+++ b/wiki/src/support/known_issues.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-23 23:19+0200\n"
+"POT-Creation-Date: 2015-10-21 12:28+0300\n"
"PO-Revision-Date: 2014-06-30 15:38-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -909,6 +909,7 @@ msgid ""
" - MacBook Pro Retina 11,1 (late 2013)\n"
" - MacBook Pro Retina 13-inch (early 2015)\n"
" - Hewlett-Packard HP Pavilion dv6 Notebook PC\n"
+" - Hewlett-Packard HP ProBook 450 G0\n"
" - Lenovo ThinkPad X61, only on emergency shutdown when pulling out the\n"
" USB stick\n"
" - Lenovo ThinkPad X220\n"
@@ -919,6 +920,7 @@ msgid ""
" - Samsung N150P\n"
" - Acer Aspire e1-572\n"
" - Dell Latitude E6230\n"
+" - Microsoft Surface Pro 3\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/support/learn.fr.po b/wiki/src/support/learn.fr.po
index 155e24c..f5146ac 100644
--- a/wiki/src/support/learn.fr.po
+++ b/wiki/src/support/learn.fr.po
@@ -3,45 +3,50 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-08-20 09:48+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-10 14:56+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Learn how to use Tails\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Apprendre à utiliser Tails\"]]\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"support/learn/intro.inline\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"support/learn/intro.inline\" raw=\"yes\"]]\n"
#. type: Title =
#, no-wrap
msgid "Training organizations\n"
-msgstr ""
+msgstr "Organisations proposant des formations\n"
#. type: Plain text
#, no-wrap
msgid ""
-"Here is a non-exhaustive list of organizations that provides Tails "
-"training.\n"
+"Here is a non-exhaustive list of organizations that provides Tails training.\n"
"We don't have any monetary or technical implications\n"
"in their Tails trainings, we just provide this list for the benefit of\n"
"users willing to learn how to us Tails. If you're an organization\n"
"providing Tails training, please write to <tails-press@boum.org> so we\n"
"can complete this list.\n"
msgstr ""
+"Voici une liste non exhaustive d'organisations qui dispensent des formations à Tails.\n"
+"Nous n'avons aucune implication technique ou monétaire\n"
+"avec ces formations, nous fournissons cette liste dans l'intérêt des\n"
+"utilisateurs voulant apprendre à utiliser Tails. Si vous dispensez des\n"
+"formations à propos de Tails, envoyez nous un mail à <tails-press@boum.org>\n"
+"afin que nous complétions la liste.\n"
#. type: Plain text
#, no-wrap
@@ -52,9 +57,15 @@ msgid ""
" are at-risk, or organizations that work with them.\n"
" - Email: <help@accessnow.org>\n"
" - [Contact page](https://www.accessnow.org/page/s/contact)\n"
-" - OpenPGP key fingerprint: 6CE6 221C 98EC F399 A04C 41B8 C46B ED33 32E8 "
-"A2BC\n"
+" - OpenPGP key fingerprint: 6CE6 221C 98EC F399 A04C 41B8 C46B ED33 32E8 A2BC\n"
msgstr ""
+"* [Access Now](https://www.accessnow.org)\n"
+" - Localisation : International\n"
+" - Fournit de l'aide et des formations aux communautés, groupes et individus\n"
+" à risque, ou aux organisations qui travaillent avec eux.\n"
+" - Email: <help@accessnow.org>\n"
+" - [Page de contact](https://www.accessnow.org/page/s/contact)\n"
+" - Empreinte de leur clé OpenPGP : 6CE6 221C 98EC F399 A04C 41B8 C46B ED33 32E8 A2BC\n"
#. type: Plain text
#, no-wrap
@@ -64,21 +75,28 @@ msgid ""
" - Provides digital security trainings (including Tails) for human\n"
" rights defenders.\n"
msgstr ""
+"* [Front Line Defenders](http://www.frontlinedefenders.org/)\n"
+" - Localisation : International\n"
+" - Founit des formations de sécurité numérique (dont Tails) pour\n"
+" les défenseurs des droits de l'homme.\n"
#. type: Plain text
#, no-wrap
msgid ""
-"* [Hermes Center for Transparency and Digital Human "
-"Rights](http://logioshermes.org/)\n"
+"* [Hermes Center for Transparency and Digital Human Rights](http://logioshermes.org/)\n"
" - Location: Italy (Florence, Milan, Rome)\n"
" - Email: <training@logioshermes.org>\n"
" - Referent: Marco Calamari\n"
msgstr ""
+"* [Hermes Center for Transparency and Digital Human Rights](http://logioshermes.org/)\n"
+" - Localisation : Italy (Florence, Milan, Rome)\n"
+" - Email: <training@logioshermes.org>\n"
+" - Référent: Marco Calamari\n"
#. type: Title =
#, no-wrap
msgid "Training material\n"
-msgstr ""
+msgstr "Support de formation\n"
#. type: Plain text
msgid ""
@@ -86,7 +104,10 @@ msgid ""
"that are available. You can also send us your slides and other teaching "
"material, so that others can benefit from them and improve them:"
msgstr ""
+"Si vous formez des utilisateurs à Tails, vous pourriez être intéressé par "
+"les diaporamas disponibles. Vous pouvez aussi nous envoyer vos supports de "
+"formations pour que d'autres puissent s'en servir et les améliorer :"
#. type: Bullet: '* '
msgid "[[Slides|contribute/how/promote/material/slides]]"
-msgstr ""
+msgstr "[[Slides|contribute/how/promote/material/slides]]"
diff --git a/wiki/src/support/learn/intro.inline.fr.po b/wiki/src/support/learn/intro.inline.fr.po
index 6c1dd75..63498c4 100644
--- a/wiki/src/support/learn/intro.inline.fr.po
+++ b/wiki/src/support/learn/intro.inline.fr.po
@@ -3,21 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-08-20 09:48+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-09 23:32+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
msgid ""
"The Tails project itself lacks time and skills to provide training on how to "
"use Tails but [[other organizations do so|learn]]."
msgstr ""
+"Le projet Tails manque de temps et de compétences pour former à "
+"l'utilisation de Tails mais [[d'autres organisations le font|learn]]."
diff --git a/wiki/src/support/talk/languages.inline.de.po b/wiki/src/support/talk/languages.inline.de.po
index 9e24b6b..09d0bdc 100644
--- a/wiki/src/support/talk/languages.inline.de.po
+++ b/wiki/src/support/talk/languages.inline.de.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2015-08-12 19:32+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"
-"Language: \n"
+"PO-Revision-Date: 2015-10-03 09:27+0100\n"
+"Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: Tails translators <tails@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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "<p>We answer requests in:</p>\n"
-msgstr ""
+msgstr "<p>Wir beantworten Anfragen in:</p>\n"
#. type: Plain text
#, no-wrap
@@ -31,6 +31,12 @@ msgid ""
" <li>Italian</li>\n"
"</ul>\n"
msgstr ""
+"<ul>\n"
+" <li>Englisch</li>\n"
+" <li>Französisch</li>\n"
+" <li>Spanisch</li>\n"
+" <li>Italienisch</li>\n"
+"</ul>\n"
#. type: Plain text
#, no-wrap
@@ -38,3 +44,5 @@ msgid ""
"<p>Requests not in English might take longer to answer.\n"
"Imperfect English is welcome :)</p>\n"
msgstr ""
+"<p>Bei Anfragen, die nicht auf Englisch sind, könnte das Antworten länger dauern.\n"
+"Fehlerhaftes Englisch ist willkommen :)</p>\n"
diff --git a/wiki/src/support/talk/languages.inline.fr.po b/wiki/src/support/talk/languages.inline.fr.po
index 9e24b6b..dbde25f 100644
--- a/wiki/src/support/talk/languages.inline.fr.po
+++ b/wiki/src/support/talk/languages.inline.fr.po
@@ -3,23 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: 2015-08-12 19:32+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2015-10-09 23:31+0100\n"
+"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: LANGUAGE <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.6.10\n"
#. type: Plain text
#, no-wrap
msgid "<p>We answer requests in:</p>\n"
-msgstr ""
+msgstr "<p>Nous répondons aux questions en :</p>\n"
#. type: Plain text
#, no-wrap
@@ -31,6 +31,12 @@ msgid ""
" <li>Italian</li>\n"
"</ul>\n"
msgstr ""
+"<ul>\n"
+" <li>Anglais</li>\n"
+" <li>Français</li>\n"
+" <li>Espagnol</li>\n"
+" <li>Italien</li>\n"
+"</ul>\n"
#. type: Plain text
#, no-wrap
@@ -38,3 +44,5 @@ msgid ""
"<p>Requests not in English might take longer to answer.\n"
"Imperfect English is welcome :)</p>\n"
msgstr ""
+"<p>Les réponses aux requêtes non formulées en anglais peuvent être plus longues à arriver.\n"
+"Un anglais imparfait est le bienvenu :)</p>\n"