Merge remote-tracking branch 'origin/master'

wiki/src/doc/first_steps/persistence/copy.de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2016-01-28 15:18+0100\n"
+"POT-Creation-Date: 2016-02-04 15:37+0100\n"
 "PO-Revision-Date: 2015-11-04 21:10+0100\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -64,9 +64,13 @@ msgstr ""
 "Speicherbereich."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Restart Tails, enable persistence, and [[set up an administration "
+#| "password|startup_options/administration_password]]."
 msgid ""
-"Restart Tails, enable persistence, and [[set up an administration password|"
-"startup_options/administration_password]]."
+"Restart on the new device, enable persistence, and [[set up an "
+"administration password|startup_options/administration_password]]."
 msgstr ""
 "Starten Sie Tails neu, aktivieren Sie den beständigen Speicherbereich und "
 "[[stellen Sie ein Administrationskennwort ein|startup_options/"
@@ -89,13 +93,21 @@ msgstr ""
 "möchten."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| "   <span class=\"menuchoice\">\n"
+#| "     <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| "     <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| "     <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| "   </span>\n"
+#| "   to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
 msgid ""
 "1. Choose\n"
 "   <span class=\"menuchoice\">\n"
 "     <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-"     <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-"     <span class=\"guimenuitem\">Disk Utility</span>\n"
+"     <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+"     <span class=\"guimenuitem\">Disks</span>\n"
 "   </span>\n"
 "   to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
 msgstr ""
@@ -115,10 +127,15 @@ msgstr ""
 "Medium entspricht."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the right pane, click on the partition labeled as <span class="
+#| "\"guilabel\">Encrypted</span>. The <span class=\"guilabel\">Partition "
+#| "Label</span> must be <span class=\"label\">TailsData</span>."
 msgid ""
 "In the right pane, click on the partition labeled as <span class=\"guilabel"
-"\">Encrypted</span>. The <span class=\"guilabel\">Partition Label</span> "
-"must be <span class=\"label\">TailsData</span>."
+"\">LUKS</span>. The name of the partition must be <span class=\"guilabel"
+"\">TailsData</span>."
 msgstr ""
 "Wählen Sie im rechten Fensterbereich die Partition mit dem Namen <span class="
 "\"guilabel\">Verschlüsselt</span> aus. Die <span class=\"guilabel"
@@ -126,10 +143,16 @@ msgstr ""
 "lauten."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
+#| "persistent volume. Enter the passphrase of the old persistent volume and "
+#| "click <span class=\"guilabel\">Unlock</span>."
 msgid ""
-"Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
-"persistent volume. Enter the passphrase of the old persistent volume and "
-"click <span class=\"guilabel\">Unlock</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/unlock.png alt=\"Unlock\" "
+"class=\"symbolic\" link=\"no\"]]</span> button to unlock the old persistent "
+"volume.  Enter the passphrase of the old persistent volume and click <span "
+"class=\"button\">Unlock</span>."
 msgstr ""
 "Klicken Sie auf <span class=\"guilabel\">Datenträger entsperren</span>, um "
 "den alten beständigen Speicherbereich zu entsperren. Geben Sie die "
@@ -137,16 +160,27 @@ msgstr ""
 "class=\"guilabel\">Entsperren</span>."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on the <span class=\"guilabel\">TailsData</span> partition that "
+#| "appears below the <span class=\"guilabel\">Encrypted Volume</span> "
+#| "partition."
 msgid ""
 "Click on the <span class=\"guilabel\">TailsData</span> partition that "
-"appears below the <span class=\"guilabel\">Encrypted Volume</span> partition."
+"appears below the <span class=\"guilabel\">LUKS</span> partition."
 msgstr ""
 "Wählen Sie die <span class=\"guilabel\">TailsData</span>-Partition aus, die "
 "unter der <span class=\"guilabel\">Verschlüsselt</span>-Partition erscheint."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+#| "volume is now mounted as <span class=\"filename\">/media/amnesia/"
+#| "TailsData</span>."
 msgid ""
-"Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+"Click on the <span class=\"guimenu\">[[!img lib/media-playback-start.png alt="
+"\"Mount\" class=\"symbolic\" link=\"no\"]]</span> button. The old persistent "
 "volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</"
 "span>."
 msgstr ""
@@ -203,11 +237,20 @@ msgstr ""
 "TailsData</span>, um die alte beständige Speicherpartition zu öffnen."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| "   <span class=\"menuchoice\">\n"
+#| "     <span class=\"guimenu\">File</span>&nbsp;▸\n"
+#| "     <span class=\"guimenuitem\">New Tab</span>\n"
+#| "   </span>\n"
+#| "   and navigate to\n"
+#| "   <span class=\"filename\">/live/persistence/TailsData_unlocked</span> in\n"
+#| "   this new tab.\n"
 msgid ""
-"1. Choose\n"
+"1. In the titlebar, choose\n"
 "   <span class=\"menuchoice\">\n"
-"     <span class=\"guimenu\">File</span>&nbsp;▸\n"
+"     <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
 "     <span class=\"guimenuitem\">New Tab</span>\n"
 "   </span>\n"
 "   and navigate to\n"
@@ -227,13 +270,20 @@ msgid "Click on the <span class=\"guilabel\">TailsData</span> tab."
 msgstr "Wählen Sie den <span class=\"guilabel\">TailsData</span>-Reiter aus."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To copy a folder containing persistent data from the old persistent "
+#| "volume to the new one, drag and drop that folder from the <span class="
+#| "\"guilabel\">TailsData</span> onto the <span class=\"guilabel"
+#| "\">TailsData_unlocked</span> tab. When copying a folder, choose to <span "
+#| "class=\"guilabel\">Merge All</span> the folder, and <span class=\"guilabel"
+#| "\">Replace All</span> files. Do not copy a folder if you do not know what "
+#| "it is used for."
 msgid ""
 "To copy a folder containing persistent data from the old persistent volume "
 "to the new one, drag and drop that folder from the <span class=\"guilabel"
 "\">TailsData</span> onto the <span class=\"guilabel\">TailsData_unlocked</"
-"span> tab. When copying a folder, choose to <span class=\"guilabel\">Merge "
-"All</span> the folder, and <span class=\"guilabel\">Replace All</span> "
-"files. Do not copy a folder if you do not know what it is used for."
+"span> tab."
 msgstr ""
 "Um einen Ordner, der beständig gespeicherte Daten enthält, vom alten "
 "beständigen Speicherbereich in den neuen zu kopieren, ziehen Sie diesen "
@@ -244,6 +294,22 @@ msgstr ""
 "aus. Kopieren Sie keinen Ordner von dem Sie nicht wissen, wofür er benutzt "
 "wird."
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   When copying a folder, select the\n"
+"   <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+"   click <span class=\"button\">Merge</span> to apply to all subfolders.\n"
+"   Then you might have to select again the\n"
+"   <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+"   click <span class=\"button\">Replace</span> to apply to all files.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   Do not copy a folder if you do not know what it is used for.\n"
+msgstr ""
+
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">apt</span> folder corresponds to the <span "
@@ -270,15 +336,6 @@ msgstr ""
 "des beständigen Speicherbereichs für <span class=\"guilabel\">[[Lesezeichen "
 "des Browsers|configure#browser_bookmarks]]</span>."
 
-#. type: Bullet: '    - '
-msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
-msgstr ""
-"Der <span class=\"filename\">icedove</span>-Ordner entspricht der Funktion "
-"des beständigen Speicherbereichs für <span class=\"guilabel\">[[Icedove|"
-"configure#icedove]]</span>."
-
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">cups-configuration</span> folder corresponds to "
@@ -299,6 +356,21 @@ msgstr ""
 "des beständigen Speicherbereichs für <span class=\"guilabel\">[[Versteckte "
 "Konfigurationsdateien|configure#dotfiles]]</span>."
 
+#. type: Bullet: '    - '
+#, fuzzy
+#| msgid ""
+#| "The <span class=\"filename\">openssh-client</span> folder corresponds to "
+#| "the <span class=\"guilabel\">[[SSH Client|configure#ssh_client]]</span> "
+#| "persistence feature."
+msgid ""
+"The <span class=\"filename\">electrum</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Bitcoin Client|configure#bitcoin]]</span> persistence "
+"feature."
+msgstr ""
+"Der <span class=\"filename\">openssh-client</span>-Ordner entspricht der "
+"<span class=\"guilabel\">[[SSH Client|configure#ssh_client]]</span> Funktion "
+"des beständigen Speicherbereichs."
+
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">gnome-keyring</span> folder corresponds to the "
@@ -318,6 +390,15 @@ msgstr ""
 "\"guilabel\">[[GnuPG|configure#gnupg]]</span>-Funktion des beständigen "
 "Speicherbereichs."
 
+#. type: Bullet: '    - '
+msgid ""
+"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+msgstr ""
+"Der <span class=\"filename\">icedove</span>-Ordner entspricht der Funktion "
+"des beständigen Speicherbereichs für <span class=\"guilabel\">[[Icedove|"
+"configure#icedove]]</span>."
+
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">nm-connections</span> folder corresponds to the "

wiki/src/doc/first_steps/persistence/copy.fa.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-28 15:18+0100\n"
+"POT-Creation-Date: 2016-02-04 15:37+0100\n"
 "PO-Revision-Date: 2015-10-10 13:50+0000\n"
 "Last-Translator: sprint5 <translation5@451f.org>\n"
 "Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -62,9 +62,13 @@ msgid ""
 msgstr "ویژگی‌های مورد نظر مانای خود را دوباره روی دستگاه جدید فعال کنید."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Restart Tails, enable persistence, and [[set up an administration "
+#| "password|startup_options/administration_password]]."
 msgid ""
-"Restart Tails, enable persistence, and [[set up an administration password|"
-"startup_options/administration_password]]."
+"Restart on the new device, enable persistence, and [[set up an "
+"administration password|startup_options/administration_password]]."
 msgstr ""
 "تیلز را دوباره راه‌اندازی و مانا را فعال کنید و [[یک گذرواژهٔ مدیریتی نیز "
 "بسازید|startup_options/administration_password]]."
@@ -84,13 +88,21 @@ msgid "Plug in the old Tails device from which you want to rescue your data."
 msgstr "دستگاه قدیمی تیلز که قصد بازیابی داده‌ها از رویش دارید را وصل کنید."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| "   <span class=\"menuchoice\">\n"
+#| "     <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| "     <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| "     <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| "   </span>\n"
+#| "   to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
 msgid ""
 "1. Choose\n"
 "   <span class=\"menuchoice\">\n"
 "     <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-"     <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-"     <span class=\"guimenuitem\">Disk Utility</span>\n"
+"     <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+"     <span class=\"guimenuitem\">Disks</span>\n"
 "   </span>\n"
 "   to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
 msgstr ""
@@ -111,8 +123,8 @@ msgstr "در سمت راست روی دستگاه مرتبط با تیلز قدی
 #, fuzzy
 msgid ""
 "In the right pane, click on the partition labeled as <span class=\"guilabel"
-"\">Encrypted</span>. The <span class=\"guilabel\">Partition Label</span> "
-"must be <span class=\"label\">TailsData</span>."
+"\">LUKS</span>. The name of the partition must be <span class=\"guilabel"
+"\">TailsData</span>."
 msgstr ""
 "در سمت چپ روی بخش موسوم به <span class=\"guilabel\">Encrypted</span> کلیک "
 "کنید. <span class=\"guilabel\">نام پارتیشن</span> باید <span class=\"label"
@@ -121,9 +133,10 @@ msgstr ""
 #. type: Bullet: '1. '
 #, fuzzy
 msgid ""
-"Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
-"persistent volume. Enter the passphrase of the old persistent volume and "
-"click <span class=\"guilabel\">Unlock</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/unlock.png alt=\"Unlock\" "
+"class=\"symbolic\" link=\"no\"]]</span> button to unlock the old persistent "
+"volume.  Enter the passphrase of the old persistent volume and click <span "
+"class=\"button\">Unlock</span>."
 msgstr ""
 "روی <span class=\"guilabel\">آزاد کردن درایو</span> کلیک کنید تا درایو مانا "
 "آزاد شود. گذرواژهٔ درایو مانای قدیمی را وارد کرده و روی <span class=\"guilabel"
@@ -133,7 +146,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Click on the <span class=\"guilabel\">TailsData</span> partition that "
-"appears below the <span class=\"guilabel\">Encrypted Volume</span> partition."
+"appears below the <span class=\"guilabel\">LUKS</span> partition."
 msgstr ""
 "روی پارتیشن <span class=\"guilabel\">TailsData</span> که پایین <span class="
 "\"guilabel\">Encrypted Volume</span> دیده می‌شود کلیک کنید."
@@ -144,7 +157,8 @@ msgstr ""
 #| "Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
 #| "volume is now mounted as <span class=\"filename\">/media/TailsData</span>."
 msgid ""
-"Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+"Click on the <span class=\"guimenu\">[[!img lib/media-playback-start.png alt="
+"\"Mount\" class=\"symbolic\" link=\"no\"]]</span> button. The old persistent "
 "volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</"
 "span>."
 msgstr ""
@@ -205,11 +219,20 @@ msgstr ""
 "درایو مانای قدیمی را باز کنید."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| "   <span class=\"menuchoice\">\n"
+#| "     <span class=\"guimenu\">File</span>&nbsp;▸\n"
+#| "     <span class=\"guimenuitem\">New Tab</span>\n"
+#| "   </span>\n"
+#| "   and navigate to\n"
+#| "   <span class=\"filename\">/live/persistence/TailsData_unlocked</span> in\n"
+#| "   this new tab.\n"
 msgid ""
-"1. Choose\n"
+"1. In the titlebar, choose\n"
 "   <span class=\"menuchoice\">\n"
-"     <span class=\"guimenu\">File</span>&nbsp;▸\n"
+"     <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
 "     <span class=\"guimenuitem\">New Tab</span>\n"
 "   </span>\n"
 "   and navigate to\n"
@@ -230,13 +253,20 @@ msgid "Click on the <span class=\"guilabel\">TailsData</span> tab."
 msgstr "روی زبانهٔ <span class=\"guilabel\">TailsData</span> کلیک کنید."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To copy a folder containing persistent data from the old persistent "
+#| "volume to the new one, drag and drop that folder from the <span class="
+#| "\"guilabel\">TailsData</span> onto the <span class=\"guilabel"
+#| "\">TailsData_unlocked</span> tab. When copying a folder, choose to <span "
+#| "class=\"guilabel\">Merge All</span> the folder, and <span class=\"guilabel"
+#| "\">Replace All</span> files. Do not copy a folder if you do not know what "
+#| "it is used for."
 msgid ""
 "To copy a folder containing persistent data from the old persistent volume "
 "to the new one, drag and drop that folder from the <span class=\"guilabel"
 "\">TailsData</span> onto the <span class=\"guilabel\">TailsData_unlocked</"
-"span> tab. When copying a folder, choose to <span class=\"guilabel\">Merge "
-"All</span> the folder, and <span class=\"guilabel\">Replace All</span> "
-"files. Do not copy a folder if you do not know what it is used for."
+"span> tab."
 msgstr ""
 "برای کپی کردن پوشه‌ٔ حاوی داده‌های مانا از درایو مانای قدیمی خود به مانای جدید، "
 "آن پوشه را از <span class=\"guilabel\">TailsData</span> کشیده و در زبانهٔ "
@@ -245,6 +275,22 @@ msgstr ""
 "\"guilabel\">جایگزین کردن همه</span> فایل‌ها را انتخاب کنید. اگر نمی‌دانید "
 "کارکرد یک پوشه چیست، آن را کپی نکنید."
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   When copying a folder, select the\n"
+"   <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+"   click <span class=\"button\">Merge</span> to apply to all subfolders.\n"
+"   Then you might have to select again the\n"
+"   <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+"   click <span class=\"button\">Replace</span> to apply to all files.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   Do not copy a folder if you do not know what it is used for.\n"
+msgstr ""
+
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">apt</span> folder corresponds to the <span "
@@ -269,19 +315,6 @@ msgstr ""
 "پوشهٔ <span class=\"filename\">bookmarks</span> مرتبط با ویژگی <span class="
 "\"guilabel\">[[نشانک‌های مرورگر|configure#browser_bookmarks]]</span> مانا است."
 
-#. type: Bullet: '    - '
-#, fuzzy
-#| msgid ""
-#| "The <span class=\"filename\">dotfiles</span> folder corresponds to the "
-#| "<span class=\"guilabel\">[[Dotfiles|configure#dotfiles]]</span> "
-#| "persistence feature."
-msgid ""
-"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
-"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
-msgstr ""
-"پوشهٔ <span class=\"filename\">dotfiles</span> مرتبط با ویژگی <span class="
-"\"guilabel\">[[دات‌فایلز|configure#dotfiles]]</span> مانا است."
-
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">cups-configuration</span> folder corresponds to "
@@ -300,6 +333,20 @@ msgstr ""
 "پوشهٔ <span class=\"filename\">dotfiles</span> مرتبط با ویژگی <span class="
 "\"guilabel\">[[دات‌فایلز|configure#dotfiles]]</span> مانا است."
 
+#. type: Bullet: '    - '
+#, fuzzy
+#| msgid ""
+#| "The <span class=\"filename\">openssh-client</span> folder corresponds to "
+#| "the <span class=\"guilabel\">[[SSH Client|configure#ssh_client]]</span> "
+#| "persistence feature."
+msgid ""
+"The <span class=\"filename\">electrum</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Bitcoin Client|configure#bitcoin]]</span> persistence "
+"feature."
+msgstr ""
+"پوشهٔ <span class=\"filename\">openssh-client</span> مرتبط با ویژگی <span "
+"class=\"guilabel\">[[کارخواه اس‌اس‌اچ|configure#ssh_client]]</span> مانا است."
+
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">gnome-keyring</span> folder corresponds to the "
@@ -317,6 +364,19 @@ msgstr ""
 "پوشهٔ <span class=\"filename\">gnupg</span> مرتبط با ویژگی <span class="
 "\"guilabel\">[[GnuPG|configure#gnupg]]</span> مانا است."
 
+#. type: Bullet: '    - '
+#, fuzzy
+#| msgid ""
+#| "The <span class=\"filename\">dotfiles</span> folder corresponds to the "
+#| "<span class=\"guilabel\">[[Dotfiles|configure#dotfiles]]</span> "
+#| "persistence feature."
+msgid ""
+"The <span class=\"filename\">icedove</span> folder corresponds to the <span "
+"class=\"guilabel\">[[Icedove|configure#icedove]]</span> persistence feature."
+msgstr ""
+"پوشهٔ <span class=\"filename\">dotfiles</span> مرتبط با ویژگی <span class="
+"\"guilabel\">[[دات‌فایلز|configure#dotfiles]]</span> مانا است."
+
 #. type: Bullet: '    - '
 msgid ""
 "The <span class=\"filename\">nm-connections</span> folder corresponds to the "

wiki/src/doc/first_steps/persistence/copy.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-01-28 15:18+0100\n"
+"POT-Creation-Date: 2016-02-04 15:37+0100\n"
 "PO-Revision-Date: 2015-10-20 02:03+0100\n"
 "Last-Translator: AtomiKe <tails@atomike.ninja>\n"
 "Language-Team:  <LL@li.org>\n"
@@ -65,9 +65,13 @@ msgstr ""
 "nouveau volume persistant."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Restart Tails, enable persistence, and [[set up an administration "
+#| "password|startup_options/administration_password]]."
 msgid ""
-"Restart Tails, enable persistence, and [[set up an administration password|"
-"startup_options/administration_password]]."
+"Restart on the new device, enable persistence, and [[set up an "
+"administration password|startup_options/administration_password]]."
 msgstr ""
 "Redémarrer Tails, activer la persistance, et [[définir un mot de passe "
 "d'administration|startup_options/administration_password]]."
@@ -89,13 +93,21 @@ msgstr ""
 "données."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| "   <span class=\"menuchoice\">\n"
+#| "     <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
+#| "     <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
+#| "     <span class=\"guimenuitem\">Disk Utility</span>\n"
+#| "   </span>\n"
+#| "   to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
 msgid ""
 "1. Choose\n"
 "   <span class=\"menuchoice\">\n"
 "     <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
-"     <span class=\"guisubmenu\">Accessories</span>&nbsp;▸\n"
-"     <span class=\"guimenuitem\">Disk Utility</span>\n"
+"     <span class=\"guisubmenu\">Utilities</span>&nbsp;▸\n"
+"     <span class=\"guimenuitem\">Disks</span>\n"
 "   </span>\n"
 "   to open the <span class=\"application\">GNOME Disk Utility</span>.\n"
 msgstr ""
@@ -115,20 +127,31 @@ msgstr ""
 "l'ancien périphérique Tails."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "In the right pane, click on the partition labeled as <span class="
+#| "\"guilabel\">Encrypted</span>. The <span class=\"guilabel\">Partition "
+#| "Label</span> must be <span class=\"label\">TailsData</span>."
 msgid ""
 "In the right pane, click on the partition labeled as <span class=\"guilabel"
-"\">Encrypted</span>. The <span class=\"guilabel\">Partition Label</span> "
-"must be <span class=\"label\">TailsData</span>."
+"\">LUKS</span>. The name of the partition must be <span class=\"guilabel"
+"\">TailsData</span>."
 msgstr ""
 "Dans le panneau de droite, cliquez sur la partition marquée comme <span "
 "class=\"guilabel\">Chiffrée</span>. L' <span class=\"guilabel\">Étiquette de "
 "la partition</span> doit être <span class=\"label\">TailsData</span>."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
+#| "persistent volume. Enter the passphrase of the old persistent volume and "
+#| "click <span class=\"guilabel\">Unlock</span>."
 msgid ""
-"Click on <span class=\"guilabel\">Unlock Volume</span> to unlock the old "
-"persistent volume. Enter the passphrase of the old persistent volume and "
-"click <span class=\"guilabel\">Unlock</span>."
+"Click on the <span class=\"guimenu\">[[!img lib/unlock.png alt=\"Unlock\" "
+"class=\"symbolic\" link=\"no\"]]</span> button to unlock the old persistent "
+"volume.  Enter the passphrase of the old persistent volume and click <span "
+"class=\"button\">Unlock</span>."
 msgstr ""
 "Cliquez sur <span class=\"guilabel\">Déverrouiller le volume</span> pour "
 "ouvrir l'ancien volume persistant. Saisissez la phrase de passe de l'ancien "
@@ -136,17 +159,28 @@ msgstr ""
 "span>."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on the <span class=\"guilabel\">TailsData</span> partition that "
+#| "appears below the <span class=\"guilabel\">Encrypted Volume</span> "
+#| "partition."
 msgid ""
 "Click on the <span class=\"guilabel\">TailsData</span> partition that "
-"appears below the <span class=\"guilabel\">Encrypted Volume</span> partition."
+"appears below the <span class=\"guilabel\">LUKS</span> partition."
 msgstr ""
 "Cliquez maintenant sur la partition <span class=\"guilabel\">TailsData</"
 "span> qui est apparu sous la partition intitulée <span class=\"guilabel"
 "\">Chiffré</span>."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+#| "volume is now mounted as <span class=\"filename\">/media/amnesia/"
+#| "TailsData</span>."
 msgid ""
-"Click on <span class=\"guilabel\">Mount Volume</span>. The old persistent "
+"Click on the <span class=\"guimenu\">[[!img lib/media-playback-start.png alt="
+"\"Mount\" class=\"symbolic\" link=\"no\"]]</span> button. The old persistent "
 "volume is now mounted as <span class=\"filename\">/media/amnesia/TailsData</"
 "span>."
 msgstr ""
@@ -203,11 +237,20 @@ msgstr ""
 "media/TailsData</span> pour ouvrir l'ancien volume persistant."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "1. Choose\n"
+#| "   <span class=\"menuchoice\">\n"
+#| "     <span class=\"guimenu\">File</span>&nbsp;▸\n"
+#| "     <span class=\"guimenuitem\">New Tab</span>\n"
+#| "   </span>\n"
+#| "   and navigate to\n"
+#| "   <span class=\"filename\">/live/persistence/TailsData_unlocked</span> in\n"
+#| "   this new tab.\n"
 msgid ""
-"1. Choose\n"
+"1. In the titlebar, choose\n"
 "   <span class=\"menuchoice\">\n"
-"     <span class=\"guimenu\">File</span>&nbsp;▸\n"
+"     <span class=\"guimenu\">[[!img lib/menu.png alt=\"Menu\" class=\"symbolic\" link=\"no\"]]</span>&nbsp;▸\n"
 "     <span class=\"guimenuitem\">New Tab</span>\n"
 "   </span>\n"
 "   and navigate to\n"
@@ -228,13 +271,20 @@ msgid "Click on the <span class=\"guilabel\">TailsData</span> tab."
 msgstr "Cliquez sur l'onglet <span class=\"guilabel\">TailsData</span>."
 
 #. type: Bullet: '1. '
+#, fuzzy
+#| msgid ""
+#| "To copy a folder containing persistent data from the old persistent "
+#| "volume to the new one, drag and drop that folder from the <span class="
+#| "\"guilabel\">TailsData</span> onto the <span class=\"guilabel"
+#| "\">TailsData_unlocked</span> tab. When copying a folder, choose to <span "
+#| "class=\"guilabel\">Merge All</span> the folder, and <span class=\"guilabel"
+#| "\">Replace All</span> files. Do not copy a folder if you do not know what "
+#| "it is used for."
 msgid ""
 "To copy a folder containing persistent data from the old persistent volume "
 "to the new one, drag and drop that folder from the <span class=\"guilabel"
 "\">TailsData</span> onto the <span class=\"guilabel\">TailsData_unlocked</"
-"span> tab. When copying a folder, choose to <span class=\"guilabel\">Merge "
-"All</span> the folder, and <span class=\"guilabel\">Replace All</span> "
-"files. Do not copy a folder if you do not know what it is used for."
+"span> tab."
 msgstr ""
 "Pour copier un dossier contenant des données persistantes depuis l'ancien "
 "volume persistant vers le nouveau, faites glisser puis déposez ce dossier "
@@ -244,6 +294,22 @@ msgstr ""
 "dossier, et de <span class=\"guilabel\">Tout remplacer</span> pour les "
 "fichiers. N'importez pas un dossier si vous ne savez pas à quoi il sert."
 
+#. type: Plain text
+#, no-wrap
+msgid ""
+"   When copying a folder, select the\n"
+"   <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+"   click <span class=\"button\">Merge</span> to apply to all subfolders.\n"
+"   Then you might have to select again the\n"
+"   <span class=\"guilabel\"> Apply this action to all files</span> option and\n"
+"   click <span class=\"button\">Replace</span> to apply to all files.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "   Do not copy a folder if you do not know what it is used for.\n"
+msgstr ""
+
 #. type: Bullet: '    - '
 msgid ""