Merge remote-tracking branch 'origin/master' into testing

Conflicts: po/fr.po wiki/src/contribute.fr.po wiki/src/doc/anonymous_internet/i2p.fr.po wiki/src/doc/first_steps/persistence/check_file_system.fr.po wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po wiki/src/support/faq.fr.po

Merge remote-tracking branch 'origin/master' into testing
Conflicts: po/fr.po wiki/src/contribute.fr.po wiki/src/doc/anonymous_internet/i2p.fr.po wiki/src/doc/first_steps/persistence/check_file_system.fr.po wiki/src/doc/get/verify_the_iso_image_using_gnome.fr.po wiki/src/support/faq.fr.po
a2da47f0 · Tails developers · 3c7a20d6 · b6ebb145 · a2da47f0 · a2da47f0
Commit a2da47f0 authored Oct 15, 2014 by Tails developers
--- a/ikiwiki-cgi.setup
+++ b/ikiwiki-cgi.setup
@@ -49,6 +49,7 @@ add_plugins:
  - typography
  - meta
  - img
+  - pagestats
  - recentchanges
  - search
  - toggle

--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -44,6 +44,7 @@ add_plugins:
  - typography
  - meta
  - img
+  - pagestats
  - toggle
  - trail
 # plugins to disable

--- a/po/fr.po
+++ b/po/fr.po
@@ -6,12 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-15 17:57+0200\n"
 "PO-Revision-Date: 2014-10-09 21:50-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"
@@ -176,8 +174,10 @@ msgstr[1] ""
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:569
 msgid "Do you trust this key enough to use it anyway?"
 msgid_plural "Do you trust these keys enough to use them anyway?"
-msgstr[0] "Faites-vous quand même assez confiance à cette clé pour l'utiliser"
-msgstr[1] "Faites-vous quand même assez confiance à ces clés pour les utiliser"
+msgstr[0] ""
+"Faites-vous quand même assez confiance à cette clé pour l'utiliser ?"
+msgstr[1] ""
+"Faites-vous quand même assez confiance à ces clés pour les utiliser ?"

 #: config/chroot_local-includes/usr/local/bin/gpgApplet:582
 msgid "No keys selected"
@@ -270,8 +270,8 @@ msgid ""
 "your network connection, try to restart Tails, or read the system log to "
 "understand better the problem."
 msgstr ""
-"La mise à jour a échoué. Cela peut être dû à un problème de réseau. Veuillez "
-"vérifier votre connexion au réseau, essayez de redémarrer Tails, ou "
+"La mise à jour a échoué. Cela peut être dû à un problème de réseau. "
+"Veuillez vérifier votre connexion au réseau, essayez de redémarrer Tails, ou "
 "consultez les journaux système pour obtenir davantage d'informations."

 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
@@ -308,8 +308,8 @@ msgstr ""
 "Il semble que votre accès au réseau est bloqué. Cela est peut-être lié à la "
 "fonctionnalité d'usurpation d'adresse MAC. Pour plus d'information, voir la "
 "<a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/"
-"startup_options/mac_spoofing.fr.html#blocked\\\">documentation d'usurpation "
-"d'adresse MAC</a>."
+"startup_options/mac_spoofing.fr.html#blocked\\\">documentation sur "
+"l'usurpation d'adresse MAC</a>."

 #: config/chroot_local-includes/usr/local/bin/tails-security-check:145
 msgid "This version of Tails has known security issues:"
@@ -358,7 +358,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62
 msgid "error:"
-msgstr "erreur:"
+msgstr "erreur :"

 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63
@@ -380,15 +380,15 @@ msgstr ""
 "<b>Pas assez de mémoire disponible pour vérifier la disponibilité de mises à "
 "jour.</b>\n"
 "\n"
-"Vérifiez que cet ordinateur a la configuration requise pour faire "
-"fonctionner Tails.\n"
+"Vérifiez que cet ordinateur satisfait les conditions requises pour utiliser "
+"Tails.\n"
 "Voir file:///usr/share/doc/tails/website/doc/about/requirements.fr.html\n"
 "\n"
 "Essayez de redémarrer Tails pour vérifier la disponibilité de mises à jour à "
 "nouveau.\n"
 "\n"
 "Ou faites les mises à jour manuelles.\n"
-"Voir https://tails.boum.org/doc/first_steps/upgrade#manual"
+"Voir https://tails.boum.org/doc/first_steps/upgrade/index.fr.html#manual"

 #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53
 msgid "Warning: virtual machine detected!"
@@ -459,7 +459,7 @@ msgstr "Ceci peut prendre du temps, merci d'être patient."

 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106
 msgid "Failed to setup chroot."
-msgstr "L'exécution de chroot a échoué"
+msgstr "L'exécution de chroot a échoué."

 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:180
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
@@ -583,7 +583,7 @@ msgstr "Navigateur I2P"

 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
 msgid "Learn more about Tails"
-msgstr "En savoir plus sur Tails"
+msgstr "En apprendre davantage sur Tails"

 #: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1
 msgid "Reboot"

--- a/wiki/src/blueprint/greeter_revamp_UI.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI.mdwn
@@ -55,7 +55,7 @@ On a media with a persistent volume:

 ### Saved localization

-On a media with saved language and a persistent volume:
+On a media with saved localization options, the first region is replaced by a summary of the current settings:

 [[!img greeter-1st-screen-langsaved.png size="" alt=""]]


--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.png
--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-langsaved.svg
--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.png
--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-1st-screen-persistence.svg
--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.png
--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-advanced-screen.svg
--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.png
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.png
--- a/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.svg
+++ b/wiki/src/blueprint/greeter_revamp_UI/greeter-guided-context.svg
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-01 10:40+0300\n"
+"POT-Creation-Date: 2014-10-13 10:23+0300\n"
 "PO-Revision-Date: 2014-04-18 23:25+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -416,10 +416,14 @@ msgid "[[Release schedule|contribute/release_schedule]]"
 msgstr "[[Veröffentlichungskalender|contribute/release_schedule]]"

 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  - [[Release process|contribute/release_process]]\n"
+#| "    - [[Manual test suite|contribute/release_process/test]]\n"
 msgid ""
 "  - [[Release process|contribute/release_process]]\n"
 "    - [[Manual test suite|contribute/release_process/test]]\n"
+"    - [[Automated test suite|contribute/release_process/test/automated_tests]]\n"
 msgstr ""
 "  - [[Veröffentlichungsprozess|contribute/release_process]]\n"
 "    - [[Manuelle Tests|contribute/release_process/test]]\n"

--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-05-01 10:40+0300\n"
-"PO-Revision-Date: 2014-05-31 00:08-0000\n"
+"POT-Creation-Date: 2014-10-13 10:23+0300\n"
+"PO-Revision-Date: 2014-03-26 10:50+0100\n"
 "Last-Translator: MR\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -421,6 +421,7 @@ msgstr ""
 msgid ""
 "  - [[Release process|contribute/release_process]]\n"
 "    - [[Manual test suite|contribute/release_process/test]]\n"
+"    - [[Automated test suite|contribute/release_process/test/automated_tests]]\n"
 msgstr ""

 #. type: Plain text

--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -148,6 +148,7 @@ Release cycle
  - [[Release schedule|contribute/release_schedule]]
  - [[Release process|contribute/release_process]]
    - [[Manual test suite|contribute/release_process/test]]
+    - [[Automated test suite|contribute/release_process/test/automated_tests]]

 <a id="upstream"></a>


--- 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-05-13 14:35+0300\n"
+"POT-Creation-Date: 2014-10-13 10:23+0300\n"
 "PO-Revision-Date: 2014-05-23 14:56-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: Portuguese <LL@li.org>\n"
@@ -24,8 +24,15 @@ 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
@@ -317,8 +324,14 @@ msgid "<div class=\"note\">\n"
 msgstr "<div class=\"note\">\n"

 #. type: Plain text
-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
@@ -407,10 +420,14 @@ msgid "[[Release schedule|contribute/release_schedule]]"
 msgstr "[[Agenda de lançamento|contribute/release_schedule]]"

 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  - [[Release process|contribute/release_process]]\n"
+#| "    - [[Manual test suite|contribute/release_process/test]]\n"
 msgid ""
 "  - [[Release process|contribute/release_process]]\n"
 "    - [[Manual test suite|contribute/release_process/test]]\n"
+"    - [[Automated test suite|contribute/release_process/test/automated_tests]]\n"
 msgstr ""
 "  - [[Processo de lançamento|contribute/release_process]]\n"
 "    - [[Conjunto de testes manuais|contribute/release_process/test]]\n"
@@ -444,20 +461,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
@@ -486,4 +512,3 @@ msgstr "Fale conosco\n"
 #, no-wrap
 msgid "  [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
 msgstr "  [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
 [[!meta title="Calendar"]]

-* 2014-10-03: [[Monthly meeting|contribute/meetings]]
-
-* 2014-10-07: Focused work on finishing integration of TBB 4.x
-  pre-release based on Firefox 31 ESR into Tails.
-
-* 2014-10-08:
-  - Tag 1.2-rc1 in Git
-  - Build and upload 1.2-rc1 ISO/IUKs
-
-* 2014-10-09: Test and release 1.2-rc1
-
 * 2014-10-15:
  - TBB 4.0 is hopefully officially released so we can integrate it
  - Tag 1.2 in Git

--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
@@ -13,305 +13,67 @@ Welcome aboard!</p>

 Most of Tails developers are not native English speakers so you're
 more than welcome to correct or improve our English.
-For this, you can either follow the [[Git workflow|translate#git]] or
+For this, you can either follow the [[Git workflow|translate/with_Git]] or
 [[propose|contribute/talk]] another way that suits you better to share
 your improvements with us.

 <a id="translate"></a>

-# Translate Tails
+# Translate Tails custom programs

 You can help correct, improve, or complete the translations of Tails
-programs and documentation into your native language:
+programs into your native language:

-* **For French**, the existing translators
-  team uses Git. So, read [[translating with Git|translate#git]].
+* **For French**, the translation team uses Git. Read its [[dedicated
+  documentation|translate/team/fr]] for translators.
 * **For other languages**, read [[translating with
-  Transifex|translate#transifex]].
-* However, this website is [[translated with Git|translate#git]]
-  in **all languages**.
+  Transifex|translate/with_Transifex]].
+  Tails programs can be translated into more than 140 languages this way.

-<a id="transifex"></a>
+# Translate this website

-## With Transifex
+You can also translate this website, which includes the Tails
+[[documentation|doc]]. This is done [[translate/with_Git]].

-Most of Tails can be translated directly online after logging in with
-[Transifex](http://docs.transifex.com/):
+The translations are peer-reviewed and thus, you need to get into contact with
+a language team if you want to participate.
+In general, you can contact the translation teams via the
+[[mailing list for translators|translate#follow-up]].

- [Tails
-Greeter](https://www.transifex.com/projects/p/torproject/resource/3-tails-tails-greeter-pot/)
- [Tails Persistence
-Setup](https://www.transifex.com/projects/p/torproject/resource/3-tails-tails-persistence-setup-pot/)
- [Tails Installer](https://www.transifex.com/projects/p/torproject/resource/3-tails-liveusb-creator-pot/)
- [Tails Upgrader](https://www.transifex.com/projects/p/torproject/resource/tails-tails-iukpot/)
- [Tails Perl library](https://www.transifex.com/projects/p/torproject/resource/tails-tails-perl5lib/)
- [WhisperBack](https://www.transifex.com/projects/p/torproject/resource/3-whisperback-whisperback-pot/)
- [A set of various translatable strings](https://www.transifex.com/projects/p/torproject/resource/tails-misc/)
+<a id="language-teams"></a>

-You are now doing translation work for Tails on Transifex. This is
-great, thanks!
+Currently, there are three active **language teams**:

-Beware, we don't host Transifex.com, they do have their own privacy policy.
+* [[French|translate/team/fr]]
+* [[German|translate/team/de]]
+* [[Portuguese|translate/team/pt]]

-Further:
+and three new language teams are being set up:

- It would be awesome if you did [[follow-up on
-  translation needs|translate#follow-up]].
- You might want to [[translate the Tails
-  website|translate#new-language]] too.
+* Italian
+* Spanish
+* Turkish

-<a id="git"></a>
-
-## Translation team using Git
-
-On the long run, translators team often decide to use [[Git]] to share and
-synchronize their work, and ask us to integrate it within the
-official repositories.
-
-### What can be translated
-
-Various bits of text can be translated:
-
-* **Custom programs** (Tails Greeter, Tails Persistence Setup, Tails
-  Installer, Tails Upgrader, Tails Perl library and WhisperBack): each
-  one has its own [[Git repository|contribute/git]], where PO files
-  live in the `po` directory. Some have a `README.translators` at the
-  root of their source tree: please read it.
-* **A set of various translatable strings** live in the `po`
-  directory, in the `devel`
-  branch of the [[main Tails Git repository|contribute/Git]].
-* **This website** must be translated in the `master` branch of the
-  [[main Tails Git repository|contribute/Git]]. Please note [[there
-  are requirements|translate#new-language]] to translate the website
-  into a new language.
-
-### gettext
-
-The translation system used to translate Tails is called <span
-class="application">[[!wikipedia gettext]]</span>. Every sentence that
-needs to be translated is written in a [PO
-file](https://www.gnu.org/software/gettext/manual/gettext.html#PO-Files).
-
-To edit these PO files, we recommend that you use <span
-class="application">[Poedit](http://www.poedit.net/screenshots.php)</span>, a
-cross-platform editor for PO
-files. <span class="application">Poedit</span> is included in Tails.
-
-Please ensure that you use at least version 1.5 of Poedit, as this version
-handles line breaks of our files correctly.
-
-When setting up Poedit, you might want to ensure to use "Tails translators"
-or "Tails developers" as translator name and "tails@boum.org" as translator
-contact email address.
-
-If you do not use Poedit, but for example Vim or Emacs with the po-plugin, please
-verify for each translation that the syntax of the files is not broken. In order to do
-do so, please refer to the [[localization tricks page|contribute/l10n_tricks]].
-
-If there is no existing PO file for your language, you can copy the
-corresponding `.pot` file into a new `.po` file.
-
-When working on the website translation, it is highly recommended that you
-[[build the wiki locally|contribute/build/website/]] in order to verify
-your modifications or to review the translations of somebody else.
-
-### Tools
-
-Tails contains all the tools you need to set up a working
-environment for translations. These tools are:
-
-* Git
-* Poedit
-* OpenSSH client
-* tools to [[build the wiki locally|contribute/build/website/]].
-
-### Workflow
-
-You can take advantage of Git to send us your work by asking us to
-pull from your Git branch. Here is the typical workflow used by Tails
-translators teams:
-
-1. Set up your personal [[Git repository|contribute/git]]: if you
-   already know where to host it in a public place, this is great;
-   else, [fork us on repo.or.cz](http://repo.or.cz/w/tails.git) or ask
-   the Tails system administrators (<tails-sysadmins@boum.org>) to host
-   your repository.
-
-   On your computer, set up the repository. This example clones
-   an empty repository into the "tails" folder:
-
-   `git clone http://repo.or.cz/r/tails/yourrepo.git tails`
-
-2. Then setup the remote Tails main repository:
-
-   `cd tails`
-
-   `git remote add tails https://git-tails.immerda.ch/tails`
-
-   Typing `git remote` should now show two entries:
-
-   `origin
-   tails`
-
-   "origin" is your own repository, "tails" contains the files of the
-   main repository once we fetch them. This operation requires some time
-   at setup, as it requires to pull the whole repository.
-
-   `git fetch tails master`
-
-3. Now to setup Git, type:
-
-   `git config user.name "Tails developers"
-   git config user.email "tails@boum.org"`
-
-   Verify this configuration by typing:
-
-   `git config --list`
-
-4. Create a branch for every translation you make, for example, if you want to
-   translate the "contribute" page, create a branch named "translation-contribute":
-
-   `git branch translation-contribute`
-
-   `git checkout translation-contribute`
-
-   Now typing `git branch` should show a star in front of the active branch.
-
-5. Translate whatever you can in your preferred PO file editor.
-
-6. Commit the changes you made to `.po` files:
-
-   `git add <files>`
-
-   `git commit <files>`
-
-7. Merge our main repository into yours.
-   Regularly, pull from the master branch of the main repository to update
-   your local files.
-
-   `git fetch tails master` only fetches new files,
-
-   `git pull tails master` fetches and merges the files.
-
-8. Push your changes to your online Git repository.
-
-   `git push origin <name of branch>`
-
-   `git push origin translation-contribute`
-
-9. Ask other members of your translation team to review your work by writing
-   an email to [[the mailing list for
-   translators|translate#follow-up]], containing in its subject
-   "(Review)" and the short code for the translated language, for example "[fr]".
-
-10. The reviewer, once happy with the result, should ask on the
-   [[mailing list for translators|translate#follow-up]] to pull from
-   the branch that was worked on, writing an email with "(pull)" and the language
-   short code in the subject. Ideally, such email would be OpenPGP-signed.
-
-You might want to consider using Git over Tor, for example, by using a Tails device when you translate.
-
-Read more about the Tails [[Git|contribute/git]] setup.
-
-### Let's get organized
-
-You are now doing translation work for Tails using Git. This is great,
-thanks! It would be awesome if you did [[follow-up on translation
-needs|translate#follow-up]].
-
-### Team duties
-
-Our custom programs can be translated [[using
-Transifex|translate#transifex]]. Work done there is not automatically
-synchronized with the translations your team does in Git.
-
-It is nice to minimize time wasted by unknown people who work, with
-Transifex, on the same thing as your translation team.
-
-So, a translation team using Git should regularly contact Transifex
-translators (listed in the `Last-translator` field of the PO files one
-can download from Transifex), either over email or using the Transifex
-interface, to:
-
-1. Thank them for translating Tails stuff.
-2. Make it clear their work is not imported (and is therefore, well,
-   useless).
-3. Invite them to join the team and share the team's
-   preferred workflow.
-4. Invite them to subscribe to [[the mailing list for
-   translators|translate#follow-up]].
-
-<a id="new-language"></a>
-
-# Translate this website into a new language
-
-There are already some active website translation teams,
-coordinating via the [[mailing list for translators|translate#follow-up]].
-
-So, you want the Tails website to be available in a new language.
-Please keep in mind that it represents quite a lot of work.
-
-Therefore, here are a few things that would be required in order to start
-translating the Tails website to a new language:
-
-1. A team of translators, not just one person, is necessary. That also
-   allows for peer reviews between the team, more flexibility for
-   example when an important deadline arrives.
-
-2. At least part of the team should subscribe to the [[mailing list
-   for translators|translate#follow-up]].
-
-3. Since the content of the website is sensitive in terms of privacy
-   protection, Tails developers need to establish contacts with
-   trusted people to review the work from time to time.
-
-4. For translations to be useful, they need to be maintained in the
-   long run. This takes a few hours a month.
-
-Once those conditions are fulfilled, the new team can start working on a first
-batch of translations.
-
-  - The Tails custom programs, as [[documented earlier|translate#translate]]
-
-  - Important parts of our website:
-
-    - [[/index]]
-    - [[/about]] page
-    - [[/getting_started]] page
-    - [[/support]] page
-    - [[/download]] page
-    - [[/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]].
+If your language is not listed here, read the documentation
+to [[add a new language|translate/team/new]].

 <a id="follow-up"></a>

-# Follow-up on translation needs
+# Mailing list for translators
+
+Translators coordinate on the tails-l10n mailing
+list (*l10n* stands for [[!wikipedia Software_localization desc="localization"]]).

-Translators coordinate on the tails-l10n mailing list (*l10n* stands
-for [[!wikipedia Software_localization desc="localization"]]).
-Important changes to translatable strings are announced there.
+This is where important changes to translatable strings are announced.
+So, please subscribe to the list if you want to become a regular
+translator:

-Please <a href='https://mailman.boum.org/listinfo/tails-l10n/'>subscribe</a> to
-the list if you want to become a regular translator.
+<form method="POST" action="https://mailman.boum.org/subscribe/tails-l10n">
+	<input class="text" name="email" value=""/>
+	<input class="button" type="submit" value="Subscribe"/>
+</form>

 Any message sent to this list is stored in a [public
 archive](https://mailman.boum.org/pipermail/tails-l10n/), so beware of