summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-06-25 11:08:51 +0000
committerTails developers <amnesia@boum.org>2014-06-25 11:08:51 +0000
commit94dcca7d1aee5b8ee02a3c592f7eb64721259610 (patch)
treee81240b86212509807be128e14c290595ff8565e
parent6e762c233e4b38b68f11c47342337c7a01474286 (diff)
parenta3dfc8c41f18761fd9ed2ad1ed7b852cdc1c6511 (diff)
Merge remote-tracking branch 'origin/doc/wheezy' into testing
-rw-r--r--wiki/src/doc.mdwn4
-rw-r--r--wiki/src/doc/about/features.de.po4
-rw-r--r--wiki/src/doc/about/features.fr.po4
-rw-r--r--wiki/src/doc/about/features.mdwn4
-rw-r--r--wiki/src/doc/about/features.pt.po4
-rw-r--r--wiki/src/doc/encryption_and_privacy.de.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy.fr.po2
-rw-r--r--wiki/src/doc/encryption_and_privacy.mdwn2
-rw-r--r--wiki/src/doc/encryption_and_privacy.pt.po4
9 files changed, 15 insertions, 15 deletions
diff --git a/wiki/src/doc.mdwn b/wiki/src/doc.mdwn
index 50fe33c..38628a4 100644
--- a/wiki/src/doc.mdwn
+++ b/wiki/src/doc.mdwn
@@ -11,7 +11,7 @@ documentation|/contribute/how/documentation]].
[[!inline pages="doc/about.index" raw="yes"]]
-# Get Tails
+# Download and verify
[[!inline pages="doc/get.index" raw="yes"]]
@@ -23,7 +23,7 @@ documentation|/contribute/how/documentation]].
[[!inline pages="doc/anonymous_internet.index" raw="yes"]]
-# Encryption & privacy
+# Encryption and privacy
[[!inline pages="doc/encryption_and_privacy.index" raw="yes"]]
diff --git a/wiki/src/doc/about/features.de.po b/wiki/src/doc/about/features.de.po
index 457f8c4..ee6e875 100644
--- a/wiki/src/doc/about/features.de.po
+++ b/wiki/src/doc/about/features.de.po
@@ -187,8 +187,8 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "Encryption & Privacy\n"
-msgstr "Verschlüsselung & Privatsphäre\n"
+msgid "Encryption and privacy\n"
+msgstr "Verschlüsselung und Privatsphäre\n"
#. type: Bullet: '* '
msgid ""
diff --git a/wiki/src/doc/about/features.fr.po b/wiki/src/doc/about/features.fr.po
index 16a966f..7bd5a0c 100644
--- a/wiki/src/doc/about/features.fr.po
+++ b/wiki/src/doc/about/features.fr.po
@@ -158,8 +158,8 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "Encryption & Privacy\n"
-msgstr "Chiffrement et Vie Privée\n"
+msgid "Encryption and privacy\n"
+msgstr "Chiffrement et vie privée\n"
#. type: Bullet: '* '
msgid ""
diff --git a/wiki/src/doc/about/features.mdwn b/wiki/src/doc/about/features.mdwn
index d4de3f6..c61b2fc 100644
--- a/wiki/src/doc/about/features.mdwn
+++ b/wiki/src/doc/about/features.mdwn
@@ -54,8 +54,8 @@ Desktop Edition
* [Sound Juicer](http://burtonini.com/blog/computers/sound-juicer) to rip audio
CDs
-Encryption & Privacy
---------------------
+Encryption and privacy
+----------------------
* [LUKS](http://en.wikipedia.org/wiki/LUKS) and [[!wikipedia Palimpsest]] to
install and use encrypted storage devices, for example USB sticks
diff --git a/wiki/src/doc/about/features.pt.po b/wiki/src/doc/about/features.pt.po
index 4453499..fd3f5df 100644
--- a/wiki/src/doc/about/features.pt.po
+++ b/wiki/src/doc/about/features.pt.po
@@ -156,8 +156,8 @@ msgstr ""
#. type: Title -
#, no-wrap
-msgid "Encryption & Privacy\n"
-msgstr "Criptografia & Privacidade\n"
+msgid "Encryption and privacy\n"
+msgstr "Criptografia e privacidade\n"
#. type: Bullet: '* '
msgid ""
diff --git a/wiki/src/doc/encryption_and_privacy.de.po b/wiki/src/doc/encryption_and_privacy.de.po
index fa1b160..c75c484 100644
--- a/wiki/src/doc/encryption_and_privacy.de.po
+++ b/wiki/src/doc/encryption_and_privacy.de.po
@@ -17,7 +17,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Encryption & privacy\"]]\n"
+msgid "[[!meta title=\"Encryption and privacy\"]]\n"
msgstr ""
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy.fr.po b/wiki/src/doc/encryption_and_privacy.fr.po
index 14d88ac..b594173 100644
--- a/wiki/src/doc/encryption_and_privacy.fr.po
+++ b/wiki/src/doc/encryption_and_privacy.fr.po
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Encryption & privacy\"]]\n"
+msgid "[[!meta title=\"Encryption and privacy\"]]\n"
msgstr "[[!meta title=\"Chiffrement et vie privée\"]]\n"
#. type: Plain text
diff --git a/wiki/src/doc/encryption_and_privacy.mdwn b/wiki/src/doc/encryption_and_privacy.mdwn
index 0f3acae..a985e08 100644
--- a/wiki/src/doc/encryption_and_privacy.mdwn
+++ b/wiki/src/doc/encryption_and_privacy.mdwn
@@ -1,3 +1,3 @@
-[[!meta title="Encryption & privacy"]]
+[[!meta title="Encryption and privacy"]]
[[!inline pages="doc/encryption_and_privacy.index" raw="yes"]]
diff --git a/wiki/src/doc/encryption_and_privacy.pt.po b/wiki/src/doc/encryption_and_privacy.pt.po
index d7e7267..a213927 100644
--- a/wiki/src/doc/encryption_and_privacy.pt.po
+++ b/wiki/src/doc/encryption_and_privacy.pt.po
@@ -17,8 +17,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!meta title=\"Encryption & privacy\"]]\n"
-msgstr "[[!meta title=\"Criptografia & privacidade\"]]\n"
+msgid "[[!meta title=\"Encryption and privacy\"]]\n"
+msgstr "[[!meta title=\"Criptografia e privacidade\"]]\n"
#. type: Plain text
#, no-wrap