Merge remote-tracking branch 'origin/testing' into feature/tor-browser-4.0

f312b1f8 · Tails developers · eabc2900 · 1fc7b609 · f312b1f8 · f312b1f8
Commit f312b1f8 authored Oct 15, 2014 by Tails developers
--- 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
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
--- a/wiki/src/contribute/how/translate.mdwn
+++ b/wiki/src/contribute/how/translate.mdwn
--- a/wiki/src/contribute/how/translate/team/de.mdwn
+++ b/wiki/src/contribute/how/translate/team/de.mdwn
--- a/wiki/src/contribute/how/translate/team/fr.mdwn
+++ b/wiki/src/contribute/how/translate/team/fr.mdwn
--- a/wiki/src/contribute/how/translate/team/new.mdwn
+++ b/wiki/src/contribute/how/translate/team/new.mdwn
--- a/wiki/src/contribute/how/translate/team/pt.mdwn
+++ b/wiki/src/contribute/how/translate/team/pt.mdwn
--- a/wiki/src/contribute/how/translate/translation_progress.mdwn
+++ b/wiki/src/contribute/how/translate/translation_progress.mdwn
--- a/wiki/src/contribute/how/translate/with_Git.mdwn
+++ b/wiki/src/contribute/how/translate/with_Git.mdwn
--- a/wiki/src/contribute/how/translate/with_Transifex.mdwn
+++ b/wiki/src/contribute/how/translate/with_Transifex.mdwn
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
--- a/wiki/src/contribute/release_process/test.mdwn
+++ b/wiki/src/contribute/release_process/test.mdwn
--- a/wiki/src/contribute/release_process/test/automated_tests.mdwn
+++ b/wiki/src/contribute/release_process/test/automated_tests.mdwn
--- a/wiki/src/contribute/release_process/test/setup.mdwn
+++ b/wiki/src/contribute/release_process/test/setup.mdwn
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
--- a/wiki/src/doc/about/features.pt.po
+++ b/wiki/src/doc/about/features.pt.po
--- a/wiki/src/doc/about/fingerprint.de.po
+++ b/wiki/src/doc/about/fingerprint.de.po