summaryrefslogtreecommitdiffstats
path: root/wiki/src
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-10-21 10:17:30 +0000
committersajolida <sajolida@pimienta.org>2015-10-21 10:17:30 +0000
commit212d6a83148c082acfc518943ed33c44ac5d18ec (patch)
treedfbe0cbad0212bf72c58d89941906dfff9b99528 /wiki/src
parent8a5d4cef0fea6a23f6ccc93dcac0b9c804fe067a (diff)
parent68904c7bce2b89f9d3e87f9e04be16b46b2ef4ac (diff)
Merge remote-tracking branch 'origin/master' into devel
Diffstat (limited to 'wiki/src')
-rw-r--r--wiki/src/blueprint/HTTP_mirror_pool.mdwn18
-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.mdwn21
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/jenkins.mdwn271
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/resources.mdwn140
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn58
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn4
-rw-r--r--wiki/src/blueprint/report_2015_08.mdwn36
-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.mdwn41
-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/release_process.mdwn20
-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/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.fr.po10
-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/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/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.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.fr.po37
-rw-r--r--wiki/src/support/faq.fr.po7
-rw-r--r--wiki/src/support/known_issues.de.po3
-rw-r--r--wiki/src/support/known_issues.fr.po37
-rw-r--r--wiki/src/support/known_issues.mdwn1
-rw-r--r--wiki/src/support/known_issues.pt.po3
-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.fr.po20
69 files changed, 2093 insertions, 937 deletions
diff --git a/wiki/src/blueprint/HTTP_mirror_pool.mdwn b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
index 36d2516..6a5fafd 100644
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
@@ -1,14 +1,5 @@
**Ticket**: [[!tails_ticket 7161]]
-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
-mirrors, if we choose to.
-
-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=3]]
# The plan
@@ -42,6 +33,15 @@ We decided to implement a two-way strategy for this feature:
# 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
+mirrors, if we choose to.
+
+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.
+
## Using DNS
Using DNS seems to be an easy way to do some round robin in low level. It
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 b694e6a..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).
- * For red test suite run: keep the screen and video captures, the
+ * 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 1d0eb88..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,23 @@ 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.
@@ -296,19 +163,19 @@ 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).
-As a first baby step, 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.
-
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.
@@ -323,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/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/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 121ad06..7302c27 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -16,6 +16,4 @@ Availability and plans for the next weeks
Discussions
===========
- - [[!tails_ticket 10257 desc="Discuss & adopt a strategy to merge commits from Weblate"]]
- - [[!tails_ticket 10179 desc="Document mentors for new contributors"]]
- - [[!tails_ticket 10024 desc="Document issues behind having Tails derivatives"]]
+ - [[!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 111e870..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
===========
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 3c0e71e..4d6c12d 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,21 +1,34 @@
[[!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
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/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 824abca..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
@@ -838,13 +845,6 @@ Testing
report their results in due time, and that they make it clear when
they're leaving for good.
-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.
-
Go wild!
========
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/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.fr.po b/wiki/src/doc/anonymous_internet/electrum.fr.po
index f5605a9..65953ab 100644
--- a/wiki/src/doc/anonymous_internet/electrum.fr.po
+++ b/wiki/src/doc/anonymous_internet/electrum.fr.po
@@ -7,10 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2015-10-04 16:24+0300\n"
-"PO-Revision-Date: 2015-04-21 23:23-0000\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,7 +98,6 @@ msgstr ""
"</span>.\n"
#. type: Plain text
-#, fuzzy
#| msgid ""
#| "To learn how to use *Electrum*, read the [documentation on the *Electrum* "
#| "wiki](http://electrum.orain.org/)."
@@ -108,7 +106,7 @@ msgid ""
"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/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/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/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.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.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..9564790 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 11:57+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"
@@ -781,6 +781,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..1a30f3b 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 11:57+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"
@@ -915,6 +937,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..a88b863 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -411,6 +411,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..63a3b6f 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 11:57+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"
@@ -919,6 +919,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.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"