merge master

b949fd5f · Tails developers · b320629d · e89ef0df · b949fd5f · b949fd5f
Commit b949fd5f authored May 23, 2014 by Tails developers
--- a/wiki/src/about.de.po
+++ b/wiki/src/about.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-08 12:49+0100\n"
+"POT-Creation-Date: 2014-05-11 17:38+0200\n"
 "PO-Revision-Date: 2014-01-06 23:22+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,13 +56,13 @@ msgstr ""
 msgid ""
 "It is a complete operating system designed to be used from a DVD, USB stick, "
 "or SD card independently of the computer's original operating system. It is "
-"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|http://"
+"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|https://"
 "www.debian.org/]]."
 msgstr ""
 "Tails ist ein vollständiges Betriebssystem, das direkt von einer DVD, einem "
 "USB-Stick oder einer SD-Karte aus genutzt wird, unabhängig von dem auf dem "
 "Computer installierten Betriebssystem. Tails ist [[Freie Software|doc/about/"
-"license]] und basiert auf [[Debian GNU/Linux|http://www.debian.org/]]."
+"license]] und basiert auf [[Debian GNU/Linux|https://www.debian.org/]]."

 #. type: Plain text
 msgid ""
@@ -402,11 +402,11 @@ msgstr "Danksagungen\n"

 #. type: Bullet: '  - '
 msgid ""
-"Tails could not exist without [[Debian|http://www.debian.org/]], [[Debian "
+"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
 "Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
 "our [[contribute/relationship with upstream]] document for details."
 msgstr ""
-"Tails wäre ohne [[Debian|http://www.debian.org/]], [[Debian Live|http://live."
+"Tails wäre ohne [[Debian|https://www.debian.org/]], [[Debian Live|http://live."
 "debian.net]], und [[Tor|https://www.torproject.org/]] nicht möglich; siehe "
 "unsere [[Beziehungen zum Upstream|contribute/relationship_with_upstream]] "
 "für Details."

--- 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: 2014-03-08 12:49+0100\n"
+"POT-Creation-Date: 2014-05-11 17:38+0200\n"
 "PO-Revision-Date: 2013-10-13 17:08-0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -56,13 +56,13 @@ msgstr ""
 msgid ""
 "It is a complete operating system designed to be used from a DVD, USB stick, "
 "or SD card independently of the computer's original operating system. It is "
-"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|http://"
+"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|https://"
 "www.debian.org/]]."
 msgstr ""
 "Tails est un système d'exploitation complet destiné à être utilisé depuis un "
 "DVD, une clef USB ou une carte SD indépendamment du système installé sur "
 "l'ordinateur. C'est un [[logiciel libre|doc/about/license]] basé sur "
-"[[Debian GNU/Linux|http://www.debian.org/]]."
+"[[Debian GNU/Linux|https://www.debian.org/]]."

 #. type: Plain text
 msgid ""
@@ -395,11 +395,11 @@ msgstr "Remerciements\n"

 #. type: Bullet: '  - '
 msgid ""
-"Tails could not exist without [[Debian|http://www.debian.org/]], [[Debian "
+"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
 "Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
 "our [[contribute/relationship with upstream]] document for details."
 msgstr ""
-"Tails ne pourrait exister sans [[Debian|http://www.debian.org/]], [[Debian "
+"Tails ne pourrait exister sans [[Debian|https://www.debian.org/]], [[Debian "
 "Live|http://live.debian.net]], et [[Tor|https://www.torproject.org/]]; pour "
 "en savoir plus, consultez [[cette page|contribute/relationship with "
 "upstream]]."

--- a/wiki/src/about.mdwn
+++ b/wiki/src/about.mdwn
@@ -12,7 +12,7 @@ computer but leaving no trace unless you ask it to explicitly.

 It is a complete operating system designed to be used from a DVD, USB stick, or SD card
 independently of the computer's original operating system. It is [[Free
-Software|doc/about/license]] and based on [[Debian GNU/Linux|http://www.debian.org/]].
+Software|doc/about/license]] and based on [[Debian GNU/Linux|https://www.debian.org/]].

 Tails comes with several built-in applications pre-configured with security in
 mind: web browser, instant messaging client, email client, office suite, image
@@ -136,7 +136,7 @@ See the [[Press and media information|press]].
 Acknowledgements
 ================

-  - Tails could not exist without [[Debian|http://www.debian.org/]], [[Debian Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see our [[contribute/relationship with upstream]] document for details.
+  - Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see our [[contribute/relationship with upstream]] document for details.
  - Tails was inspired by the [[Incognito LiveCD|http://web.archive.org/web/20090220133020/http://anonymityanywhere.com/]]. The Incognito author declared it to be dead on March 23rd, 2010, and wrote that Tails "should be considered as its spiritual successor".
  - The [[Privatix Live-System|http://mandalka.name/privatix/]] an early source of inspiration, too.
  - Some ideas (in particular [[tordate|contribute/design/Time_syncing]] and

--- a/wiki/src/about.pt.po
+++ b/wiki/src/about.pt.po
--- a/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+++ b/wiki/src/blueprint/HTTP_mirror_pool.mdwn
+**Ticket:**: [[!tails_ticket 7161]]
+
+The idea I had was to let the server(s) send a reduced list of hosts. Not
+only it would allow to work-around Tor DNS limitations, but also to have
+some weighted round robin, in order to prioritize some high bandwidth
+mirrors, if we choose to.
+
+If I had to mention the ideal design goals for such changes, I would say
+that the more straightforward would be the better for implementation and
+also for maintainability.
+
+[[!toc levels=2]]
+
+# Using DNS
+
+Using DNS seems to be an easy way to do some round robin in low level. It
+allows some kind of transparency to the upper layers protocols and
+distribute the load and to avoid having a single server that can became a
+SPOF.
+
+The following ways are available to implement it:
+
+* CNAME Hacks
+* NS Hacks
+* Modified DNS servers
+
+## CNAME Hacks
+
+As mention by ToBeFree something that can be done is to have different
+pools of servers like:
+
+	a.dl.amnesia.boum.org A $MIRROR1
+	a.dl.amnesia.boum.org A $MIRROR2
+	a.dl.amnesia.boum.org A $MIRROR3
+	a.dl.amnesia.boum.org A $MIRROR4
+	a.dl.amnesia.boum.org A $MIRROR5
+
+	b.dl.amnesia.boum.org A $MIRROR6
+	b.dl.amnesia.boum.org A $MIRROR7
+
+	dl.amnedia.boum.org CNAME a.dl.amnesia.boum.org
+	dl.amnedia.boum.org CNAME b.dl.amnesia.boum.org
+
+Interestingly the requests would be equally distributed betwen a.dl and
+b.dl, thus if their is more mirrors in one name than one other some
+servers would be somehow prioritized. For example: here "a" mirrors will
+share 50% of requests, giving 10% for every host where "b" mirrors will
+share the other 50% of requests betwen two host giving them 25% of
+requests each.
+
+However this kind of CNAME hack is not supported by current DNS
+Servers. Bind 8 used to support it with a [configuration
+option](http://docstore.mik.ua/orelly/networking_2ndEd/dns/ch10_07.htm)
+that has not been ported to bind 9. Neither NSD nor PowerDNS seem to
+support it, and their is no actual data about how resolvers would
+handle this case, so I don't think it is the best option.
+
+## NS Hacks
+
+Following the same idea the dl amnesia.boum.org could be delegated to a
+few different DNS servers, and those servers may have different versions
+of the zone. For example:
+
+	dl.amnesia.boum.org NS $DNS1
+	dl.amnesia.boum.org NS $DNS2
+	
+DNS1 would have a zone similar to a.dl.amnesia.boum.org:
+
+	dl.amnesia.boum.org A $MIRROR1
+	dl.amnesia.boum.org A $MIRROR2
+	dl.amnesia.boum.org A $MIRROR3
+	dl.amnesia.boum.org A $MIRROR4
+	dl.amnesia.boum.org A $MIRROR5
+	
+And DNS2 would have a zone similar to b.dl.amnesia.boum.org:
+
+	dl.amnesia.boum.org A $MIRROR6
+	dl.amnesia.boum.org A $MIRROR7
+
+In theory it should work (and give almost the same load distribution as
+CNAME hacks, almost as the NS servers will not receive 50% of requests
+because of [[!rfc 5452]]). However, I am not sure that playing with DNS
+inconsistency will be a so good idea, for example for maintainability :)
+
+## Using modified DNS servers
+
+Interestingly Tails is not the first project to be looking how to use DNS
+for load distribution. People already wrote some DNS software designed to
+handle those usecases and return the visitor a reduced list of servers
+according to some rules like weights or geolocalisation. They work by
+delegating a subzone (like dl.amnesia.boum.org) to those servers and with
+zone files containing additionals fields. There is two main softwares for
+those usecases:
+
+* <http://gdnsd.org/> which is available on debian and used for
+  example for wikipedia.
+
+* <https://github.com/abh/geodns> that requires manual installation
+  and is used for example by pool.ntp.org.
+
+Deploying such software would solve the problem in a more elegant way than
+CNAME or NS hacks. It would require a bit of system administration that
+maybe can be done using some puppet templates in a few Virtal Machines.
+
+# Using HTTP(s)
+
+DNS is not the only way to do some load balancing. It is mostly used for
+low level protocols that don't allow redirects (for example: NTP). As
+content download is already done using HTTP(s). HTTP(s) can be leveraged
+to do this kind of load balancing. It is what is done by sourceforge.net
+as pointed by ToBeFree and by many Linux distributions.
+
+For example using a PHP script (or more complete options such as
+mirrorbrain, thanks Sagi!) that would redirect requests to
+`dl.amnesia.boum.org/$file to $mirror.dl.amnesia.boum.org/$file`
+randomly or according to some additional rules (weights,
+geolocalisation, SSL availability ...).
+
+There is a few drawbacks on this approach:
+
+* It would increase a bit the load on boum.org's server.
+* It would increase the dependency on this server, meaning that it is
+  unavailable (down, blocked...), downloads will be blocked (but in this
+  case the site will be too).
+* It would require to develop the script or to install one such as
+  mirrorbrain.
+
+On the other side it has a few advantage:
+
+* It will only require a few ~20 lines of PHP script when DNS based
+  solutions require to install and maintain additional software and servers.
+* It can allow the script to be personnalised to add some additional rules
+  if necessary.
+* As boum.org server will see every requests, it would allow to do some
+  stats.
+* It can allow to use $mirror.dl.amnesia.boum.org URLs, allowing to deploy
+  SSL certificates easier that if all mirrors use dl.amnesia.boum.org.
+* As ToBeFree mentionned (thanks!) it is also possible to use some client
+  side scripts to select the mirror. I would not recommend to rely only on
+  this option as it would not work for browsers without scripts, but it can
+  be done as a complementary approach, it order to reduce the load and
+  dependency to dl.amnesia.boum.org's server.
+
+Thus, if I may, I would like to recommend considering the HTTP(s) option,
+even if it means that I have to write the PHP script by myself or to create
+an easy task entry on the ticket tracker and follow it :)
--- a/wiki/src/blueprint/UEFI/syslinux.mdwn
+++ b/wiki/src/blueprint/UEFI/syslinux.mdwn
@@ -16,10 +16,18 @@ Known issues
 * Apple MacBookPro5,5 does not boot with Tails in UEFI mode. We are told it
  is due to missing native USB drivers, and the Plop boot-manager can
  fix it, as it has this drivers.
-* Apple MacBook Air 3,2 A1369 EMC 2392, with rEFInd 0.7.8, USB
-  stick installed with Tails Installer: fails to boot.
+* Apple MacBook Air 3,2 A1369 EMC 2392
+  - with rEFInd 0.7.8, USB stick installed with Tails Installer: fails
+    to boot most of the times. Failure modes:
+    * blank gray screen (frozen)
+    * gray screen with strings of seemingly random characters (frozen)
+    * black rEFInd screen with an empty list of boot options (frozen)
+    * black rEFInd screen with a working prompt asking for a boot file
+  - bypassing rEFInd (alt key): system freezes
 * Fails to boot from DVD on early 2011 MacBook pro, while 0.23
  boots fine.
+* Apple MacBookAir5,1 fails to shutdown after booting from a UEFI
+  Tails USB stick. Works fine when booted from DVD.

 Miscellaneous test results
 ==========================
@@ -91,7 +99,9 @@ Miscellaneous test results
 * Boots fine on Hewlett-Packard Presario CQ57
 * Boots fine on Apple MacBook Air 3,2 A1369 EMC 2392, with rEFInd
  0.7.8 installed, when installed with isohybrid + dd.
-* Boots fine on ASUS ux31a in CSM mode, when installed with isohybrid + dd.
+* Boots fine on ASUS ux31a
+  - in CSM mode, when installed with isohybrid + dd
+  - in UEFI mode, when installed with Tails Installer
 * Boots fine on Lenovo Thinkpad T400.
 * Boots fine on Mac Mini 2.3 Ghz Intel Core i7 from DVD, and from USB
  stick created with Tails Installer.
@@ -99,3 +109,4 @@ Miscellaneous test results
  with Tails Installer on the same machine.
 * Boots fine from DVD on VirtualBox 4.3.10-dfsg-1~bpo70+1 (as of commit e0a3c64
  in `feature/uefi`).
+* Boots fine on Lenovo G700.
--- a/wiki/src/blueprint/replace_truecrypt.mdwn
+++ b/wiki/src/blueprint/replace_truecrypt.mdwn
@@ -16,6 +16,10 @@ replacement of TrueCrypt... once a proper GUI available.

 tc-play allows to create TrueCrypt volumes.

+version 2 added an ability to save and restore TrueCrypt volume headers to
+external header files.This feature can be used to change a TrueCrypt volume
+password.
+
 ## Cryptsetup

 [Cryptsetup 1.6 supports reading the TrueCrypt
@@ -39,3 +43,15 @@ cryptsetup 1.6.4 does not support creating TrueCrypt volumes.
 and tcplay, it make easy to manage Truecrypt
 volumes through a GUI, but it's not packaged in Debian yet
 ([[!debbug 703911 desc="RFP #703911"]]).
+
+  - It uses cryptsetup to unlock TrueCrypt volumes and LUKS volumes.
+  - It uses cryptsetup to backup and restore LUKS volume headers.
+  - It uses cryptsetup to add and remove keys in LUKS volumes.
+  - It uses tcplay to create TrueCrypt volumes.
+  - It uses tcplay to backup and restore TrueCrypt volume headers
+
+zuluCrypt now has a [hidden volume like functionality using
+cryptsetup](https://code.google.com/p/cryptsetup/issues/detail?id=7#c28).
+
+zuluCrypt can open [LUKS volumes with a detached
+header](https://code.google.com/p/cryptsetup/wiki/Cryptsetup140).
--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-04-14 16:28+0300\n"
+"POT-Creation-Date: 2014-05-13 14:35+0300\n"
 "PO-Revision-Date: 2014-05-05 10:26-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: Portuguese <LL@li.org>\n"
@@ -20,13 +20,19 @@ msgstr ""

 #. type: Plain text
 #, no-wrap
-#| msgid "[[!meta title=\"Contributing to Tails\"]]"
 msgid "[[!meta title=\"Contributing to Tails\"]]\n"
 msgstr "[[!meta title=\"Contribuindo com o Tails\"]]\n"

 #. type: Plain text
-msgid "There are many ways you can contribute to Tails. No effort is too small and whatever you bring to this community will be appreciated.  So read on to find out how you can make a difference in Tails."
-msgstr "Há muitas maneiras de contribuir com o Tails. Nenhum esforço é pequeno demais e qualquer coisa que você traga para esta comunidade será apreciada. Então, continue lendo para descobrir como você pode fazer a diferença no Tails."
+msgid ""
+"There are many ways you can contribute to Tails. No effort is too small and "
+"whatever you bring to this community will be appreciated.  So read on to "
+"find out how you can make a difference in Tails."
+msgstr ""
+"Há muitas maneiras de contribuir com o Tails. Nenhum esforço é pequeno "
+"demais e qualquer coisa que você traga para esta comunidade será apreciada. "
+"Então, continue lendo para descobrir como você pode fazer a diferença no "
+"Tails."

 #. type: Plain text
 #, no-wrap
@@ -318,13 +324,14 @@ msgid "<div class=\"note\">\n"
 msgstr "<div class=\"note\">\n"

 #. type: Plain text
-#| msgid ""
-#| "<strong>Note:</strong> other pages in this section are not translated "
-#| "into non-English languages, since they document no way to contribute to "
-#| "Tails that is doable without understanding at least a bit of English.  "
-#| "Sorry about that."
-msgid "This section is only in English, because there is currently no way to contribute to Tails if you do not understand English."
-msgstr "<strong>Nota:</strong> outras páginas nesta sessão não estão traduzidas para outros idiomas além do inglês, uma vez que elas não documentam formas de contribuir com o Tails nas quais não seja necessário um entendimento mínimo da língua inglesa. Desculpe-nos por isso."
+msgid ""
+"This section is only in English, because there is currently no way to "
+"contribute to Tails if you do not understand English."
+msgstr ""
+"<strong>Nota:</strong> outras páginas nesta sessão não estão traduzidas para "
+"outros idiomas além do inglês, uma vez que elas não documentam formas de "
+"contribuir com o Tails nas quais não seja necessário um entendimento mínimo "
+"da língua inglesa. Desculpe-nos por isso."

 #. type: Plain text
 #, no-wrap
@@ -342,7 +349,6 @@ msgid "Reference documents\n"
 msgstr "Documentos de referência\n"

 #. type: Bullet: '  - '
-#| msgid "Tails has a [[specification and design document|contribute/design]]."
 msgid "[[Design documents|contribute/design]]"
 msgstr "[[Documentos de projeto|contribute/design]]"

@@ -437,7 +443,6 @@ msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
 msgstr "[[Relacionamento com upstream|contribute/relationship_with_upstream]]"

 #. type: Bullet: '  - '
-#| msgid "[[Help other Tails users|contribute/how/help]]"
 msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
 msgstr "[[Melhore o Tails trabalhando no Debian|contribute/how/debian]]"

@@ -452,20 +457,29 @@ msgid "Collective process\n"
 msgstr "Processo coletivo\n"

 #. type: Bullet: '  - '
-msgid "[[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc."
-msgstr "[[Calendário|contribute/calendar]] de lançamentos, reuniões, sessões de trabalho, etc."
+msgid ""
+"[[Calendar|contribute/calendar]] of releases, meetings, working sessions, "
+"etc."
+msgstr ""
+"[[Calendário|contribute/calendar]] de lançamentos, reuniões, sessões de "
+"trabalho, etc."

 #. type: Bullet: '  - '
 msgid "[[Meetings|contribute/meetings]], and minutes from past meetings"
 msgstr "[[Reuniões|contribute/meetings]], e notas de reuniões passadas"

 #. type: Bullet: '  - '
-msgid "[[Marking a task as easy|contribute/working_together/criteria_for_easy_tasks]]"
-msgstr "[[Marcando uma tarefa como fácil|contribute/working_together/criteria_for_easy_tasks]]"
+msgid ""
+"[[Marking a task as easy|contribute/working_together/"
+"criteria_for_easy_tasks]]"
+msgstr ""
+"[[Marcando uma tarefa como fácil|contribute/working_together/"
+"criteria_for_easy_tasks]]"

 #. type: Bullet: '  - '
 msgid "[[Document progress|contribute/working_together/document_progress]]"
-msgstr "[[Documentação de progresso|contribute/working_together/document_progress]]"
+msgstr ""
+"[[Documentação de progresso|contribute/working_together/document_progress]]"

 #. type: Plain text
 #, no-wrap
@@ -487,13 +501,10 @@ msgstr "<a id=\"talk\"></a>\n"

 #. type: Title =
 #, no-wrap
-#| msgid "Talk with us"
 msgid "Talk with us\n"
 msgstr "Fale conosco\n"

 #. type: Plain text
 #, no-wrap
-#| msgid "[[!inline pages=\"contribute/talk\" raw=\"yes\"]]"
 msgid "  [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
 msgstr "  [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-
--- a/wiki/src/contribute/APT_repository.mdwn
+++ b/wiki/src/contribute/APT_repository.mdwn
@@ -26,6 +26,8 @@ We use one single APT repository hosting multiple *suites*:
  are not available elsewhere (anymore). This suite is used by the
  `squeeze-backports-mozilla` chroot in our [[contribute/Debian
  package builder]].
+* We also have a `builder-wheezy` suite, used to provide additional
+  packages needed on a Wheezy system to build Tails.

 The suite(s) to use as sources for APT, during the build and inside
 the resulting system, are determined at Tails build time

--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -2,6 +2,8 @@

 [[!toc levels=2]]

+<a id="vagrant"></a>
+
 Using Vagrant
 =============

@@ -165,26 +167,36 @@ boostrap stage if one is cached, and will use use an HTTP proxy
 external to the virtual machine, and SquashFS compression will be done
 using *gzip*.

+<a id="manual"></a>
+
 Building manually
 =================

 In order to build Tails manually, you need a running [Debian
-Squeeze](http://www.debian.org/releases/squeeze/) system
+Wheezy](https://www.debian.org/releases/wheezy/) system
 and some [backports](http://backports.debian.org/). Anything else
-(e.g. Wheezy) will fail.
+will fail.

 Dependencies
 ------------

 The following Debian packages need to be installed:

-* `live-build`
-* `syslinux` >= 4.01, so that the built ISO images are
-  converted to hybrid ones: they can be either a CD-ROM or a hard disk
-  (USB disk, etc.).
-* `eatmydata` (from `squeeze-backports`), `time` and `whois` (for
-  /usr/bin/mkpasswd) packages.
-* `ikiwiki` 3.20120725 or newer.
+* our `live-build` 2.x package, adapted for Wheezy. Its version is
+  something like *3.0.5+really+is+2.0.12-0.tails1*. One can install it
+  from:
+
+      deb http://deb.tails.boum.org/ builder-wheezy main
+
+  This APT repository's signing key can be found on the keyservers.
+  It is certified by the [[!tails_website tails-signing.key
+  desc="Tails signing key"]], and its fingerprint is:
+
+      221F 9A3C 6FA3 E09E 182E  060B C798 8EA7 A358 D82E
+
+* `syslinux`
+* `eatmydata`, `time` and `whois` (for `/usr/bin/mkpasswd`)
+* `ikiwiki` 3.20120725 or newer, available in wheezy-backports.
 * `apt-get install libyaml-perl libyaml-libyaml-perl po4a perlmagick
  libyaml-syck-perl` so that the wiki builds smoothly.
 * `dpkg-dev`

--- a/wiki/src/contribute/build/squid-deb-proxy/squid-deb-proxy.conf
+++ b/wiki/src/contribute/build/squid-deb-proxy/squid-deb-proxy.conf
@@ -86,7 +86,7 @@ refresh_pattern .               0       20%     4320
 # handle meta-release and changelogs.ubuntu.com special
 refresh_pattern changelogs.ubuntu.com/*  0  1% 1

-# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=499379
+# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=499379
 refresh_all_ims on

 # default acl

--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
 [[!meta title="Calendar"]]

-* 2014-05-21 - Usability testing of Tails 1.1 with [Silicon Sentier](http://siliconsentier.org)
+* 2014-05-22 - Usability testing of Tails 1.1 with [Silicon Sentier](http://siliconsentier.org)

-* 2014-05-28 - Usability testing of Tails 1.1 with [Silicon Sentier](http://siliconsentier.org)
+* 2014-05-28:
+  - Usability testing of Tails 1.1 with [Silicon Sentier](http://siliconsentier.org)
+  - Feature freeze for 1.1.
+  - Tag 1.1-rc1 in Git.
+  - Build and upload 1.1-rc1 ISO/IUKs.

-* 2014-06-10 - [Tails 1.1](https://labs.riseup.net/code/projects/tails/roadmap#Tails_1.1)
+* 2014-05-29 - Test 1.1-rc1.
+
+* 2014-05-30 - Officially release 1.1-rc1.
+
+* 2014-06-08:
+  - Firefox 24.6.0 ESR sources are available.
+  - Package and upload Firefox 24.6.0 ESR.
+  - Tag 1.1 in Git.
+  - Start building and uploading 1.1 ISO/IUKs...
+
+* 2014-06-09:
+  - Finish building  by 12:00 (CEST)
+  - Start testing Tails 1.1 at 12:00 (CEST)...
+
+* 2014-06-10:
+  - ... and finish it by 12:00 (CEST) on the 10th.
+  - Officially release [Tails 1.1](https://labs.riseup.net/code/projects/tails/roadmap#Tails_1.1)
+
+* 2014-06-11 - [Tails contributors meeting](https://mailman.boum.org/pipermail/tails-dev/2014-May/005818.html)

 * 2014-07-05--2014-07-06 - Tails hackfest at
  [IRILL](http://www.irill.org/) (Paris, France)

--- a/wiki/src/contribute/customize.mdwn
+++ b/wiki/src/contribute/customize.mdwn
@@ -33,7 +33,7 @@ The Amnesic Incognito Live System is based on Debian Live.
 Nearly everything can thus be customized. To learn how to do so, refer
 to the Debian Live [manual](http://live.debian.net/manual/oldstable/html/live-manual.en.html),
 [website](http://debian-live.alioth.debian.org/) and
-[wiki](http://wiki.debian.org/DebianLive/).
+[wiki](https://wiki.debian.org/DebianLive/).

 # $HOME


--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -711,7 +711,7 @@ extension).

 ### 3.2.1 Core software
 
- [Debian GNU/Linux](http://www.debian.org/): the base operating
+- [Debian GNU/Linux](https://www.debian.org/): the base operating
  system, provides hardware detection, infrastructure. Please note
  that the Debian distribution does not provide or endorse Tails.
 - [Tor](http://www.torproject.org/): anonymizing overlay network for
@@ -729,7 +729,7 @@ used in Debian yet. Thus having them included in Tails would require
 to recompile every package with the right compile-time options. This
 would badly impact the development and build efforts required to
 release Tails. As an alternative, efforts [have been
-started](http://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=hardening;users=debian-security@lists.debian.org)
+started](https://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=hardening;users=debian-security@lists.debian.org)
 to push usage of such hardening features in Debian.

 A lot of security features have been implemented upstream at the
@@ -1211,7 +1211,7 @@ security-related — bugs.
 ## 3.9 Hardware support

 Tails generally ships the latest Linux kernel from Debian unstable or [Debian
-Backports](http://backports.debian.org) as a compromise between
+Backports](http://backports.debian.org/) as a compromise between
 stability and recent hardware support. Recent Intel and AMD microcode
 are included as well.


--- a/wiki/src/contribute/design/vagrant.mdwn
+++ b/wiki/src/contribute/design/vagrant.mdwn
@@ -96,7 +96,7 @@ After issuing that command, Veewee will download the boot ISO image,
 drive the debian-installer using [preeseding] and run `postinstall.sh` that
 will take care of seting up the environment expected by Vagrant.

-[preseeding]: http://www.debian.org/releases/stable/i386/apbs02.html
+[preseeding]: https://www.debian.org/releases/stable/i386/apbs02.html

 In order to support local HTTP proxy, the `preseed.cfg` is generated from an
 ERB template during the Rake task `create_preseed_cfg`.

--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
@@ -273,6 +273,8 @@ batch of translations.
    - [[/doc/about]] section
    - [[/doc/first_steps]] section

+    See the exhaustive list of [[core pages|l10n_tricks/core_po_files.txt]].
+
 Do not hesitate to report the progress of your work on the [[mailing list for
 translators|translate#follow-up]].


--- a/wiki/src/contribute/l10n_tricks/core_po_files.txt
+++ b/wiki/src/contribute/l10n_tricks/core_po_files.txt
 ./about
 ./doc
 ./doc/about
-./doc/about/anonymity
 ./doc/about/features
-./doc/about/finances
 ./doc/about/fingerprint
 ./doc/about.index
 ./doc/about/license
 ./doc/about/openpgp_keys
 ./doc/about/requirements
+./doc/about/tor
 ./doc/about/trust
 ./doc/about/warning
 ./doc/first_steps
@@ -17,11 +16,13 @@
 ./doc/first_steps/bug_reporting/tails_does_not_start
 ./doc/first_steps.index
 ./doc/first_steps/introduction_to_gnome_and_the_tails_desktop
+./doc/first_steps/installation
 ./doc/first_steps/installation/manual
 ./doc/first_steps/installation/manual.intro
 ./doc/first_steps/installation/manual/linux
 ./doc/first_steps/installation/manual/mac
 ./doc/first_steps/installation/manual/windows
+./doc/first_steps/media
 ./doc/first_steps/persistence
 ./doc/first_steps/persistence.caution
 ./doc/first_steps/persistence/configure
@@ -33,8 +34,9 @@
 ./doc/first_steps/startup_options
 ./doc/first_steps/startup_options/administration_password
 ./doc/first_steps/startup_options/bridge_mode
+./doc/first_steps/startup_options/mac_spoofing
+./doc/first_steps/startup_options/network_configuration
 ./doc/first_steps/startup_options/windows_camouflage
-./doc/first_steps/installation
 ./doc/first_steps/reset
 ./doc/first_steps/reset.intro
 ./doc/first_steps/reset/linux

--- a/wiki/src/contribute/l10n_tricks/language_statistics.sh
+++ b/wiki/src/contribute/l10n_tricks/language_statistics.sh
@@ -4,22 +4,37 @@

 set -e

-LANGUAGES=${@:-de es fr pt}
+LANGUAGES=${@:-de fr pt}

 count_msgids () {
    cat | grep -E '^msgid\s+' | wc -l