summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-13 08:31:10 +0000
committerintrigeri <intrigeri@boum.org>2015-07-13 08:31:10 +0000
commit9549f82935f4806c0a689774c6637e883f89a2dc (patch)
tree96f4fdfc96a5cb45d2b4d36d18dd3da9fd134514
parent0e1b6ae8423634d84e04d2be901bc5d1d79f8b34 (diff)
parentcacd5a4c737829fa2a3793bc305deab5ab82943a (diff)
Merge branch 'devel' into bugfix/9558-deny-tmp-to-tor-browser
-rw-r--r--features/step_definitions/common_steps.rb12
-rw-r--r--features/step_definitions/pidgin.rb8
-rw-r--r--features/step_definitions/torified_gnupg.rb30
-rw-r--r--features/step_definitions/torified_misc.rb26
-rw-r--r--wiki/src/about.fr.po10
-rw-r--r--wiki/src/blueprint/UEFI/32-bit.mdwn3
-rw-r--r--wiki/src/blueprint/automated_builds_and_tests/automated_tests_specs.mdwn102
-rw-r--r--wiki/src/blueprint/bootstrapping/extension.mdwn4
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn5
-rw-r--r--wiki/src/blueprint/report_2015_06.mdwn75
-rw-r--r--wiki/src/blueprint/report_2015_07.mdwn4
-rw-r--r--wiki/src/blueprint/report_2015_08.mdwn4
-rw-r--r--wiki/src/blueprint/report_2015_09.mdwn4
-rw-r--r--wiki/src/contribute/calendar.mdwn8
-rw-r--r--wiki/src/contribute/git.mdwn2
-rw-r--r--wiki/src/contribute/meetings/201507.mdwn74
-rw-r--r--wiki/src/contribute/release_process.mdwn14
-rw-r--r--wiki/src/contribute/working_together/roles/sysadmins.mdwn10
-rw-r--r--wiki/src/doc/about/features.fr.po3
-rw-r--r--wiki/src/doc/about/warning.fr.po3
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po9
-rw-r--r--wiki/src/doc/anonymous_internet.index.fr.po8
-rw-r--r--wiki/src/doc/anonymous_internet/claws_mail.fr.po3
-rw-r--r--wiki/src/doc/anonymous_internet/electrum.fr.po9
-rw-r--r--wiki/src/doc/anonymous_internet/i2p.fr.po10
-rw-r--r--wiki/src/doc/anonymous_internet/vidalia.fr.po14
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy/keyringer.fr.po8
-rw-r--r--wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po8
-rw-r--r--wiki/src/doc/first_steps.index.de.po15
-rw-r--r--wiki/src/doc/first_steps.index.fr.po47
-rw-r--r--wiki/src/doc/first_steps.index.mdwn13
-rw-r--r--wiki/src/doc/first_steps.index.pt.po15
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po7
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po16
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn2
-rw-r--r--wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po16
-rw-r--r--wiki/src/doc/first_steps/installation.fr.po3
-rw-r--r--wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po20
-rw-r--r--wiki/src/doc/first_steps/persistence/use.fr.po8
-rw-r--r--wiki/src/doc/first_steps/reset/linux.de.po4
-rw-r--r--wiki/src/doc/first_steps/reset/mac.de.po102
-rw-r--r--wiki/src/doc/first_steps/reset/mac.fr.po102
-rw-r--r--wiki/src/doc/first_steps/reset/mac.mdwn37
-rw-r--r--wiki/src/doc/first_steps/reset/mac.pt.po102
-rw-r--r--wiki/src/doc/first_steps/reset/windows.de.po8
-rw-r--r--wiki/src/doc/first_steps/startup_options.de.po3
-rw-r--r--wiki/src/doc/first_steps/startup_options.fr.po10
-rw-r--r--wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po6
-rw-r--r--wiki/src/doc/first_steps/upgrade.fr.po35
-rw-r--r--wiki/src/doc/first_steps/upgrade.release_notes.de.po11
-rw-r--r--wiki/src/doc/introduction.de.po4
-rw-r--r--wiki/src/doc/sensitive_documents/graphics.fr.po3
-rw-r--r--wiki/src/doc/sensitive_documents/metadata.fr.po3
-rw-r--r--wiki/src/doc/sensitive_documents/office_suite.fr.po3
-rw-r--r--wiki/src/doc/sensitive_documents/sound_and_video.fr.po3
-rw-r--r--wiki/src/download.html1
-rw-r--r--wiki/src/inc/stable_i386_iso_size.html2
-rw-r--r--wiki/src/local.css13
-rw-r--r--wiki/src/news.de.po44
-rw-r--r--wiki/src/news.fr.po43
-rw-r--r--wiki/src/news.mdwn2
-rw-r--r--wiki/src/news.pt.po46
-rw-r--r--wiki/src/press.de.po8
-rw-r--r--wiki/src/press.fr.po8
-rw-r--r--wiki/src/press.mdwn3
-rw-r--r--wiki/src/press.pt.po8
-rw-r--r--wiki/src/press/media_appearances_2015.de.po9
-rw-r--r--wiki/src/press/media_appearances_2015.fr.po9
-rw-r--r--wiki/src/press/media_appearances_2015.mdwn3
-rw-r--r--wiki/src/press/media_appearances_2015.pt.po9
-rw-r--r--wiki/src/security.de.po40
-rw-r--r--wiki/src/security.fr.po31
-rw-r--r--wiki/src/support/faq.de.po23
-rw-r--r--wiki/src/support/faq.fr.po25
-rw-r--r--wiki/src/support/faq.mdwn12
-rw-r--r--wiki/src/support/faq.pt.po25
80 files changed, 957 insertions, 489 deletions
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index ecaf49a..08f66e2 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -1060,7 +1060,11 @@ When /^I open a page on the LAN web server in the (.*)$/ do |browser|
step "I open the address \"#{@web_server_url}\" in the #{browser}"
end
-Then /^I force Tor to use a new circuit( in Vidalia)?$/ do |with_vidalia|
+def force_new_tor_circuit(with_vidalia=nil)
+ assert(!@new_circuit_tries.nil? && @new_circuit_tries >= 0,
+ '@new_circuit_tries was not initialized before it was used')
+ @new_circuit_tries += 1
+ STDERR.puts "Forcing new Tor circuit... (attempt ##{@new_circuit_tries})" if $config["DEBUG"]
if with_vidalia
assert_equal('gnome', @theme, "Vidalia is not available in the #{@theme} theme.")
begin
@@ -1091,3 +1095,9 @@ Then /^I force Tor to use a new circuit( in Vidalia)?$/ do |with_vidalia|
@vm.execute_successfully('. /usr/local/lib/tails-shell-library/tor.sh; tor_control_send "signal NEWNYM"')
end
end
+
+Then /^I force Tor to use a new circuit( in Vidalia)?$/ do |with_vidalia|
+ next if @skip_steps_while_restoring_background
+ @new_circuit_tries = 1 if @new_circuit_tries.nil?
+ force_new_tor_circuit(with_vidalia)
+end
diff --git a/features/step_definitions/pidgin.rb b/features/step_definitions/pidgin.rb
index 7407d8c..cbfbea1 100644
--- a/features/step_definitions/pidgin.rb
+++ b/features/step_definitions/pidgin.rb
@@ -296,8 +296,8 @@ end
Then /^Pidgin successfully connects to the "([^"]+)" account$/ do |account|
next if @skip_steps_while_restoring_background
expected_channel_entry = chan_image(account, default_chan(account), 'roster')
- tries = 0
- until tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
+ @new_circuit_tries = 0
+ until @new_circuit_tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
# Sometimes the OFTC welcome notice window pops up over the buddy list one...
begin
@vm.focus_window('Buddy List')
@@ -313,9 +313,7 @@ Then /^Pidgin successfully connects to the "([^"]+)" account$/ do |account|
@screen.wait(expected_channel_entry, 60)
break
rescue FindFailed
- tries += 1
- STDERR.puts "Forcing new Tor circuit... (attempt ##{tries})" if $config["DEBUG"]
- step "I force Tor to use a new circuit"
+ force_new_tor_circuit
@screen.wait_and_click('PidginReconnect.png', 20)
end
end
diff --git a/features/step_definitions/torified_gnupg.rb b/features/step_definitions/torified_gnupg.rb
index fe27ebd..51eb4da 100644
--- a/features/step_definitions/torified_gnupg.rb
+++ b/features/step_definitions/torified_gnupg.rb
@@ -50,20 +50,18 @@ When /^I fetch the "([^"]+)" OpenPGP key using the GnuPG CLI( without any signat
else
importopts = ''
end
- tries = 0
- until tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
+ @new_circuit_tries = 0
+ until @new_circuit_tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
begin
@gnupg_recv_key_res = @vm.execute_successfully(
"gpg --batch #{importopts} --recv-key '#{keyid}'",
LIVE_USER)
break
rescue ExecutionFailedInVM
- tries += 1
- STDERR.puts "Forcing new Tor circuit... (attempt ##{tries})" if $config["DEBUG"]
- step 'I force Tor to use a new circuit'
+ force_new_tor_circuit
end
end
- assert(tries <= $config["MAX_NEW_TOR_CIRCUIT_RETRIES"], "Fetching keys with the GnuPG CLI did not succeed after retrying #{tries} times")
+ assert(@new_circuit_tries < $config["MAX_NEW_TOR_CIRCUIT_RETRIES"], "Fetching keys with the GnuPG CLI did not succeed after retrying #{@new_circuit_tries} times")
end
When /^the GnuPG fetch is successful$/ do
@@ -112,8 +110,8 @@ end
Then /^I synchronize keys in Seahorse$/ do
next if @skip_steps_while_restoring_background
- tries = 0
- until tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
+ @new_circuit_tries = 0
+ until @new_circuit_tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
begin
step 'process "seahorse" is running'
@screen.wait_and_click("SeahorseWindow.png", 10)
@@ -124,7 +122,7 @@ Then /^I synchronize keys in Seahorse$/ do
seahorse_wait_helper('SeahorseWindow.png', 5*60)
break
rescue OpenPGPKeyserverCommunicationError
- tries += 1
+ force_new_tor_circuit
@screen.wait_and_click('GnomeCloseButton.png', 20)
if @screen.exists('SeahorseSynchronizing.png')
# Seahorse is likely to segfault if we end up here.
@@ -132,11 +130,9 @@ Then /^I synchronize keys in Seahorse$/ do
@screen.type(Sikuli::Key.ESC)
end
seahorse_wait_helper('SeahorseWindow.png')
- STDERR.puts "Forcing new Tor circuit... (attempt ##{tries})" if $config["DEBUG"]
- step 'I force Tor to use a new circuit'
end
end
- assert(tries <= $config["MAX_NEW_TOR_CIRCUIT_RETRIES"], "Syncing keys in Seahorse did not succeed after retrying #{tries} times")
+ assert(@new_circuit_tries < $config["MAX_NEW_TOR_CIRCUIT_RETRIES"], "Syncing keys in Seahorse did not succeed after retrying #{@new_circuit_tries} times")
end
When /^I fetch the "([^"]+)" OpenPGP key using Seahorse( via the Tails OpenPGP Applet)?$/ do |keyid, withgpgapplet|
@@ -147,8 +143,8 @@ When /^I fetch the "([^"]+)" OpenPGP key using Seahorse( via the Tails OpenPGP A
step "I start Seahorse"
end
step "Seahorse has opened"
- tries = 0
- until tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
+ @new_circuit_tries = 0
+ until @new_circuit_tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
begin
@screen.wait_and_click("SeahorseWindow.png", 10)
seahorse_menu_click_helper('SeahorseRemoteMenu.png', 'SeahorseRemoteMenuFind.png', 'seahorse')
@@ -169,15 +165,13 @@ When /^I fetch the "([^"]+)" OpenPGP key using Seahorse( via the Tails OpenPGP A
@screen.click("SeahorseImport.png")
break
rescue OpenPGPKeyserverCommunicationError
- tries += 1
+ force_new_tor_circuit
@screen.wait_and_click('GnomeCloseButton.png', 20)
@screen.type(Sikuli::Key.ESC)
@screen.type("w", Sikuli::KeyModifier.CTRL)
- STDERR.puts "Forcing new Tor circuit... (attempt ##{tries})" if $config["DEBUG"]
- step 'I force Tor to use a new circuit'
end
end
- assert(tries <= $config["MAX_NEW_TOR_CIRCUIT_RETRIES"], "Fetching keys in Seahorse did not succeed after retrying #{tries} times")
+ assert(@new_circuit_tries < $config["MAX_NEW_TOR_CIRCUIT_RETRIES"], "Fetching keys in Seahorse did not succeed after retrying #{@new_circuit_tries} times")
end
Then /^Seahorse is configured to use the correct keyserver$/ do
diff --git a/features/step_definitions/torified_misc.rb b/features/step_definitions/torified_misc.rb
index 610234f..bd4cd0b 100644
--- a/features/step_definitions/torified_misc.rb
+++ b/features/step_definitions/torified_misc.rb
@@ -1,8 +1,28 @@
+class WhoisLookupFailure < StandardError
+end
+
When /^I query the whois directory service for "([^"]+)"$/ do |domain|
next if @skip_steps_while_restoring_background
- @vm_execute_res = @vm.execute(
- "whois '#{domain}'",
- LIVE_USER)
+ @new_circuit_tries = 0
+ until @new_circuit_tries == $config["MAX_NEW_TOR_CIRCUIT_RETRIES"] do
+ begin
+ @vm_execute_res = @vm.execute("whois '#{domain}'", LIVE_USER)
+ if !@vm_execute_res.success? || @vm_execute_res.stdout['LIMIT EXCEEDED']
+ raise WhoisLookupFailure
+ end
+ break
+ rescue WhoisLookupFailure
+ if @vm_execute_res.stderr['Timeout'] || \
+ @vm_execute_res.stderr['Unable to resolve'] || \
+ @vm_execute_res.stdout['LIMIT EXCEEDED']
+ force_new_tor_circuit
+ end
+ end
+ end
+ assert(@new_circuit_tries < $config["MAX_NEW_TOR_CIRCUIT_RETRIES"],
+ "Looking up whois info for #{domain} did not succeed after retrying #{@new_circuit_tries} times.\n" +
+ "The output of the last command contains:\n" +
+ "#{@vm_execute_res.stdout}\n" + "#{@vm_execute_res.stderr}")
end
When /^I wget "([^"]+)" to stdout(?:| with the '([^']+)' options)$/ do |url, options|
diff --git a/wiki/src/about.fr.po b/wiki/src/about.fr.po
index c278671..f0f35f8 100644
--- a/wiki/src/about.fr.po
+++ b/wiki/src/about.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
-"POT-Creation-Date: 2015-03-13 16:25+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2013-10-13 17:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -77,7 +77,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "[[!toc levels=1]]\n"
msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n"
@@ -88,7 +87,6 @@ msgstr "<a id=\"tor\"></a>\n"
#. type: Title =
#, no-wrap
-#| msgid "Online anonymity and censorship circumvention with Tor\n"
msgid "Online anonymity and censorship circumvention\n"
msgstr "Anonymat en ligne et contournement de la censure\n"
@@ -233,18 +231,12 @@ msgstr ""
"net), qui est un réseau d'anonymisation différent de Tor."
#. type: Plain text
-#| msgid ""
-#| "[[Read more about those tools in the documentation.|doc/"
-#| "encryption_and_privacy]]"
msgid ""
"[[Learn how to use I2P in Tails in the documentation.|doc/anonymous_internet/"
"i2p]]"
msgstr "[[En savoir plus sur I2P dans Tails.|doc/anonymous_internet/i2p]]"
#. type: Plain text
-#| msgid ""
-#| "To learn more about how the usage of Tor is enforced, see our [[design "
-#| "document|contribute/design/Tor_enforcement]]."
msgid ""
"To know how I2P is implemented in Tails, see our [[design document|"
"contribute/design/I2P]]."
diff --git a/wiki/src/blueprint/UEFI/32-bit.mdwn b/wiki/src/blueprint/UEFI/32-bit.mdwn
index bd9a0d1..912613c 100644
--- a/wiki/src/blueprint/UEFI/32-bit.mdwn
+++ b/wiki/src/blueprint/UEFI/32-bit.mdwn
@@ -61,7 +61,8 @@ Then, add `nomodeset` if needed, and Tails boots.
Note that:
* Support for `{vesa,}menu.c32` was added in GRUB upstream, but didn't
- make it into Debian yet as of 2.02~beta2-22. intrigeri has a
+ make it into Debian yet as of 2.02~beta2-22.
+ so `feature/8471-32-bit-UEFI` installs a
2.02~beta2-22tails1~bpo70+1 package with that new code in it,
and indeed it successfully loads our syslinux configuration.
* We'll need to load the `cpuid` module to make our `ifcpu64`
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 fbe5714..8997f81 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
@@ -6,7 +6,7 @@ This blueprint helps to keep track of the discussions and decisions
about the specification of automated tests ran in Tails' Jenkins on
the [[automatically build ISOs|autobuild_specs]] ([[!tails_ticket 5288]]).
-[[!toc levels=2]]
+[[!toc levels=3]]
# Facts
@@ -55,25 +55,19 @@ We __need to lessen the number of tests per day__. Probably even in
the second iteration, with the expected growth of the number of
automated builds.
-Some ideas that could help:
+### Current proposal
-We can maybe split the design between the type of branches being built
-and tested:
-
-* for base branches, we could envisage to run the full test suite on
- every automatically built ISO (every git push and daily builds) if
- we think that is relevant;
-* for feature branches, we could run the full test suite only on the
- daily builds, and either only the automated tests related to the
- branch on every git push, and/or a subset of the whole test suite.
-
-We can also consider testing only the feature branches that are marked
-as *Ready for QA* as a beginning, even if that doesn't cover Scenario 2
-(developers).
-
-We can also maybe find more ways to split the automated test suite in
-faster subsets of features depending on the context, define priorities
-for built ISO and/or tests.
+ For branch stable:
+ Must test ISOs built daily and on every Git push;
+ so that we're always ready to put out an emergency release;
+ For the next scheduled release branch (either stable, testing, or devel):
+ Must test ISOs built daily and on every Git push;
+ so that we always know the state of the next release;
+ For other branches:
+ For branches with a `Ready for QA` ticket:
+ Must test ISO built daily and on every Git push;
+ Must test ISOs built on every Git push,
+ with some rate-limiting if necessary;
<a id="how-to-run-the-tests"></a>
@@ -81,30 +75,25 @@ for built ISO and/or tests.
This section heavily depends on the discussion about the previous one.
-The automated test suite MUST have access to the artifacts of a given
-automated build corresponding to a given commit, as well as to the
-ISOs of the previous Tails releases.
+To test a specific ISO, the automated test suite MUST have access to:
+
+ * the corresponding build artifacts;
+ * the commit ID of that build;
+ * if applicable, the commit at which the base branch was at, when it
+ was merged into the branch being built;
+ * the ISO of the previous Tails release.
-The automated test suite MUST be run in a clean environment.
+The automated test suite MUST be run in a clean environment, using a
+fresh _--tmpdir_ for each run.
The automated test suite MUST be run on a freshly built ISO,
corresponding to the commit it tests.
-The automated test suite MUST be able to run features in parallel
-for a single automated build ISO. This way, if more than one isotester
-are idle, it can use several of them to test an ISO faster.
-
-The automated suite SHOULD be able when there are more than one ISO
-queued for testing to fairly distribute the parallelizing of their
-features.
-
-The automated test suite MUST not allocate all the isotesters for one
-ISO when others are waiting to be tested.
-
-The automated test suite MUST be able to accept a treshold of failures
-for some features before sending notifications. This can help if a
-scenario fails because of a network congestion, but other use cases
-will probably raise.
+When [[!tails_ticket 9515]] and friends will be resolved and a first
+deployment of the automated test suite will clarify its need, we'll see
+if it should be able to accept a treshold of failures for some features
+before sending notifications. This could help if a scenario fails
+e.g. because of a network congestion.
## Notifications
@@ -169,11 +158,34 @@ builds specification.
# Future ideas
-This list other scenarios that we have also envisaged for the second
-iteration of the automated builds deployment, as they are really
-tightened.
+## Cutting the number of run per day
+
+For feature branches, we could run the full test suite only on the
+daily builds, and either only the automated tests related to the
+branch on every git push, and/or a subset of the whole test suite.
+
+We can also maybe find more ways to split the automated test suite in
+faster subsets of features depending on the context, define priorities
+for built ISO and/or tests.
+
+The automated test suite could be able to run features in parallel
+for a single automated build ISO. This way, if more than one isotester
+are idle, it can use several of them to test an ISO faster.
+
+The automated suite then should be able when there are more than one ISO
+queued for testing to fairly distribute the parallelizing of their
+features.
+
+The automated test suite also should not allocate all the isotesters for
+one ISO when others are waiting to be tested.
+
+## Scenarios
+
+Folowing is a list of other scenarios that we have also envisaged for
+the second iteration of the automated builds deployment, as they are
+really tightened.
-## Scenario 10
+### Scenario 10
As a Tails developer working on branch B
When I upload a package to APT suite B
@@ -183,7 +195,7 @@ tightened.
(acceptable workaround: being able to manually trigger a test suite.)
-## Scenario 11
+### Scenario 11
As the current RM
When I push new tag T on branch B
@@ -193,14 +205,14 @@ tightened.
on the ISO build from the checkout of tag T
-## Scenario 12
+### Scenario 12
As a Tails developer
When the test suite is ran on the ISO build from my last commit
I want to watch TV and see the test video in HTML5 from the Tor Browser
-## Scenario 14
+### Scenario 14
As a Tails developer
When I push a new commit or a new Debian package to a base branch
diff --git a/wiki/src/blueprint/bootstrapping/extension.mdwn b/wiki/src/blueprint/bootstrapping/extension.mdwn
index 3b26be2..c254e35 100644
--- a/wiki/src/blueprint/bootstrapping/extension.mdwn
+++ b/wiki/src/blueprint/bootstrapping/extension.mdwn
@@ -44,8 +44,8 @@ Goals
for years.
- Simplify the installation process by automating *some* verification
of the ISO image inside the browser as part of the download process.
- - In case of a bad ISO image, help the user diagnose whether the
- download has been interrupted or the ISO has been corrupted.
+ - Ensure that ISO images are downloaded entirely before trying to
+ verify them.
- In case of an interrupted download, help the user resume it. This
requires us to have our mirrors stop sending HTTP ETag headers. See
[[!tails_ticket 9022]].
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index daeff4d..469e64e 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -16,8 +16,3 @@ Availability and plans for the next weeks
Discussions
===========
-* [[!tails_ticket 9530 desc="Consider using
- hkp://ha.pool.sks-keyservers.net in non-hkps-enabled software"]]
-* [[!tails_ticket 9529 desc="Ping PayPal donors regularly?"]]
-* [[!tails_ticket 8864 desc="Consider flagging first boot after installing"]]
-* [[!tails_ticket 7151 desc="Accept donations via micropayment systems"]]
diff --git a/wiki/src/blueprint/report_2015_06.mdwn b/wiki/src/blueprint/report_2015_06.mdwn
index fc1fb26..800c976 100644
--- a/wiki/src/blueprint/report_2015_06.mdwn
+++ b/wiki/src/blueprint/report_2015_06.mdwn
@@ -1,70 +1,101 @@
[[!meta title="Tails report for June, 2015"]]
-[[Tails 1.4.1|https://tails.boum.org/contribute/calendar]] has been postponed (because Firefox changed their schedule) and will be released sometime in the beginning of July. So once again, this report will give non-code news :)
+Tails 1.4.1 has been postponed (because Mozilla changed their release schedule) and was released in the beginning of July. So once again, this report will give non-code news :)
[[!toc]]
-Documentation and Website
+Releases
+========
+
+* The next release (1.5) is [[planned for August 11|contribute/calendar/]].
+
+* We decided on a new [[version number scheme|contribute/release_schedule#versioning]].
+
+Code
+====
+
+FIXME
+
+Documentation and website
=========================
-* We added a warning in the [[OpenPGP app documentation|https://tails.boum.org/doc/encryption_and_privacy/gpgapplet]] about non-ASCII characters being badly supported.
+* A small note about non-free firmware was added to our [[licence page|doc/about/license]].
+
+* Our [[documentation for reviewers|contribute/merge_policy/review]] now explains how to do a good and nice review.
-* A small note about non-free firmware was added to our [[licence page|https://tails.boum.org/doc/about/license]].
+* We warn that *Tails OpenPGP Applet* can lead to
+ [[encoding problems for emails|doc/encryption_and_privacy/gpgapplet/public-key_cryptography#encoding]].
-User Experience
+User experience
===============
-* People are working on the [[Greeter mockups|https://mailman.boum.org/pipermail/tails-ux/2015-June/000437.html]].
+- On the [[Installation Assistant|blueprint/bootstrapping/assistant]]:
+ - We wrote a full synopsis of the [[installation process for
+ Windows|blueprint/bootstrapping/assistant/windows]], submitted it for
+ review, and started testing it ([[!tails_ticket 9202 desc="#9202"]]).
+ - We started writing an ikiwiki and Bootstrap prototype of the Installation
+ Assistant in [[!tails_gitweb_branch web/assistant]].
-FIXME more ?
+* People are working on the [Greeter mockups](https://mailman.boum.org/pipermail/tails-ux/2015-June/000437.html).
Infrastructure
==============
* Our test suite covers 185 scenarios, 3 more that in May. We removed outdated scenario again, so there are more than 3 new tests :)
-* We decided to archive publicly the tails-support mailing list, since external websites were archiving it anyway.
+* We decided to publicly archive the tails-support mailing list, since external websites were archiving it anyway.
* FIXME more?
Funding
=======
-* If you want to help us develop and maintain Tails, please [[donate|https://tails.boum.org/contribute/how/donate]] :)
+* If you want to help us develop and maintain Tails, please [[donate|contribute/how/donate]] :)
+
+* We sent our final report for the Access Innovation Prize received in
+ March 2014.
+
+* We submitted our second quarterly report to the
+ [Digital Defenders Partnership](https://digitaldefenders.org/).
Outreach
========
-* [[A workshop about Tails|http://www.lacantine-brest.net/event/atelier-datalove-tails-x-tor/]] happened in Brest, France, June 18th.
+* [A workshop about Tails](http://www.lacantine-brest.net/event/atelier-datalove-tails-x-tor/) happened in Brest, France, June 18th.
-* Tchou and Fiodor Tonti gave [[a talk about Tails and UX|https://www.passageenseine.org/fr/programme/2015/jeudi-18-juin/grande-salle/atelier-design-tails]] in Pas Sage en Seine 2015 at NUMA in Paris, France on June 18th. [[The video is online|https://www.passageenseine.org/fr/archives-et-videos/]] and good feedback already arrived :)
+* Tchou and Fiodor Tonti gave [a talk about Tails and UX](https://www.passageenseine.org/fr/programme/2015/jeudi-18-juin/grande-salle/atelier-design-tails) in Pas Sage en Seine 2015 at NUMA in Paris, France on June 18th. [The video is online](https://www.passageenseine.org/fr/archives-et-videos/) and good feedback already arrived :)
-* [[A workshop about Tor and Tails|https://jardin-entropique.eu.org/ateliers]] happened in Rennes, France, during the Jardin entropique event, June 28th.
+* [A workshop about Tor and Tails](https://jardin-entropique.eu.org/ateliers) happened in Rennes, France, during the Jardin entropique event, June 28th.
Upcoming events
---------------
-* A talk about Tails will take place during [[DebConf15|http://debconf15.debconf.org/]] in Heidelberg, Germany, in August.
+* A talk about Tails will take place during [DebConf15](http://debconf15.debconf.org/) in Heidelberg, Germany, in August.
* Please let us know if you organize an event about Tails, we'll be glad to announce it :)
On-going discussions
====================
-* [[We discussed our release versioning|https://mailman.boum.org/pipermail/tails-dev/2015-June/009132.html]] and found a new way to do it: always increment the first number with major Debian version, or whenever it makes sense for Tails only (user-visible changes); second number: even for bugfix releases, odd for major ones; add an extra 3rd number for emergency releases.
+* [We discussed our release versioning](https://mailman.boum.org/pipermail/tails-dev/2015-June/009132.html) and found a new way to do it: always increment the first number with major Debian version, or whenever it makes sense for Tails only (user-visible changes); second number: even for bugfix releases, odd for major ones; add an extra 3rd number for emergency releases.
-* intrigeri started a discussion about [[tightening a bit the Evince and Totem AppArmor policy|https://mailman.boum.org/pipermail/tails-dev/2015-June/009007.html]].
+* intrigeri started a discussion about [tightening a bit the Evince and Totem AppArmor policy](https://mailman.boum.org/pipermail/tails-dev/2015-June/009007.html).
-* genghiskant proposed [[making a fork of Tails without non-free firmware|https://mailman.boum.org/pipermail/tails-dev/2015-June/009023.html]].
+* genghiskant proposed [making a fork of Tails without non-free firmware](https://mailman.boum.org/pipermail/tails-dev/2015-June/009023.html).
-* We're talking about the design of a [[persistent Tor state|https://mailman.boum.org/pipermail/tails-dev/2015-June/009095.html]].
+* We're talking about the design of a [persistent Tor state](https://mailman.boum.org/pipermail/tails-dev/2015-June/009095.html).
-* We're also discussing the [[automated tests specification|https://mailman.boum.org/pipermail/tails-dev/2015-June/009123.html]].
+* We're also discussing the [automated tests specification](https://mailman.boum.org/pipermail/tails-dev/2015-June/009123.html).
Press and testimonials
======================
-* 2015-06-20: In [The state of encryption tools, 2 years after Snowden leaks](https://www.dailydot.com/politics/encryption-since-snowden-trending-up/) Patrick Howell O'Neill from the Daily Dot studies the adoption rate of encryption tools such as Tor, Tails, and OpenPGP since the beginning of the Snowden revelations.
+* We gave an interview to Amaelle Guiton from
+ [Libération](http://liberation.fr) about our relationship with the Tor
+ ecosystem.
+
+* We provided some data to Patrick Howell O'Neill from the Daily Dot for
+ his article about [The state of encryption tools, 2 years after Snowden leaks](https://www.dailydot.com/politics/encryption-since-snowden-trending-up/).
Translation
===========
@@ -90,11 +121,11 @@ Total original words: 14258
Metrics
=======
-* Tails has been started more than FIXME times this month. This makes FIXME boots a day on average.
+* Tails has been started more than 391,084 times this month. This makes FIXME boots a day on average.
-* FIXME downloads of the OpenPGP signature of Tails ISO from our website.
+* 19,284 downloads of the OpenPGP signature of Tails ISO from our website.
-* FIXME bug reports were received through WhisperBack.
+* 57 bug reports were received through WhisperBack.
-- Report by BitingBird for Tails folks
diff --git a/wiki/src/blueprint/report_2015_07.mdwn b/wiki/src/blueprint/report_2015_07.mdwn
index 9907529..0ca871b 100644
--- a/wiki/src/blueprint/report_2015_07.mdwn
+++ b/wiki/src/blueprint/report_2015_07.mdwn
@@ -19,12 +19,12 @@ Code
FIXME
-Documentation and Website
+Documentation and website
=========================
FIXME
-User Experience
+User experience
===============
FIXME
diff --git a/wiki/src/blueprint/report_2015_08.mdwn b/wiki/src/blueprint/report_2015_08.mdwn
index a990c9a..4920a11 100644
--- a/wiki/src/blueprint/report_2015_08.mdwn
+++ b/wiki/src/blueprint/report_2015_08.mdwn
@@ -16,12 +16,12 @@ Code
FIXME
-Documentation and Website
+Documentation and website
=========================
FIXME
-User Experience
+User experience
===============
FIXME
diff --git a/wiki/src/blueprint/report_2015_09.mdwn b/wiki/src/blueprint/report_2015_09.mdwn
index c29b862..d3f2409 100644
--- a/wiki/src/blueprint/report_2015_09.mdwn
+++ b/wiki/src/blueprint/report_2015_09.mdwn
@@ -16,12 +16,12 @@ Code
FIXME
-Documentation and Website
+Documentation and website
=========================
FIXME
-User Experience
+User experience
===============
FIXME
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index f548a0d..fad6ec3 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,13 +1,5 @@
[[!meta title="Calendar"]]
-* 2015-07-02 or a bit later: Release 1.4.1
- - anonym is the RM until June 17
- - intrigeri is the RM from June 17 to the release
- - Finish testing Tails 1.4.1 by the afternoon, CEST.
- - Release Tails 1.4.1 during late CEST.
-
-* 2015-07-03: [[Monthly meeting|contribute/meetings]]
-
* 2015-07-12: [[Low-hanging fruits session|contribute/low-hanging_fruit_sessions]]
* 2015-07-31:
diff --git a/wiki/src/contribute/git.mdwn b/wiki/src/contribute/git.mdwn
index a60a76c..fd1d39d 100644
--- a/wiki/src/contribute/git.mdwn
+++ b/wiki/src/contribute/git.mdwn
@@ -170,7 +170,7 @@ rewritten, e.g. it may be rebased on top of `devel`.
Unless there are good reasons to do otherwise, bugfix branches must be
forked off the latest stable release tag, while feature branches
-should are forked off the devel branch.
+should be forked off the devel branch.
#### experimental
diff --git a/wiki/src/contribute/meetings/201507.mdwn b/wiki/src/contribute/meetings/201507.mdwn
new file mode 100644
index 0000000..e3019c4
--- /dev/null
+++ b/wiki/src/contribute/meetings/201507.mdwn
@@ -0,0 +1,74 @@
+[[!meta title="July 2015 online meeting"]]
+
+[[!toc levels=1]]
+
+# Volunteers to handle "[Hole in the roof](https://labs.riseup.net/code/versions/198)" tickets this month
+
+Nobody has spare bandwidth. If something happens in this area,
+it'll be a good surprise.
+
+# Availability and plans for monthly low-hanging fruits meeting
+
+No one attending this meeting promised anything about the next LHF
+session.
+
+# [[!tails_ticket 9530 desc="Consider using hkp://ha.pool.sks-keyservers.net in non-hkps-enabled software"]]
+
+Those of us who had an opinion on this matter felt we lacked
+information to make a decision => we decided that someone should try
+using that "HA" pool in the automated test suite after reverting
+[[!tails_ticket 9518]], and measure if it improves things compared to the regular hkps
+pool. That's low priority, though.
+
+# [[!tails_ticket 9529 desc="Ping PayPal donors regularly?"]]
+
+Some of us found it important to have an opt-out mechanism.
+u. volunteered to maintain the opt-out information, so next steps are:
+
+1. decide if/how MoC can have access to these opt-out info
+2. if "we" find a way to do that, then implement it; otherwise, get
+ back to "do we really need opt-out"?
+
+... and intrigeri (with his -accounting@ hat on) is OK with taking the
+opt-out info into account when "spamming" the rest of the donors.
+
+Some concerns were raised about how that information was managed.
+Learning that it was managed under the -accounting@ security policy
+satisfied the people who raised these concerns.
+
+# [[!tails_ticket 8864 desc="Consider flagging first boot after installing"]]
+
+
+We tried to answer this question: "is it OK that a given Tails device
+has written, somewhere, whether it has been started already?"
+
+a) if I root your Tails, what does it give me to know whether it's the
+ first time it's booted?
+
+and
+
+b) if I steal your Tails, what does it give me to know whether it's been started yet?
+
+and we didn't find any serious risks in doing so, except it proves
+that a given Tails device has been *used* (which might entail more
+legal risks than mere possession), which seemed overkill a threat
+model to us.
+
+# [[!tails_ticket 7151 desc="Accept donations via micropayment systems"]]
+
+We quickly agreed about the general idea, and then discussed where
+exactly we want to add buttons linking to Flattr. We easily agreed to
+add them to the donations page. And then, discussing whether to link
+to Flattr from each blog post, we ended up finding it better to link
+to our donations page instead, replacing:
+
+"There are many ways [[you can contribute|contribute]] to Tails.
+If you want to help, come talk to us!"
+
+with:
+
+"There are many ways [[you can contribute|contribute]] to Tails, for
+example by [[donating|contribute/how/donate]]. If you want to help,
+come talk to us!"
+
+intrigeri will have these proposals go through -project@.
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 32997e3..bc29035 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -734,9 +734,11 @@ to be released in `inc/*`:
Update the size of the ISO image in `inc/*`:
- LC_NUMERIC=C ls -l --si $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
- cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2B/' | tr -d '\n' \
- > "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
+ MB=$(LC_NUMERIC=C ls -l --si $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
+ cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2B/' | tr -d '\n')
+ MiB=$(LC_NUMERIC=C ls -l -h $ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso | \
+ cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2iB/' | tr -d '\n')
+ echo "($MB/$MiB)" > "$RELEASE_CHECKOUT/wiki/src/inc/stable_i386_iso_size.html"
Update the [[support/known_issues]] page:
@@ -991,6 +993,7 @@ this, and skip what does not make sense for a RC.
bare_repo=$(mktemp -d)
(cd "$MASTER_CHECKOUT" && git fetch) && \
+ (cd "$MASTER_CHECKOUT" && git submodule update) && \
git clone --bare --reference "$MASTER_CHECKOUT" \
boum_org_amnesia@webmasters.boum.org:wiki.git \
"$bare_repo" && \
@@ -998,11 +1001,12 @@ this, and skip what does not make sense for a RC.
--repo "$bare_repo" && \
rm -rf "$bare_repo"
-1. Pull `master` back and merge it into `devel`.
+1. Pull `master` back and merge it into `stable`, and in turn into
+ `devel`, `experimental` and `feature/jessie`.
1. Follow the
[[post-release|contribute/APT_repository#workflow-post-release]] APT
repository documentation.
-1. Push the resulting `devel` branch.
+1. Push the resulting branches.
1. If this was a major release, then reset experimental:
- take note of branches merged into `experimental`, but not into
`devel`:
diff --git a/wiki/src/contribute/working_together/roles/sysadmins.mdwn b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
index 3806aed..6cd3897 100644
--- a/wiki/src/contribute/working_together/roles/sysadmins.mdwn
+++ b/wiki/src/contribute/working_together/roles/sysadmins.mdwn
@@ -52,7 +52,15 @@ system administration.
* keep systems up-to-date, reboot them as needed
* keep backups up-to-date
* keep Puppet modules up-to-date wrt. upstream changes
-* keep Jenkins plugins up-to-date
+* keep Jenkins plugins up-to-date, by upgrading any plugin that satisfies
+ at least one of these conditions:
+ - only brings security fixes
+ - fixes bugs we're affected by
+ - brings new feature we are interested in, without breaking the ones we rely on
+ - is needed to upgrade another plugin that we want to upgrade
+ - is required by a system upgrade (e.g. of the Jenkins packages)
+* report bugs identified in Jenkins plugins after they have been upgraded (both
+ on the upstream bug tracker and on our own one)
<a id="tools"></a>
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index 854a123..c174dd3 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 14:31+0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-01 13:26+0200\n"
"Last-Translator: \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"
diff --git a/wiki/src/doc/about/warning.fr.po b/wiki/src/doc/about/warning.fr.po
index 2fae78f..6c30d02 100644
--- a/wiki/src/doc/about/warning.fr.po
+++ b/wiki/src/doc/about/warning.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-24 09:18+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+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"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po b/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
index 3987d1d..7420041 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
+++ b/wiki/src/doc/advanced_topics/virtualization/virt-manager.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-07 18:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-07 22:18+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,7 +62,6 @@ msgstr "</div>\n"
#. type: Plain text
#, no-wrap
-#| msgid "<div class=\"tip\">\n"
msgid "<div class=\"note\">\n"
msgstr "<div class=\"note\">\n"
@@ -142,7 +141,8 @@ msgstr "Installation\n"
#. type: Plain text
msgid "To install *virt-manager* in Debian, execute the following command:"
-msgstr "Pour installer *virt-manager* dans Debian, exécuter la commande suivante :"
+msgstr ""
+"Pour installer *virt-manager* dans Debian, exécuter la commande suivante :"
#. type: Plain text
#, no-wrap
@@ -151,7 +151,8 @@ msgstr " sudo apt-get install virt-manager libvirt-daemon-system\n"
#. type: Plain text
msgid "To install *virt-manager* in Ubuntu, execute the following command:"
-msgstr "Pour installer *virt-manager* dans Ubuntu, exécuter la commande suivante :"
+msgstr ""
+"Pour installer *virt-manager* dans Ubuntu, exécuter la commande suivante :"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/anonymous_internet.index.fr.po b/wiki/src/doc/anonymous_internet.index.fr.po
index 10323fd..e424082 100644
--- a/wiki/src/doc/anonymous_internet.index.fr.po
+++ b/wiki/src/doc/anonymous_internet.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-08 18:46+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-05-10 20:35-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -52,9 +52,6 @@ msgid "[[!traillink Chatting_with_Pidgin_&_OTR|anonymous_internet/pidgin]]"
msgstr "[[!traillink Discuter_avec_Pidgin_&_OTR|anonymous_internet/pidgin]]"
#. type: Bullet: ' - '
-#| msgid ""
-#| "[[!traillink Browsing_the_web_with_<span_class=\"application"
-#| "\">Tor_Browser</span>|anonymous_internet/tor_browser]]"
msgid ""
"[[!traillink Reading_and_writing_emails_with_<span_class=\"application"
"\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
@@ -63,9 +60,6 @@ msgstr ""
"\">Claws_Mail</span>|anonymous_internet/claws_mail]]"
#. type: Bullet: ' - '
-#| msgid ""
-#| "[[!traillink Exchange_bitcoins_using_<span_class=\"application"
-#| "\">Electrum</span></span>|anonymous_internet/electrum]]"
msgid ""
"[[!traillink Exchange_bitcoins_using_<span_class=\"application\">Electrum</"
"span>|anonymous_internet/electrum]]"
diff --git a/wiki/src/doc/anonymous_internet/claws_mail.fr.po b/wiki/src/doc/anonymous_internet/claws_mail.fr.po
index 24ffdc8..9e040d9 100644
--- a/wiki/src/doc/anonymous_internet/claws_mail.fr.po
+++ b/wiki/src/doc/anonymous_internet/claws_mail.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-03 14:04+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-31 16:02-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"
diff --git a/wiki/src/doc/anonymous_internet/electrum.fr.po b/wiki/src/doc/anonymous_internet/electrum.fr.po
index bb45bee..eb48530 100644
--- a/wiki/src/doc/anonymous_internet/electrum.fr.po
+++ b/wiki/src/doc/anonymous_internet/electrum.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-04-21 23:21+0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-04-21 23:23-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"
@@ -22,9 +23,6 @@ msgstr "[[!meta title=\"Échanger des bitcoins avec Electrum\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<span class=\"application\">Electrum</span> is a [[!wikipedia bitcoin]] client that is\n"
-#| "particularly suited to the context of Tails because:\n"
msgid ""
"[<span class=\"application\">Electrum</span>](https://electrum.org/) is a [[!wikipedia bitcoin]] client that is\n"
"particularly suited to the context of Tails because:\n"
@@ -101,9 +99,6 @@ msgstr ""
"</span>.\n"
#. type: Plain text
-#| msgid ""
-#| "To learn how to use *Electrum*, read the [documentation on the *Electrum* "
-#| "website](https://electrum.org/)."
msgid ""
"To learn how to use *Electrum*, read the [documentation on the *Electrum* "
"wiki](http://electrum.orain.org/)."
diff --git a/wiki/src/doc/anonymous_internet/i2p.fr.po b/wiki/src/doc/anonymous_internet/i2p.fr.po
index b95db4c..f3330d0 100644
--- a/wiki/src/doc/anonymous_internet/i2p.fr.po
+++ b/wiki/src/doc/anonymous_internet/i2p.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-15 17:12+0300\n"
-"PO-Revision-Date: 2014-10-09 16:44-0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
+"PO-Revision-Date: 2015-07-01 23:19-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -47,17 +47,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
msgid "<p>I2P doesn't go through Tor.</p>\n"
-msgstr ""
+msgstr "<p>I2P ne passe pas par Tor.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/anonymous_internet/vidalia.fr.po b/wiki/src/doc/anonymous_internet/vidalia.fr.po
index e96a5d3..7473a57 100644
--- a/wiki/src/doc/anonymous_internet/vidalia.fr.po
+++ b/wiki/src/doc/anonymous_internet/vidalia.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-24 23:21+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-05-11 13:23-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,10 +23,6 @@ msgstr "[[!meta title=\"Contrôler Tor grâce à Vidalia\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<span class=\"application\">Vidalia</span> allows you to control some of the\n"
-#| "functionalities of Tor. It is started automatically when an [[Internet\n"
-#| "connection|networkmanager]] is established.\n"
msgid ""
"<span class=\"application\">Vidalia</span> allows you to control some of the\n"
"functionalities of Tor. Unless [[first_steps/startup_options/Windows_Camouflage]] is enabled, Vidalia will\n"
@@ -272,15 +268,11 @@ msgstr "<a id=\"new_identity\"></a>\n"
#. type: Title =
#, no-wrap
-#| msgid "The <span class=\"guilabel\">New Identity</span> feature\n"
msgid "<span class=\"guilabel\">New Identity</span> feature\n"
msgstr "La fonction <span class=\"guilabel\">Utiliser une nouvelle identité</span>\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "The <span class=\"guilabel\">Network Map</span> feature displays information about\n"
-#| "the available Tor relays and your established circuits and connections:\n"
msgid ""
"The <span class=\"guilabel\">New Identity</span> feature of Vidalia forces Tor\n"
"to use new circuits but only for new connections.\n"
@@ -339,10 +331,6 @@ msgstr ""
"first_steps/startup_options/bridge_mode]]."
#. type: Bullet: ' - '
-#| msgid ""
-#| "It is impossible to edit the <span class=\"filename\">torrc</span> "
-#| "configuration file using <span class=\"application\">Vidalia</span>. See "
-#| "[[!tails_ticket 6601]]."
msgid ""
"It is impossible to edit the <span class=\"filename\">torrc</span> "
"configuration file using <span class=\"application\">Vidalia</span>."
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
index d8ba7a8..5bd9034 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-18 19:06+0300\n"
+"POT-Creation-Date: 2015-07-04 13:45+0300\n"
"PO-Revision-Date: 2014-04-04 08:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgstr "</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<div class=\"caution\">\n"
-msgid "<div class=\"bug\">\n"
+msgid "<div class=\"bug\" id=\"encoding\">\n"
msgstr "<div class=\"caution\">\n"
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
index 35aed07..ad6b616 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-18 19:06+0300\n"
+"POT-Creation-Date: 2015-07-04 13:45+0300\n"
"PO-Revision-Date: 2012-10-17 23:13-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgstr "</div>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "<div class=\"caution\">\n"
-msgid "<div class=\"bug\">\n"
+msgid "<div class=\"bug\" id=\"encoding\">\n"
msgstr "<div class=\"caution\">\n"
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn
index 7984ab3..14a6488 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.mdwn
@@ -9,7 +9,7 @@ sending it by email for example.
</div>
-<div class="bug">
+<div class="bug" id="encoding">
<p>When using <span class="application">Tails OpenPGP Applet</span> to encrypt emails, non-ASCII characters (for example non-Latin characters or characters
with accents) might not display correctly to the recipients of
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
index 5695972..9029e01 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.warning.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-18 19:06+0300\n"
+"POT-Creation-Date: 2015-07-04 13:45+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "<div class=\"bug\">\n"
+msgid "<div class=\"bug\" id=\"encoding\">\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy/keyringer.fr.po b/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
index f23b9db..4a4826c 100644
--- a/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/keyringer.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-23 18:30+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-03-01 12:15-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"
@@ -139,6 +140,7 @@ msgid "To do so you can execute the following command:"
msgstr "Pour faire cela vous pouvez exécuter la commande suivante :"
#. type: Plain text
-#, no-wrap
-msgid " rsync -v --archive --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles/\n"
+#, fuzzy, no-wrap
+#| msgid " rsync -v --archive --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles/\n"
+msgid " rsync -va --ignore-existing --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles\n"
msgstr " rsync -v --archive --delete ~/.keyringer /live/persistence/TailsData_unlocked/dotfiles/\n"
diff --git a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
index 94ab0f3..d06034d 100644
--- a/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-15 17:01+0100\n"
-"PO-Revision-Date: 2015-02-21 13:13-0000\n"
+"POT-Creation-Date: 2015-07-07 16:35+0300\n"
+"PO-Revision-Date: 2015-07-01 23:12-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -63,7 +63,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"access_hdd\"></a>\n"
-msgstr ""
+msgstr "<a id=\"access_hdd\"></a>\n"
#. type: Title =
#, no-wrap
@@ -122,6 +122,8 @@ msgid ""
"Open the [[*Nautilus* file manager|doc/first_steps/"
"introduction_to_gnome_and_the_tails_desktop#nautilus]]."
msgstr ""
+"Ouvrir le [[gestionnaire de fichiers *Nautilus*|doc/first_steps/"
+"introduction_to_gnome_and_the_tails_desktop#nautilus]]."
#. type: Bullet: '3. '
msgid "Click on the hard disk of your choice in the left pane."
diff --git a/wiki/src/doc/first_steps.index.de.po b/wiki/src/doc/first_steps.index.de.po
index 98273a6..1a67e3e 100644
--- a/wiki/src/doc/first_steps.index.de.po
+++ b/wiki/src/doc/first_steps.index.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-14 19:32+0300\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
"PO-Revision-Date: 2014-06-08 17:10+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,13 +63,14 @@ msgstr "[[!traillink Eine_DVD_brennen|first_steps/dvd]]"
#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
+" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" using [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - Uninstalling Tails or resetting a USB stick or SD card,\n"
-" using [[!traillink Linux|first_steps/reset/linux]],\n"
-" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - Uninstalling Tails or resetting a USB stick or SD card\n"
+" using [[!traillink Linux|first_steps/reset/linux]]\n"
+" [[!traillink Windows|first_steps/reset/windows]],\n"
+" or [[!traillink Mac|first_steps/reset/mac]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index 92ef7cf..95e96c0 100644
--- a/wiki/src/doc/first_steps.index.fr.po
+++ b/wiki/src/doc/first_steps.index.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-29 10:09+0100\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
"PO-Revision-Date: 2014-10-08 08:44-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -31,16 +31,47 @@ msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
msgstr "[[!traillink Graver_un_DVD|first_steps/dvd]]"
#. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
+#| " - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
+#| " using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
+#| " using [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+#| " using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+#| " - Uninstalling Tails or resetting a USB stick or SD card,\n"
+#| " using [[!traillink Linux|first_steps/reset/linux]],\n"
+#| " using [[!traillink Windows|first_steps/reset/windows]]\n"
+#| " - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
+#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
+#| " - [[!traillink Startup_options|first_steps/startup_options]]\n"
+#| " - [[!traillink Administration_password|first_steps/startup_options/administration_password]]\n"
+#| " - [[!traillink Windows_camouflage|first_steps/startup_options/windows_camouflage]]\n"
+#| " - [[!traillink MAC_address_spoofing|first_steps/startup_options/mac_spoofing]]\n"
+#| " - [[!traillink Network_configuration|first_steps/startup_options/network_configuration]]\n"
+#| " - [[!traillink Tor_bridge_mode|first_steps/startup_options/bridge_mode]]\n"
+#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
+#| " - [[!traillink Accessibility|first_steps/accessibility]]\n"
+#| " - [[!traillink Encrypted_persistence|first_steps/persistence]]\n"
+#| " - [[!traillink Warnings_about_persistence|first_steps/persistence/warnings]]\n"
+#| " - [[!traillink Create_&_configure_the_persistent_volume|first_steps/persistence/configure]]\n"
+#| " - [[!traillink Enable_&_use_the_persistent_volume|first_steps/persistence/use]]\n"
+#| " - [[!traillink Change_the_passphrase_of_the_persistent_volume|first_steps/persistence/change_passphrase]]\n"
+#| " - [[!traillink Manually_copy_your_persistent_data_to_a_new_device|first_steps/persistence/copy]]\n"
+#| " - [[!traillink Check_the_file_system_of_the_persistent_volume|first_steps/persistence/check_file_system]]\n"
+#| " - [[!traillink Delete_the_persistent_volume|first_steps/persistence/delete]]\n"
+#| " - [[!traillink Report_an_error|first_steps/bug_reporting]]\n"
+#| " - [[!traillink Tails_does_not_start|first_steps/bug_reporting/tails_does_not_start]]\n"
+#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
+" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" using [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - Uninstalling Tails or resetting a USB stick or SD card,\n"
-" using [[!traillink Linux|first_steps/reset/linux]],\n"
-" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - Uninstalling Tails or resetting a USB stick or SD card\n"
+" using [[!traillink Linux|first_steps/reset/linux]]\n"
+" [[!traillink Windows|first_steps/reset/windows]],\n"
+" or [[!traillink Mac|first_steps/reset/mac]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index f69cca5..677dd87 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -1,13 +1,14 @@
- [[!traillink Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|first_steps/media]]
- [[!traillink Burning_a_DVD|first_steps/dvd]]
- [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)
- - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],
+ - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]
using [[!traillink Linux|first_steps/installation/manual/linux]],
- using [[!traillink Windows|first_steps/installation/manual/windows]],
- using [[!traillink Mac|first_steps/installation/manual/mac]]
- - Uninstalling Tails or resetting a USB stick or SD card,
- using [[!traillink Linux|first_steps/reset/linux]],
- using [[!traillink Windows|first_steps/reset/windows]]
+ [[!traillink Windows|first_steps/installation/manual/windows]],
+ or [[!traillink Mac|first_steps/installation/manual/mac]]
+ - Uninstalling Tails or resetting a USB stick or SD card
+ using [[!traillink Linux|first_steps/reset/linux]]
+ [[!traillink Windows|first_steps/reset/windows]],
+ or [[!traillink Mac|first_steps/reset/mac]]
- [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]
- [[!traillink Start_Tails|first_steps/start_tails]]
- [[!traillink Startup_options|first_steps/startup_options]]
diff --git a/wiki/src/doc/first_steps.index.pt.po b/wiki/src/doc/first_steps.index.pt.po
index 8b56566..a3d4f9c 100644
--- a/wiki/src/doc/first_steps.index.pt.po
+++ b/wiki/src/doc/first_steps.index.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-14 19:32+0300\n"
+"POT-Creation-Date: 2015-07-07 16:38+0300\n"
"PO-Revision-Date: 2014-07-30 18:34-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,13 +62,14 @@ msgstr "[[!traillink Gravando_um_DVD|first_steps/dvd]]"
#| " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgid ""
" - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
-" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
+" - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]\n"
" using [[!traillink Linux|first_steps/installation/manual/linux]],\n"
-" using [[!traillink Windows|first_steps/installation/manual/windows]],\n"
-" using [[!traillink Mac|first_steps/installation/manual/mac]]\n"
-" - Uninstalling Tails or resetting a USB stick or SD card,\n"
-" using [[!traillink Linux|first_steps/reset/linux]],\n"
-" using [[!traillink Windows|first_steps/reset/windows]]\n"
+" [[!traillink Windows|first_steps/installation/manual/windows]],\n"
+" or [[!traillink Mac|first_steps/installation/manual/mac]]\n"
+" - Uninstalling Tails or resetting a USB stick or SD card\n"
+" using [[!traillink Linux|first_steps/reset/linux]]\n"
+" [[!traillink Windows|first_steps/reset/windows]],\n"
+" or [[!traillink Mac|first_steps/reset/mac]]\n"
" - [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]\n"
" - [[!traillink Start_Tails|first_steps/start_tails]]\n"
" - [[!traillink Startup_options|first_steps/startup_options]]\n"
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
index bbe04f6..1bd99e9 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-31 14:14+0300\n"
+"POT-Creation-Date: 2015-07-07 21:37+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"
@@ -77,9 +77,8 @@ msgstr ""
msgid ""
"From which media are you trying to start Tails: DVD, USB stick [[installed "
"manually|doc/first_steps/installation/manual]], USB stick [[installed with "
-"Tails Installer|doc/first_steps/installation/manual]], SD card? Keep in mind "
-"that, we do not support any other installation method than the ones listed "
-"above."
+"Tails Installer|doc/first_steps/installation]], SD card? Keep in mind that, "
+"we do not support any other installation method than the ones listed above."
msgstr ""
#. type: Bullet: '4. '
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
index 11e7c22..9237cba 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-29 10:09+0100\n"
-"PO-Revision-Date: 2014-10-08 13:32-0000\n"
+"POT-Creation-Date: 2015-07-07 21:37+0200\n"
+"PO-Revision-Date: 2015-07-07 22:59+0200\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -90,15 +90,9 @@ msgstr ""
msgid ""
"From which media are you trying to start Tails: DVD, USB stick [[installed "
"manually|doc/first_steps/installation/manual]], USB stick [[installed with "
-"Tails Installer|doc/first_steps/installation/manual]], SD card? Keep in mind "
-"that, we do not support any other installation method than the ones listed "
-"above."
-msgstr ""
-"Depuis quel type de support essayez-vous de démarrer Tails : DVD, clé USB "
-"[[installée manuellement|/doc/first_steps/installation/manual]], clé USB "
-"[[installée avec l'installeur USB Tails|/doc/first_steps/installation/"
-"manual]], carte SD ? Sachez que nous ne prenons en charge aucun autre moyen "
-"d'installation que ceux décrits ci-dessus."
+"Tails Installer|doc/first_steps/installation]], SD card? Keep in mind that, "
+"we do not support any other installation method than the ones listed above."
+msgstr "Depuis quel type de support essayez-vous de démarrer Tails : DVD, clé USB [[installée manuellement|/doc/first_steps/installation/manual]], clé USB [[installée avec l'installeur USB Tails|/doc/first_steps/installation]], carte SD ? Sachez que nous ne prenons en charge aucun autre moyen d'installation que ceux décrits ci-dessus."
#. type: Bullet: '4. '
msgid ""
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn
index 4af72f2..5620144 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.mdwn
@@ -33,7 +33,7 @@ starting Tails.
3. From which media are you trying to start Tails: DVD, USB stick
[[installed manually|doc/first_steps/installation/manual]], USB
stick [[installed with Tails
- Installer|doc/first_steps/installation/manual]], SD card? Keep in mind
+ Installer|doc/first_steps/installation]], SD card? Keep in mind
that, we do not support any other installation method than the ones
listed above.
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
index 165ec35..1a78aac 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-08-12 22:33+0200\n"
-"PO-Revision-Date: 2014-07-31 14:46-0300\n"
+"POT-Creation-Date: 2015-07-07 21:37+0200\n"
+"PO-Revision-Date: 2015-07-07 22:59+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -88,15 +88,9 @@ msgstr ""
msgid ""
"From which media are you trying to start Tails: DVD, USB stick [[installed "
"manually|doc/first_steps/installation/manual]], USB stick [[installed with "
-"Tails Installer|doc/first_steps/installation/manual]], SD card? Keep in mind "
-"that, we do not support any other installation method than the ones listed "
-"above."
-msgstr ""
-"Através de que mídia você está tentando inicializar o Tails: DVD, memória "
-"USB [[instalada manualmente|doc/first_steps/installation/manual]], memória "
-"USB [[instalado com o instalador do Tails|doc/first_steps/installation/"
-"manual]], cartão SD? Tenha em mente que nós não oferecemos suporte a métodos "
-"de instalação que não sejam os listados acima."
+"Tails Installer|doc/first_steps/installation]], SD card? Keep in mind that, "
+"we do not support any other installation method than the ones listed above."
+msgstr "Através de que mídia você está tentando inicializar o Tails: DVD, memória USB [[instalada manualmente|doc/first_steps/installation/manual]], memória USB [[instalado com o instalador do Tails|doc/first_steps/installation]], cartão SD? Tenha em mente que nós não oferecemos suporte a métodos de instalação que não sejam os listados acima."
#. type: Bullet: '4. '
msgid ""
diff --git a/wiki/src/doc/first_steps/installation.fr.po b/wiki/src/doc/first_steps/installation.fr.po
index 93041e9..653e7d1 100644
--- a/wiki/src/doc/first_steps/installation.fr.po
+++ b/wiki/src/doc/first_steps/installation.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-24 23:21+0300\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-07-01 19:32-0000\n"
"Last-Translator: \n"
"Language-Team: SLANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
index 17a6451..a7497a3 100644
--- a/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
+++ b/wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-11 19:58+0300\n"
-"PO-Revision-Date: 2015-01-18 11:09-0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
+"PO-Revision-Date: 2015-07-02 11:26-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -82,7 +82,6 @@ msgstr "[[!img applications.png link=no alt=\"Menu des applications\"]]\n"
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"terminal\"></a>\n"
msgid "<a id=\"help\"></a>\n"
msgstr "<a id=\"help\"></a>\n"
@@ -307,7 +306,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"terminal\"></a>\n"
msgid "<a id=\"claws_mail\"></a>\n"
msgstr "<a id=\"claws_mail\"></a>\n"
@@ -318,12 +316,6 @@ msgstr "[[!img claws-mail.png link=no]]\n"
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| "<div class=\"text\">\n"
-#| "<strong>Pidgin</strong>: instant messaging client<br/>\n"
-#| "[[See the corresponding documentation|anonymous_internet/pidgin]]\n"
-#| "</div>\n"
-#| "</div>\n"
msgid ""
"<div class=\"text\"><strong>Claws Mail</strong>: email client<br />\n"
"[[See the corresponding documentation|anonymous_internet/claws_mail]]\n"
@@ -541,15 +533,12 @@ msgstr ""
"</div>\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<a id=\"audio\"></a>\n"
-#| "<div class=\"icon\">\n"
+#, no-wrap
msgid ""
"<a id=\"keyboard_layout\"></a>\n"
"<div class=\"icon\">\n"
msgstr ""
-"<a id=\"audio\"></a>\n"
+"<a id=\"keyboard_layout\"></a>\n"
"<div class=\"icon\">\n"
#. type: Plain text
@@ -734,7 +723,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid "<a id=\"terminal\"></a>\n"
msgid "<a id=\"nautilus\"></a>\n"
msgstr "<a id=\"nautilus\"></a>\n"
diff --git a/wiki/src/doc/first_steps/persistence/use.fr.po b/wiki/src/doc/first_steps/persistence/use.fr.po
index 623ae9b..9a51025 100644
--- a/wiki/src/doc/first_steps/persistence/use.fr.po
+++ b/wiki/src/doc/first_steps/persistence/use.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-29 10:09+0100\n"
-"PO-Revision-Date: 2014-10-08 13:27-0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
+"PO-Revision-Date: 2015-07-02 17:11-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -29,7 +29,7 @@ msgstr "[[!inline pages=\"doc/first_steps/persistence.caution.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title =
#, no-wrap
@@ -45,7 +45,7 @@ msgid ""
"enable the persistent volume for the current working session.\n"
msgstr ""
"1. Lors du démarrage de Tails, dans la\n"
-"boîte de dialogue <span class=\"guilabel\">Activer la persistence ?</span> de [[Tails\n"
+"boîte de dialogue <span class=\"guilabel\">Activer la persistance ?</span> de [[Tails\n"
"Greeter|startup_options#tails_greeter]], choisir <span class=\"guilabel\">Oui</span> pour\n"
"activer le volume persistant pour la présente session de travail.\n"
diff --git a/wiki/src/doc/first_steps/reset/linux.de.po b/wiki/src/doc/first_steps/reset/linux.de.po
index fbfd6a6..e0a5a81 100644
--- a/wiki/src/doc/first_steps/reset/linux.de.po
+++ b/wiki/src/doc/first_steps/reset/linux.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-01-25 20:07+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-06-04 06:53+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: Tails localization <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-"Language: de\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/first_steps/reset/mac.de.po b/wiki/src/doc/first_steps/reset/mac.de.po
new file mode 100644
index 0000000..de3eb88
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.de.po
@@ -0,0 +1,102 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 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-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disk_utility\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using <span class=\"application\">Disk Utility</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Make sure that the USB stick or SD card that you want to reset is unplugged."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Start <span class=\"application\">Disk Utility</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" A list of all the storage devices on the computer appears in the left "
+"pane\n"
+" of the window.\n"
+msgstr ""
+
+#. type: Bullet: '3. '
+msgid "Plug the USB stick or SD card that you want to reset."
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. 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 ""
+
+#. type: Bullet: '5. '
+msgid ""
+"To reset the device, click on the <span class=\"guilabel\">Erase</span> tab "
+"in the right pane and click on the <span class=\"button\">Erase</span> "
+"button on the bottom right."
+msgstr ""
+
+#. type: Bullet: '6. '
+msgid ""
+"In the confirmation dialog, click on the <span class=\"button\">Erase</span> "
+"button to confirm."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/reset/mac.fr.po b/wiki/src/doc/first_steps/reset/mac.fr.po
new file mode 100644
index 0000000..de3eb88
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.fr.po
@@ -0,0 +1,102 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 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-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disk_utility\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using <span class=\"application\">Disk Utility</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Make sure that the USB stick or SD card that you want to reset is unplugged."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Start <span class=\"application\">Disk Utility</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" A list of all the storage devices on the computer appears in the left "
+"pane\n"
+" of the window.\n"
+msgstr ""
+
+#. type: Bullet: '3. '
+msgid "Plug the USB stick or SD card that you want to reset."
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. 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 ""
+
+#. type: Bullet: '5. '
+msgid ""
+"To reset the device, click on the <span class=\"guilabel\">Erase</span> tab "
+"in the right pane and click on the <span class=\"button\">Erase</span> "
+"button on the bottom right."
+msgstr ""
+
+#. type: Bullet: '6. '
+msgid ""
+"In the confirmation dialog, click on the <span class=\"button\">Erase</span> "
+"button to confirm."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/reset/mac.mdwn b/wiki/src/doc/first_steps/reset/mac.mdwn
new file mode 100644
index 0000000..2217888
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.mdwn
@@ -0,0 +1,37 @@
+[[!meta title="Resetting a USB stick or SD card using Mac OSX"]]
+
+[[!inline pages="doc/first_steps/usb_reset.intro" raw="yes"]]
+
+<a id="disk_utility"></a>
+
+Using <span class="application">Disk Utility</span>
+===================================================
+
+<div class="caution">
+
+<strong>You might overwrite any hard disk on the computer.</strong> If at some
+point you are not sure about which device to choose, stop proceeding.
+
+</div>
+
+1. Make sure that the USB stick or SD card that you want to reset is unplugged.
+
+2. Start <span class="application">Disk Utility</span>.
+
+ A list of all the storage devices on the computer appears in the left pane
+ of the window.
+
+3. Plug the USB stick or SD card that you want to reset.
+
+ A new device appears in the list of storage devices. This new device
+ corresponds to the USB stick or SD card that you plugged in. Click on it.
+
+4. In the list of storage devices, verify that the device corresponds
+ to the device that you want to reset, its brand, its size, etc.
+
+5. To reset the device, click on the <span class="guilabel">Erase</span> tab
+ in the right pane and click on the <span class="button">Erase</span> button
+ on the bottom right.
+
+6. In the confirmation dialog, click on the <span class="button">Erase</span>
+ button to confirm.
diff --git a/wiki/src/doc/first_steps/reset/mac.pt.po b/wiki/src/doc/first_steps/reset/mac.pt.po
new file mode 100644
index 0000000..de3eb88
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.pt.po
@@ -0,0 +1,102 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 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-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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Resetting a USB stick or SD card using Mac OSX\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"doc/first_steps/usb_reset.intro\" raw=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"disk_utility\"></a>\n"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Using <span class=\"application\">Disk Utility</span>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<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 ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "Make sure that the USB stick or SD card that you want to reset is unplugged."
+msgstr ""
+
+#. type: Bullet: '2. '
+msgid "Start <span class=\"application\">Disk Utility</span>."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" A list of all the storage devices on the computer appears in the left "
+"pane\n"
+" of the window.\n"
+msgstr ""
+
+#. type: Bullet: '3. '
+msgid "Plug the USB stick or SD card that you want to reset."
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. 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 ""
+
+#. type: Bullet: '5. '
+msgid ""
+"To reset the device, click on the <span class=\"guilabel\">Erase</span> tab "
+"in the right pane and click on the <span class=\"button\">Erase</span> "
+"button on the bottom right."
+msgstr ""
+
+#. type: Bullet: '6. '
+msgid ""
+"In the confirmation dialog, click on the <span class=\"button\">Erase</span> "
+"button to confirm."
+msgstr ""
diff --git a/wiki/src/doc/first_steps/reset/windows.de.po b/wiki/src/doc/first_steps/reset/windows.de.po
index 36a16b6..050545d 100644
--- a/wiki/src/doc/first_steps/reset/windows.de.po
+++ b/wiki/src/doc/first_steps/reset/windows.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2015-01-25 20:07+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-26 17:25+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails localization <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-"Language: de\n"
#. type: Plain text
#, no-wrap
@@ -75,8 +75,8 @@ msgstr ""
msgid ""
"Click on the <span class=\"button\">Start</span> button, and choose <span "
"class=\"menuchoice\">All Programs&nbsp;▸ Accessories&nbsp;▸ Command Prompt</"
-"span>, to open the <span class=\"application\">[[!wikipedia Command "
-"Prompt]]</span>,"
+"span>, to open the <span class=\"application\">[[!wikipedia Command Prompt]]"
+"</span>,"
msgstr ""
"Klicken Sie auf die <span class=\"button\">Start</span> Schaltfläche und "
"wählen Sie <span class=\"menuchoice\">Alle Programme&nbsp;▸ Zubehör&nbsp;▸ "
diff --git a/wiki/src/doc/first_steps/startup_options.de.po b/wiki/src/doc/first_steps/startup_options.de.po
index 6dc3ed9..591e09e 100644
--- a/wiki/src/doc/first_steps/startup_options.de.po
+++ b/wiki/src/doc/first_steps/startup_options.de.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-15 20:54+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-02 15:20-0000\n"
"Last-Translator: spriver <spriver@autistici.org>\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"
diff --git a/wiki/src/doc/first_steps/startup_options.fr.po b/wiki/src/doc/first_steps/startup_options.fr.po
index 5ffa363..c81300f 100644
--- a/wiki/src/doc/first_steps/startup_options.fr.po
+++ b/wiki/src/doc/first_steps/startup_options.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-15 20:54+0100\n"
-"PO-Revision-Date: 2015-01-25 10:17+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
+"PO-Revision-Date: 2015-07-02 11:21-0000\n"
"Last-Translator: amnesia <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -227,10 +227,7 @@ msgid "[[MAC address spoofing|mac_spoofing]]"
msgstr "[[Usurpation d'adresse Mac|mac_spoofing]]"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| " - [[Network configuration|network_configuration]]\n"
-#| " - [[Tor bridge mode|bridge_mode]]\n"
+#, no-wrap
msgid ""
" - [[Network configuration|network_configuration]]\n"
" - [[Tor bridge mode|bridge_mode]]\n"
@@ -238,6 +235,7 @@ msgid ""
msgstr ""
" - [[Configuration du réseau|network_configuration]]\n"
" - [[Mode bridge de Tor|bridge_mode]]\n"
+" - [[Persistance chiffrée|doc/first_steps/persistence/use]]\n"
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po b/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
index 7e82a6e..0637412 100644
--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-03 01:59+0200\n"
-"PO-Revision-Date: 2014-04-13 13:11+0200\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
+"PO-Revision-Date: 2015-07-02 11:23-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -158,7 +158,7 @@ msgstr "`obfs4`"
#. type: Bullet: ' - '
msgid "`ScrambleSuit`"
-msgstr ""
+msgstr "`ScrambleSuit`"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/first_steps/upgrade.fr.po b/wiki/src/doc/first_steps/upgrade.fr.po
index cf7e0be..a41c532 100644
--- a/wiki/src/doc/first_steps/upgrade.fr.po
+++ b/wiki/src/doc/first_steps/upgrade.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-05-09 06:26+0300\n"
-"PO-Revision-Date: 2014-10-08 09:36-0000\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
+"PO-Revision-Date: 2015-07-04 11:08+0200\n"
"Last-Translator: saegor <saegor@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -30,12 +30,12 @@ msgstr ""
"Tails inclut un mécanisme de mise à jour automatique des clés USB et cartes "
"SD vers une version plus récente. Lorsqu'il n'est pas possible de faire "
"cette **mise à jour automatique**, il est possible de faire une **mise à "
-"jour manuelle*. Cette page décrit les deux méthodes."
+"jour manuelle**. Cette page décrit les deux méthodes."
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
-msgstr ""
+msgstr "<div class=\"caution\">\n"
#. type: Plain text
msgid ""
@@ -48,7 +48,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-msgstr ""
+msgstr "</div>\n"
#. type: Plain text
#, no-wrap
@@ -64,7 +64,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-msgstr ""
+msgstr "<div class=\"note\">\n"
#. type: Plain text
#, no-wrap
@@ -82,12 +82,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
-msgstr ""
+msgstr "[[!toc levels=2]]\n"
#. type: Plain text
#, no-wrap
msgid "<a name=\"automatic\"></a>\n"
-msgstr ""
+msgstr "<a name=\"automatic\"></a>\n"
#. type: Title =
#, no-wrap
@@ -161,7 +161,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!img upgrader.png link=no]]\n"
-msgstr ""
+msgstr "[[!img upgrader.png link=no]]\n"
#. type: Plain text
#, no-wrap
@@ -199,11 +199,16 @@ msgid ""
"1.3.2, then the upgrade to 1.3.1 will be installed, and after you restart "
"Tails, the upgrade to 1.3.2 will be installed."
msgstr ""
+"Si vous avez raté une mise à jour, chaque mise à jour va être installée "
+"l'une après l'autre. Par exemple, si vous avez Tails 1.3 et que la version "
+"actuelle est la 1.3.2, la mise à jour vers la version 1.3.1 va être "
+"installée, et après le redémarrage de Tails, la mise à jour vers la version "
+"1.3.2 va être installée."
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
-msgstr ""
+msgstr "<div class=\"tip\">\n"
#. type: Plain text
#, no-wrap
@@ -213,16 +218,20 @@ msgid ""
"Upgrader</span> later by opening a terminal and executing the following\n"
"command:</p>\n"
msgstr ""
+"<p>Si vous ne pouvez pas mettre à jour au démarrage (par exemple si vous n'avez\n"
+"pas de connexion à un réseau au démarrage), vous pouvez lancer\n"
+"<span class=\"application\">Tails Upgrader</span> plus tard en ouvrant un\n"
+"terminal et en exécutant la commande suivante :</p>\n"
#. type: Plain text
#, no-wrap
msgid "<pre>tails-upgrade-frontend-wrapper</pre>.\n"
-msgstr ""
+msgstr "<pre>tails-upgrade-frontend-wrapper</pre>.\n"
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps/upgrade.release_notes\" raw=\"yes\"]]\n"
-msgstr ""
+msgstr "[[!inline pages=\"doc/first_steps/upgrade.release_notes.fr\" raw=\"yes\"]]\n"
#. type: Plain text
msgid ""
@@ -262,7 +271,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a name=\"manual\"></a>\n"
-msgstr ""
+msgstr "<a name=\"manual\"></a>\n"
#. type: Title =
#, no-wrap
diff --git a/wiki/src/doc/first_steps/upgrade.release_notes.de.po b/wiki/src/doc/first_steps/upgrade.release_notes.de.po
index 3b5a5b7..bed93f9 100644
--- a/wiki/src/doc/first_steps/upgrade.release_notes.de.po
+++ b/wiki/src/doc/first_steps/upgrade.release_notes.de.po
@@ -6,25 +6,26 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-30 11:24+0200\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-30 12:32+0100\n"
"Last-Translator: spriver <spriver@autistici.org>\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"
-#. Note for translators: make sure that the translation of this string
-#. integrates well with /inc/stable_i386_release_notes.
+#. Note for translators: make sure that the translation of this string
+#. integrates well with /inc/stable_i386_release_notes.
#. type: Content of: outside any tag (error?)
msgid ""
"We recommend you to read the [[!inline pages=\"inc/stable_i386_release_notes"
"\" raw=\"yes\"]] for the latest version. They document all the changes in "
"this new version:"
msgstr ""
-"Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes."
-"de\" raw=\"yes\"]] für die neueste Version zu lesen. Sie beschreiben alle "
+"Wir empfehlen Ihnen, die [[!inline pages=\"inc/stable_i386_release_notes.de"
+"\" raw=\"yes\"]] für die neueste Version zu lesen. Sie beschreiben alle "
"Änderungen in dieser neuen Version:"
#. type: Content of: <ul><li>
diff --git a/wiki/src/doc/introduction.de.po b/wiki/src/doc/introduction.de.po
index b2bc37d..23efd78 100644
--- a/wiki/src/doc/introduction.de.po
+++ b/wiki/src/doc/introduction.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2014-04-26 10:50+0200\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-04-30 20:08+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails Translation <tails-l10n@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.10\n"
-"Language: de\n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/doc/sensitive_documents/graphics.fr.po b/wiki/src/doc/sensitive_documents/graphics.fr.po
index 75d5525..0434bbc 100644
--- a/wiki/src/doc/sensitive_documents/graphics.fr.po
+++ b/wiki/src/doc/sensitive_documents/graphics.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-10-08 14:34-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,6 @@ msgstr "[[!inline pages=\"doc/sensitive_documents/persistence.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"doc/sensitive_documents/persistence\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/sensitive_documents/metadata\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/sensitive_documents/metadata.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/sensitive_documents/metadata.fr.po b/wiki/src/doc/sensitive_documents/metadata.fr.po
index 6639651..ca01905 100644
--- a/wiki/src/doc/sensitive_documents/metadata.fr.po
+++ b/wiki/src/doc/sensitive_documents/metadata.fr.po
@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2015-05-31 15:59-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"
diff --git a/wiki/src/doc/sensitive_documents/office_suite.fr.po b/wiki/src/doc/sensitive_documents/office_suite.fr.po
index 036fbf8..861af5f 100644
--- a/wiki/src/doc/sensitive_documents/office_suite.fr.po
+++ b/wiki/src/doc/sensitive_documents/office_suite.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2014-07-17 17:07+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,7 +88,6 @@ msgstr "[[!inline pages=\"doc/sensitive_documents/persistence.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"doc/sensitive_documents/persistence\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/sensitive_documents/metadata\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/sensitive_documents/metadata.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/doc/sensitive_documents/sound_and_video.fr.po b/wiki/src/doc/sensitive_documents/sound_and_video.fr.po
index 459187c..ebf4406 100644
--- a/wiki/src/doc/sensitive_documents/sound_and_video.fr.po
+++ b/wiki/src/doc/sensitive_documents/sound_and_video.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-17 11:53+0100\n"
+"POT-Creation-Date: 2015-07-07 16:34+0300\n"
"PO-Revision-Date: 2012-09-09 10:13-0000\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,6 +96,5 @@ msgstr "[[!inline pages=\"doc/sensitive_documents/persistence.fr\" raw=\"yes\"]]
#. type: Plain text
#, no-wrap
-#| msgid "[[!inline pages=\"doc/sensitive_documents/persistence\" raw=\"yes\"]]\n"
msgid "[[!inline pages=\"doc/sensitive_documents/metadata\" raw=\"yes\"]]\n"
msgstr "[[!inline pages=\"doc/sensitive_documents/metadata.fr\" raw=\"yes\"]]\n"
diff --git a/wiki/src/download.html b/wiki/src/download.html
index 8aae122..84cca7a 100644
--- a/wiki/src/download.html
+++ b/wiki/src/download.html
@@ -252,3 +252,4 @@ share it without restriction.</strong>
</div>
</div> <!-- #download -->
+
diff --git a/wiki/src/inc/stable_i386_iso_size.html b/wiki/src/inc/stable_i386_iso_size.html
index efbdd52..96e910c 100644
--- a/wiki/src/inc/stable_i386_iso_size.html
+++ b/wiki/src/inc/stable_i386_iso_size.html
@@ -1 +1 @@
-971 MB \ No newline at end of file
+(971 MB/926 MiB)
diff --git a/wiki/src/local.css b/wiki/src/local.css
index f22c21c..45560c4 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -702,7 +702,7 @@ p.center {
border-radius: 0.5em;
text-decoration: none;
margin-bottom: 1em;
- padding: 0.5em 64px 0.5em 18px;
+ padding: 0.5em 63px 0.5em 18px;
color: white;
}
@@ -710,18 +710,9 @@ p.center {
background: #0a0 url('lib/download-arrow.png') no-repeat scroll right center;
}
-#pagebody span.download-file-size:before {
- content: '(';
- margin-left: 0.7em;
- margin-right: -0.3em;
-}
-
-#pagebody span.download-file-size:after {
- content: ')';
-}
-
#pagebody span.download-file-size {
font-size: 0.706em; /* 12px */
+ margin-left: 1em;
}
#pagebody a.download-signature {
diff --git a/wiki/src/news.de.po b/wiki/src/news.de.po
index 789e9c4..33057d9 100644
--- a/wiki/src/news.de.po
+++ b/wiki/src/news.de.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-20 11:08+0300\n"
-"PO-Revision-Date: 2015-01-03 01:14-0000\n"
+"POT-Creation-Date: 2015-07-07 16:18+0200\n"
+"PO-Revision-Date: 2015-07-07 16:18+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -70,43 +70,15 @@ msgstr ""
"- Folgen Sie uns auf Twitter [@Tails_live](https://twitter.com/tails_live)."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
+#, no-wrap
msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
-msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
+msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-#| " show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-" show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr ""
-"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-" show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
-
-#~ msgid ""
-#~ "<span>Tor check</span>\n"
-#~ "</a>\n"
-#~ "</div>\n"
-#~ msgstr ""
-#~ "<span>Tor check</span>\n"
-#~ "</a>\n"
-#~ "</div>\n"
-
-#~ msgid "[[!inline pages=\"news/who_are_you_helping/include\" raw=\"yes\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"news/who_are_you_helping/include.de\" raw=\"yes\"]]\n"
-
-#~ msgid ""
-#~ "This is where announcements of new releases, features, and other news are "
-#~ "posted. Users of The Amnesic Incognito Live System are recommended to "
-#~ "subscribe to this page's RSS feed or to the [amnesia-news mailing-list]"
-#~ "(https://boum.org/mailman/listinfo/amnesia-news)."
-#~ msgstr ""
-#~ "Hier werden neue Versionen, Features und andere Neuigkeiten angekündigt. "
-#~ "Amnesia-Nutzer sollten den RSS-Feed dieser Seite abonnieren oder der "
-#~ "[amnesia-news Mailing-Liste](https://boum.org/mailman/listinfo/amnesia-"
-#~ "news) folgen."
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
+"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
diff --git a/wiki/src/news.fr.po b/wiki/src/news.fr.po
index af12cfb..43bb2b3 100644
--- a/wiki/src/news.fr.po
+++ b/wiki/src/news.fr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-20 11:08+0300\n"
-"PO-Revision-Date: 2014-11-28 14:29+0100\n"
+"POT-Creation-Date: 2015-07-07 16:18+0200\n"
+"PO-Revision-Date: 2015-07-07 16:18+0200\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -70,42 +70,15 @@ msgstr ""
"- Suivez-nous sur Twitter [@Tails_live](https://twitter.com/tails_live)."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
+#, no-wrap
msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
-msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
+msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-#| " show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-" show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr ""
-"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-" show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
-
-#~ msgid ""
-#~ "<span>Tor check</span>\n"
-#~ "</a>\n"
-#~ "</div>\n"
-#~ msgstr ""
-#~ "<span>Tor check</span>\n"
-#~ "</a>\n"
-#~ "</div>\n"
-
-#~ msgid "[[!inline pages=\"news/who_are_you_helping/include\" raw=\"yes\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"news/who_are_you_helping/include.fr\" raw=\"yes\"]]\n"
-
-#~ msgid ""
-#~ "To be informed of the latest versions of Tails and follow the life of the "
-#~ "project you can:"
-#~ msgstr ""
-#~ "Pour être mis au courant de la dernière version de Tails et suivre la "
-#~ "déroulement du projet vous pouvez :"
-
-#~ msgid "subscribe to the RSS feed of this page"
-#~ msgstr "vous abonner au flux RSS de cette page"
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
+"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
diff --git a/wiki/src/news.mdwn b/wiki/src/news.mdwn
index 5a06073..57c1288 100644
--- a/wiki/src/news.mdwn
+++ b/wiki/src/news.mdwn
@@ -21,4 +21,4 @@ translation of the label below is long and gets split into two lines. -->
[[!inline pages="page(news/*) and !news/*/* and !news/discussion and currentlang()" show="10"]]
[[!inline pages="page(news/*) and !news/*/* and !news/discussion and currentlang() and tagged(announce)"
- show="10" feeds="yes" feedonly="yes" feedfile="emails"]]
+show="10" feeds="yes" feedonly="yes" feedfile="emails"]]
diff --git a/wiki/src/news.pt.po b/wiki/src/news.pt.po
index a629fa1..363b970 100644
--- a/wiki/src/news.pt.po
+++ b/wiki/src/news.pt.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-20 11:08+0300\n"
-"PO-Revision-Date: 2014-11-28 14:29+0100\n"
+"POT-Creation-Date: 2015-07-07 16:18+0200\n"
+"PO-Revision-Date: 2015-07-07 16:19+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -60,45 +60,15 @@ msgid "- Follow us on Twitter [@Tails_live](https://twitter.com/tails_live)."
msgstr ""
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
+#, no-wrap
msgid "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
-msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
+msgstr "[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang()\" show=\"10\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-#| " show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-" show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
+"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr ""
-"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
-" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
-
-#~ msgid "[[!inline pages=\"news/who_are_you_helping/include\" raw=\"yes\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"news/who_are_you_helping/include.pt\" raw=\"yes\"]]\n"
-
-#~ msgid ""
-#~ "This is where announcements of new releases, features, and other news are "
-#~ "posted. Users of The Amnesic Incognito Live System are recommended to "
-#~ "subscribe to this page's RSS feed or to the [amnesia-news mailing-list]"
-#~ "(https://boum.org/mailman/listinfo/amnesia-news)."
-#~ msgstr ""
-#~ "Esta é a seção na qual anúncios de novos lançamentos, funcionalidades e "
-#~ "outras notícias são publicadas. Recomendamos aos usuários/as do The "
-#~ "Amnesic Incognito Live System que se inscrevam na fonte RSS desta página "
-#~ "ou na [lista de notícias](https://boum.org/mailman/listinfo/amnesia-news)."
-
-#, fuzzy
-#~| msgid ""
-#~| "By the way, some other pages with RSS feeds include [[TODO]] and "
-#~| "[[bugs]]."
-#~ msgid ""
-#~ "By the way, some other pages with RSS feeds include [[!tails_todo \"\" "
-#~ "desc=\"TODO\"]] and [[!tails_bug \"\" desc=\"bugs\"]]."
-#~ msgstr ""
-#~ "Aliás, algumas outras páginas que possuem fonte RSS são [[TODO]] e "
-#~ "[[bugs]]."
+"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
+"show=\"10\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
diff --git a/wiki/src/press.de.po b/wiki/src/press.de.po
index 54c6f1d..52eed82 100644
--- a/wiki/src/press.de.po
+++ b/wiki/src/press.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-09 01:23+0300\n"
+"POT-Creation-Date: 2015-07-05 16:06+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"
@@ -351,6 +351,12 @@ msgid ""
"amnesia\".\n"
msgstr ""
+#. type: Bullet: '* '
+msgid ""
+"2014-12: [Guide d'autodéfense numérique](https://guide.boum.org/) has "
+"several sections based on Tails (in French)."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
diff --git a/wiki/src/press.fr.po b/wiki/src/press.fr.po
index 193fe90..cb7d737 100644
--- a/wiki/src/press.fr.po
+++ b/wiki/src/press.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-09 01:23+0300\n"
+"POT-Creation-Date: 2015-07-05 16:06+0300\n"
"PO-Revision-Date: 2015-01-19 16:52-0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -371,6 +371,12 @@ msgid ""
"amnesia\".\n"
msgstr ""
+#. type: Bullet: '* '
+msgid ""
+"2014-12: [Guide d'autodéfense numérique](https://guide.boum.org/) has "
+"several sections based on Tails (in French)."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
diff --git a/wiki/src/press.mdwn b/wiki/src/press.mdwn
index 897b676..3555204 100644
--- a/wiki/src/press.mdwn
+++ b/wiki/src/press.mdwn
@@ -168,6 +168,9 @@ Cybersecurity](https://tech.safehubcollective.org/cybersecurity/) by
safehubcollective.org qualifies Tails as "ultimate anonymity and
amnesia".
+* 2014-12: [Guide d'autodéfense numérique](https://guide.boum.org/) has
+ several sections based on Tails (in French).
+
* 2014-12: [Band I: Tails - The amnesic incognito live
system](https://capulcu.nadir.org/) by capulcu is a booklet explaining
Tails for activists (in German).
diff --git a/wiki/src/press.pt.po b/wiki/src/press.pt.po
index 54c6f1d..52eed82 100644
--- a/wiki/src/press.pt.po
+++ b/wiki/src/press.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-05-09 01:23+0300\n"
+"POT-Creation-Date: 2015-07-05 16:06+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"
@@ -351,6 +351,12 @@ msgid ""
"amnesia\".\n"
msgstr ""
+#. type: Bullet: '* '
+msgid ""
+"2014-12: [Guide d'autodéfense numérique](https://guide.boum.org/) has "
+"several sections based on Tails (in French)."
+msgstr ""
+
#. type: Plain text
#, no-wrap
msgid ""
diff --git a/wiki/src/press/media_appearances_2015.de.po b/wiki/src/press/media_appearances_2015.de.po
index 099c7f5..fa42fc8 100644
--- a/wiki/src/press/media_appearances_2015.de.po
+++ b/wiki/src/press/media_appearances_2015.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-21 08:36+0300\n"
+"POT-Creation-Date: 2015-07-09 22:50+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"
@@ -32,6 +32,13 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
+"2015-06-18: [Tor : Mails-toi de tes oignons](http://www.liberation.fr/"
+"economie/2015/06/18/tor-mails-toi-de-tes-oignons_1332660) by Amaelle Guiton "
+"in Libération (in French)."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
"2015-05-10: Joshua Datko blogs about [running Tails from the MinnowBoard Max]"
"(http://datko.net/2015/05/10/tails_mbm/), a cheap open hardware computer."
msgstr ""
diff --git a/wiki/src/press/media_appearances_2015.fr.po b/wiki/src/press/media_appearances_2015.fr.po
index 099c7f5..fa42fc8 100644
--- a/wiki/src/press/media_appearances_2015.fr.po
+++ b/wiki/src/press/media_appearances_2015.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-21 08:36+0300\n"
+"POT-Creation-Date: 2015-07-09 22:50+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"
@@ -32,6 +32,13 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
+"2015-06-18: [Tor : Mails-toi de tes oignons](http://www.liberation.fr/"
+"economie/2015/06/18/tor-mails-toi-de-tes-oignons_1332660) by Amaelle Guiton "
+"in Libération (in French)."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
"2015-05-10: Joshua Datko blogs about [running Tails from the MinnowBoard Max]"
"(http://datko.net/2015/05/10/tails_mbm/), a cheap open hardware computer."
msgstr ""
diff --git a/wiki/src/press/media_appearances_2015.mdwn b/wiki/src/press/media_appearances_2015.mdwn
index 4f9a57e..f81d49a 100644
--- a/wiki/src/press/media_appearances_2015.mdwn
+++ b/wiki/src/press/media_appearances_2015.mdwn
@@ -6,6 +6,9 @@
encryption tools such as Tor, Tails, and OpenPGP since the beginning of
the Snowden revelations.
+* 2015-06-18: [Tor : Mails-toi de tes oignons](http://www.liberation.fr/economie/2015/06/18/tor-mails-toi-de-tes-oignons_1332660)
+ by Amaelle Guiton in Libération (in French).
+
* 2015-05-10: Joshua Datko blogs about [running Tails from the MinnowBoard Max](http://datko.net/2015/05/10/tails_mbm/),
a cheap open hardware computer.
diff --git a/wiki/src/press/media_appearances_2015.pt.po b/wiki/src/press/media_appearances_2015.pt.po
index 099c7f5..fa42fc8 100644
--- a/wiki/src/press/media_appearances_2015.pt.po
+++ b/wiki/src/press/media_appearances_2015.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-21 08:36+0300\n"
+"POT-Creation-Date: 2015-07-09 22:50+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"
@@ -32,6 +32,13 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
+"2015-06-18: [Tor : Mails-toi de tes oignons](http://www.liberation.fr/"
+"economie/2015/06/18/tor-mails-toi-de-tes-oignons_1332660) by Amaelle Guiton "
+"in Libération (in French)."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
"2015-05-10: Joshua Datko blogs about [running Tails from the MinnowBoard Max]"
"(http://datko.net/2015/05/10/tails_mbm/), a cheap open hardware computer."
msgstr ""
diff --git a/wiki/src/security.de.po b/wiki/src/security.de.po
index c71b1c5..749467f 100644
--- a/wiki/src/security.de.po
+++ b/wiki/src/security.de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-05-08 02:10+0300\n"
-"PO-Revision-Date: 2015-03-31 18:36+0200\n"
+"PO-Revision-Date: 2015-07-07 16:17+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -27,15 +27,12 @@ msgid "[[!toc levels=3]]\n"
msgstr "[[!toc levels=3]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
-#| "actions=no archive=yes feedonly=yes show=10]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
"actions=no archive=yes feedonly=yes show=10]]\n"
msgstr ""
-"[[!inline pages=\"security/* and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
"actions=no archive=yes feedonly=yes show=10]]\n"
#. type: Plain text
@@ -85,16 +82,14 @@ msgid "Current holes"
msgstr "Derzeitige Lücken"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and tagged(security/probable) and currentlang()\"\n"
-#| "actions=no archive=yes feeds=no show=0]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and ! tagged(security/probable)\n"
"and ! tagged(security/fixed) and currentlang() and created_after(security/Numerous_security_holes_in_1.2)\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
msgstr ""
-"[[!inline pages=\"security/* and tagged(security/probable) and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and ! tagged(security/probable)\n"
+"and ! tagged(security/fixed) and currentlang() and created_after(security/Numerous_security_holes_in_1.2)\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
#. type: Title #
@@ -114,15 +109,12 @@ msgstr ""
"besteht."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and tagged(security/probable) and currentlang()\"\n"
-#| "actions=no archive=yes feeds=no show=0]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and tagged(security/probable) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
msgstr ""
-"[[!inline pages=\"security/* and tagged(security/probable) and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and tagged(security/probable) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
#. type: Title #
@@ -140,15 +132,12 @@ msgstr ""
"Bitte lesen Sie sorgfältig den Abschnitt \"Betroffene Versionen\" durch.\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and tagged(security/fixed) and currentlang()\"\n"
-#| "actions=no archive=yes feeds=no show=0]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and tagged(security/fixed) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
msgstr ""
-"[[!inline pages=\"security/* and tagged(security/fixed) and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and tagged(security/fixed) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
#. type: Title #
@@ -162,12 +151,3 @@ msgid ""
msgstr ""
"Uns bekannte Audits von Tails sind unter der Rubrik [[Audits|security/"
"audits]] zu finden."
-
-#~ msgid ""
-#~ "[[!inline pages=\"security/* and tagged(security/current) and currentlang"
-#~ "()\"\n"
-#~ "actions=no archive=yes feeds=no show=0]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"security/* and tagged(security/current) and currentlang"
-#~ "()\"\n"
-#~ "actions=no archive=yes feeds=no show=0]]\n"
diff --git a/wiki/src/security.fr.po b/wiki/src/security.fr.po
index 6c4161f..153dff2 100644
--- a/wiki/src/security.fr.po
+++ b/wiki/src/security.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-05-08 02:10+0300\n"
-"PO-Revision-Date: 2015-03-31 18:37+0200\n"
+"PO-Revision-Date: 2015-07-07 16:17+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@@ -27,15 +27,12 @@ msgid "[[!toc levels=3]]\n"
msgstr "[[!toc levels=3]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
-#| "actions=no archive=yes feedonly=yes show=10]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
"actions=no archive=yes feedonly=yes show=10]]\n"
msgstr ""
-"[[!inline pages=\"security/* and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and !security/audits and !security/audits.* and !security/audits/* and currentlang()\"\n"
"actions=no archive=yes feedonly=yes show=10]]\n"
#. type: Plain text
@@ -85,16 +82,14 @@ msgid "Current holes"
msgstr "Problèmes actuels"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and tagged(security/probable) and currentlang()\"\n"
-#| "actions=no archive=yes feeds=no show=0]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and ! tagged(security/probable)\n"
"and ! tagged(security/fixed) and currentlang() and created_after(security/Numerous_security_holes_in_1.2)\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
msgstr ""
-"[[!inline pages=\"security* and tagged(security/probable) and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and ! tagged(security/probable)\n"
+"and ! tagged(security/fixed) and currentlang() and created_after(security/Numerous_security_holes_in_1.2)\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
#. type: Title #
@@ -113,15 +108,12 @@ msgstr ""
"devraient être considérées comme − au moins − possibles."
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and tagged(security/probable) and currentlang()\"\n"
-#| "actions=no archive=yes feeds=no show=0]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and tagged(security/probable) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
msgstr ""
-"[[!inline pages=\"security* and tagged(security/probable) and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and tagged(security/probable) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
#. type: Title #
@@ -140,15 +132,12 @@ msgstr ""
"Lisez attentivement les paragraphes \"Versions affectées\".\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "[[!inline pages=\"security/* and tagged(security/fixed) and currentlang()\"\n"
-#| "actions=no archive=yes feeds=no show=0]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"page(security/*) and tagged(security/fixed) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
msgstr ""
-"[[!inline pages=\"security* and tagged(security/fixed) and currentlang()\"\n"
+"[[!inline pages=\"page(security/*) and tagged(security/fixed) and currentlang()\"\n"
"actions=no archive=yes feeds=no show=0]]\n"
#. type: Title #
diff --git a/wiki/src/support/faq.de.po b/wiki/src/support/faq.de.po
index 42334d5..5d9dacc 100644
--- a/wiki/src/support/faq.de.po
+++ b/wiki/src/support/faq.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-03 22:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:21+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"
@@ -380,7 +380,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"No. Tails provides upgrades every 6 weeks, that are thoroughly tested\n"
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
"to make sure that no security feature or configuration gets broken.\n"
"If you upgrade the system yourself using `apt-get` or <span class=\"application\">Synaptic</span>,\n"
"you might break things. Upgrading when you get a notification from\n"
@@ -547,6 +547,25 @@ msgstr ""
#. type: Plain text
#, no-wrap
+msgid "<a id=\"add-ons update\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Should I manually update add-ons included in <span class=\"application\">Tor Browser</span>?\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
+"to make sure that no security feature or configuration gets broken.\n"
+"Updating add-ons in <span class=\"application\">Tor Browser</span> might\n"
+"break the security built in Tails.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
msgid "<a id=\"flash\"></a>\n"
msgstr ""
diff --git a/wiki/src/support/faq.fr.po b/wiki/src/support/faq.fr.po
index d2d3553..18360fe 100644
--- a/wiki/src/support/faq.fr.po
+++ b/wiki/src/support/faq.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-03 22:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:21+0300\n"
"PO-Revision-Date: 2015-06-03 22:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -455,7 +455,7 @@ msgstr "Est-ce que Java est installé dans le <span class=\"application\">Tor Br
#. type: Plain text
#, no-wrap
msgid ""
-"No. Tails provides upgrades every 6 weeks, that are thoroughly tested\n"
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
"to make sure that no security feature or configuration gets broken.\n"
"If you upgrade the system yourself using `apt-get` or <span class=\"application\">Synaptic</span>,\n"
"you might break things. Upgrading when you get a notification from\n"
@@ -667,6 +667,27 @@ msgid ""
msgstr ""
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"add-ons\"></a>\n"
+msgid "<a id=\"add-ons update\"></a>\n"
+msgstr "<a id=\"add-ons\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Can I install other add-ons in <span class=\"application\">Tor Browser</span>?\n"
+msgid "Should I manually update add-ons included in <span class=\"application\">Tor Browser</span>?\n"
+msgstr "Puis-je installer d'autres extensions dans le <span class=\"application\">navigateur Tor</span> ?\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
+"to make sure that no security feature or configuration gets broken.\n"
+"Updating add-ons in <span class=\"application\">Tor Browser</span> might\n"
+"break the security built in Tails.\n"
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid "<a id=\"flash\"></a>\n"
msgstr "<a id=\"flash\"></a>\n"
diff --git a/wiki/src/support/faq.mdwn b/wiki/src/support/faq.mdwn
index b49aa3c..b5bd023 100644
--- a/wiki/src/support/faq.mdwn
+++ b/wiki/src/support/faq.mdwn
@@ -177,7 +177,7 @@ that does *not* behave like Tails should. Follow the
Should I update Tails using `apt-get` or <span class="application">Synaptic</span>?
-----------------------------------------------------------------------------------
-No. Tails provides upgrades every 6 weeks, that are thoroughly tested
+No. Tails provides upgrades every six weeks, that are thoroughly tested
to make sure that no security feature or configuration gets broken.
If you upgrade the system yourself using `apt-get` or <span class="application">Synaptic</span>,
you might break things. Upgrading when you get a notification from
@@ -266,6 +266,16 @@ XXX: Push that information to the browser documentation?
XXX: Check https://www.torproject.org/torbutton/torbutton-faq.html.en#recommendedextensions
-->
+<a id="add-ons update"></a>
+
+Should I manually update add-ons included in <span class="application">Tor Browser</span>?
+------------------------------------------------------------------------------------------
+
+No. Tails provides upgrades every six weeks, that are thoroughly tested
+to make sure that no security feature or configuration gets broken.
+Updating add-ons in <span class="application">Tor Browser</span> might
+break the security built in Tails.
+
<a id="flash"></a>
Can I view websites using Adobe Flash with Tails?
diff --git a/wiki/src/support/faq.pt.po b/wiki/src/support/faq.pt.po
index 0d9ae9d..d5830f9 100644
--- a/wiki/src/support/faq.pt.po
+++ b/wiki/src/support/faq.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-06-03 22:42+0300\n"
+"POT-Creation-Date: 2015-07-07 16:21+0300\n"
"PO-Revision-Date: 2015-06-03 22:55+0200\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -455,7 +455,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-"No. Tails provides upgrades every 6 weeks, that are thoroughly tested\n"
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
"to make sure that no security feature or configuration gets broken.\n"
"If you upgrade the system yourself using `apt-get` or <span class=\"application\">Synaptic</span>,\n"
"you might break things. Upgrading when you get a notification from\n"
@@ -679,6 +679,27 @@ msgstr ""
"-->\n"
#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"add-ons\"></a>\n"
+msgid "<a id=\"add-ons update\"></a>\n"
+msgstr "<a id=\"add-ons\"></a>\n"
+
+#. type: Title -
+#, fuzzy, no-wrap
+#| msgid "Can I install other add-ons in the browser?\n"
+msgid "Should I manually update add-ons included in <span class=\"application\">Tor Browser</span>?\n"
+msgstr "Posso instalar outras extensões no navegador?\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"No. Tails provides upgrades every six weeks, that are thoroughly tested\n"
+"to make sure that no security feature or configuration gets broken.\n"
+"Updating add-ons in <span class=\"application\">Tor Browser</span> might\n"
+"break the security built in Tails.\n"
+msgstr ""
+
+#. type: Plain text
#, no-wrap
msgid "<a id=\"flash\"></a>\n"
msgstr "<a id=\"flash\"></a>\n"