summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2016-06-15 13:07:50 +0000
committersajolida <sajolida@pimienta.org>2016-06-15 13:07:50 +0000
commit44791eb8d871278a0673fae5f2544f901fc0e7e0 (patch)
treec5b07127d83165d23280c8b8edc0a9c47731c934
parent3f93ca4747a595e043ee8ed3ad8cefe3a5f4a722 (diff)
parent53aa8fb8e882f605758aef198e19f5ca4808c59c (diff)
Merge remote-tracking branch 'xin/alt/encryptedvolumes'
Conflicts: wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po17
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po17
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po17
-rw-r--r--wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn7
4 files changed, 24 insertions, 34 deletions
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po
index 3311e22..eaa7851 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.de.po
@@ -142,11 +142,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" [[!img storage_devices_after.png link=no alt=\"A new storage device appeared\n"
-" in the list\"]]\n"
+" [[!img storage_devices_after.png link=no alt=\"\"]]\n"
msgstr ""
-" [[!img storage_devices_after.png link=no alt=\"A new storage device appeared\n"
-" in the list\"]]\n"
+" [[!img storage_devices_after.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -222,8 +220,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
-msgstr "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
+msgid "[[!img empty_device.png link=no alt=\"Free Space 8.1 GB\"]]\n"
+msgstr "[[!img empty_device.png link=no alt=\"Free Space 8.1 GB\"]]\n"
#. type: Bullet: ' 1. '
msgid ""
@@ -313,10 +311,9 @@ msgstr ""
"des Mediums:"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
-msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
-msgstr " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+#, no-wrap
+msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Partition 1 4.0 GB LUKS / secret 4.0 GB Ext4\"]]\n"
+msgstr " [[!img encrypted_partition.png link=\"no\" alt=\"Partition 1 4.0 GB LUKS / secret 4.0 GB Ext4\"]]\n"
#. type: Bullet: ' 1. '
#, fuzzy
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po
index 9bc9f35..5387802 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po
@@ -148,11 +148,9 @@ msgstr "دستگاهی جدید در فهرست دستگاه‌های ذخیره
#. type: Plain text
#, no-wrap
msgid ""
-" [[!img storage_devices_after.png link=no alt=\"A new storage device appeared\n"
-" in the list\"]]\n"
+" [[!img storage_devices_after.png link=no alt=\"\"]]\n"
msgstr ""
-" [[!img storage_devices_after.png link=no alt=\"دستگاهی جدید در فهرست\n"
-"ظاهر می‌شود\"]]\n"
+" [[!img storage_devices_after.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -226,8 +224,8 @@ msgstr "حالا رابط پارتیشن در وسط صفحه یک دستگاه
#. type: Plain text
#, no-wrap
-msgid "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
-msgstr "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
+msgid "[[!img empty_device.png link=no alt=\"Free Space 8.1 GB\"]]\n"
+msgstr "[[!img empty_device.png link=no alt=\"Free Space 8.1 GB\"]]\n"
#. type: Bullet: ' 1. '
msgid ""
@@ -314,10 +312,9 @@ msgstr ""
"جدید رمزگذاری‌شده در قسمت درایوهای دستگاه دیده می‌شود:"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
-msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
-msgstr " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
+#, no-wrap
+msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Partition 1 4.0 GB LUKS / secret 4.0 GB Ext4\"]]\n"
+msgstr " [[!img encrypted_partition.png link=\"no\" alt=\"Partition 1 4.0 GB LUKS / secret 4.0 GB Ext4\"]]\n"
#. type: Bullet: ' 1. '
#, fuzzy
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
index feeea0f..9fd7db6 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po
@@ -124,11 +124,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" [[!img storage_devices_after.png link=no alt=\"A new storage device appeared\n"
-" in the list\"]]\n"
+" [[!img storage_devices_after.png link=no alt=\"\"]]\n"
msgstr ""
-" [[!img storage_devices_after.png link=no alt=\"Un nouveau périphérique de stockage apparaît\n"
-" dans la liste\"]]\n"
+" [[!img storage_devices_after.png link=no alt=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -217,8 +215,8 @@ msgstr ""
#. type: Plain text
#, no-wrap
-msgid "[[!img empty_device.png link=no alt=\"Free 3.9 GB\"]]\n"
-msgstr "[[!img empty_device.fr.png link=no alt=\"4.0 GB Libres\"]]\n"
+msgid "[[!img empty_device.png link=no alt=\"Free Space 8.1 GB\"]]\n"
+msgstr "[[!img empty_device.png link=no alt=\"Free Space 8.1 GB\"]]\n"
#. type: Bullet: ' 1. '
msgid ""
@@ -307,10 +305,9 @@ msgstr ""
"les volumes du périphérique :"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid " [[!img encrypted_partition.png link=no alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
-msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Encrypted 2.0 GB / secret 2.0 GB ext4\"]]\n"
-msgstr " [[!img encrypted_partition.fr.png link=no alt=\"2.0 GB chiffés / 2.0 GB secret ext4\"]]\n"
+#, no-wrap
+msgid " [[!img encrypted_partition.png link=\"no\" alt=\"Partition 1 4.0 GB LUKS / secret 4.0 GB Ext4\"]]\n"
+msgstr " [[!img encrypted_partition.png link=\"no\" alt=\"Partition 1 4.0 GB LUKS / secret 4.0 GB Ext4\"]]\n"
#. type: Bullet: ' 1. '
#, fuzzy
diff --git a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn
index c035c1e..eabc72e 100644
--- a/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn
+++ b/wiki/src/doc/encryption_and_privacy/encrypted_volumes.mdwn
@@ -38,8 +38,7 @@ devices on the left side of the screen.
1. A new device appears in the list of storage devices. Click on it:
- [[!img storage_devices_after.png link=no alt="A new storage device appeared
- in the list"]]
+ [[!img storage_devices_after.png link=no alt=""]]
1. Check that the description of the device on the right side of the screen
corresponds to your device: its brand, its size, etc.
@@ -72,7 +71,7 @@ Create a new encrypted partition
Now the schema of the partitions in the middle of the screen shows an empty
device:
-[[!img empty_device.png link=no alt="Free 3.9 GB"]]
+[[!img empty_device.png link=no alt="Free Space 8.1 GB"]]
1. Click on the <span class="guimenu">[[!img lib/list-add.png alt="Create partition" class="symbolic" link="no"]]</span>
button to create a new partition on the device.
@@ -105,7 +104,7 @@ device:
1. Creating the partition takes from a few seconds to a few minutes. After
that, the new encrypted partition appears in the volumes on the device:
- [[!img encrypted_partition.png link="no" alt="Encrypted 2.0 GB / secret 2.0 GB ext4"]]
+ [[!img encrypted_partition.png link="no" alt="Partition 1 4.0 GB LUKS / secret 4.0 GB Ext4"]]
1. If you want to create another partition in the free space on the
device, click on the free space and then click on the