Commit 18ee44c3 authored by intrigeri's avatar intrigeri
Browse files

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

parents adcb61ff 6fdb413c
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 20:11+0100\n"
"POT-Creation-Date: 2015-12-18 15:54+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<h1 class=\"debian expert install-clone\">Install Tails</h1>\n"
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
"<h1 class=\"dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 20:11+0100\n"
"POT-Creation-Date: 2015-12-18 15:54+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<h1 class=\"debian expert install-clone\">Install Tails</h1>\n"
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
"<h1 class=\"dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
......
<h1 class="debian expert install-clone">Install Tails</h1>
<h1 class="debian expert install-clone mac-clone">Install Tails</h1>
<h1 class="windows linux mac-usb">Install the final Tails</h1>
<h1 class="dvd">Install Tails on a USB stick</h1>
<h1 class="upgrade">Upgrade your Tails</h1>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 20:11+0100\n"
"POT-Creation-Date: 2015-12-18 15:54+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<h1 class=\"debian expert install-clone\">Install Tails</h1>\n"
"<h1 class=\"debian expert install-clone mac-clone\">Install Tails</h1>\n"
"<h1 class=\"windows linux mac-usb\">Install the final Tails</h1>\n"
"<h1 class=\"dvd\">Install Tails on a USB stick</h1>\n"
"<h1 class=\"upgrade\">Upgrade your Tails</h1>\n"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 16:52+0100\n"
"POT-Creation-Date: 2015-12-18 15:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -20,16 +20,21 @@ msgstr ""
#, no-wrap
msgid ""
" <p class=\"mac\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key until a list of possible startup\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img install/mac/option_key.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"mac\">Choose the USB stick and press\n"
" <span class=\"keycap\">Enter</span>. The USB stick appears as an external hard\n"
" disk and might be labelled <span class=\"guilabel\">EFI</span> or\n"
" disk and might be labelled <span class=\"guilabel\">EFI Boot</span> or\n"
" <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 16:52+0100\n"
"POT-Creation-Date: 2015-12-18 15:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -20,16 +20,21 @@ msgstr ""
#, no-wrap
msgid ""
" <p class=\"mac\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key until a list of possible startup\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img install/mac/option_key.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"mac\">Choose the USB stick and press\n"
" <span class=\"keycap\">Enter</span>. The USB stick appears as an external hard\n"
" disk and might be labelled <span class=\"guilabel\">EFI</span> or\n"
" disk and might be labelled <span class=\"guilabel\">EFI Boot</span> or\n"
" <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
......
<p class="mac">Immediately press-and-hold the
<span class="keycap">Option</span> key until a list of possible startup
<span class="keycap">Option</span> key (<span class="keycap">Alt</span> key) until a list of possible startup
disks appears.</p>
[[!img install/mac/option_key.png class="screenshot" link="no"]]
<p class="mac">Choose the USB stick and press
<span class="keycap">Enter</span>. The USB stick appears as an external hard
disk and might be labelled <span class="guilabel">EFI</span> or
disk and might be labelled <span class="guilabel">EFI Boot</span> or
<span class="guilabel">Windows</span> like in the following screenshot:</p>
[[!img install/inc/screenshots/mac_startup_usb.png class="screenshot mac" link="no" alt="Screen with the logo of an internal hard disk labelled 'Macintosh HD' and an external hard disk labelled 'Windows' (selected)"]]
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 16:52+0100\n"
"POT-Creation-Date: 2015-12-18 15:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -20,16 +20,21 @@ msgstr ""
#, no-wrap
msgid ""
" <p class=\"mac\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key until a list of possible startup\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img install/mac/option_key.png class=\"screenshot\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"mac\">Choose the USB stick and press\n"
" <span class=\"keycap\">Enter</span>. The USB stick appears as an external hard\n"
" disk and might be labelled <span class=\"guilabel\">EFI</span> or\n"
" disk and might be labelled <span class=\"guilabel\">EFI Boot</span> or\n"
" <span class=\"guilabel\">Windows</span> like in the following screenshot:</p>\n"
msgstr ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 20:11+0100\n"
"POT-Creation-Date: 2015-12-18 15:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -104,10 +104,15 @@ msgstr ""
#, no-wrap
msgid ""
" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key until a list of possible startup\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img install/mac/option_key.png class=\"screenshot mac-dvd\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 20:11+0100\n"
"POT-Creation-Date: 2015-12-18 15:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -104,10 +104,15 @@ msgstr ""
#, no-wrap
msgid ""
" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key until a list of possible startup\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img install/mac/option_key.png class=\"screenshot mac-dvd\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
......
......@@ -37,9 +37,11 @@ from a Tails DVD in a similar way.</p>
1. Switch on the computer.
<p class="mac-dvd">Immediately press-and-hold the
<span class="keycap">Option</span> key until a list of possible startup
<span class="keycap">Option</span> key (<span class="keycap">Alt</span> key) until a list of possible startup
disks appears.</p>
[[!img install/mac/option_key.png class="screenshot mac-dvd" link="no"]]
<p class="mac-dvd">Choose the DVD and press
<span class="keycap">Enter</span>. The DVD
might be labelled <span class="guilabel">Windows</span> like in the following screenshot:</p>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-08 20:11+0100\n"
"POT-Creation-Date: 2015-12-18 15:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -104,10 +104,15 @@ msgstr ""
#, no-wrap
msgid ""
" <p class=\"mac-dvd\">Immediately press-and-hold the\n"
" <span class=\"keycap\">Option</span> key until a list of possible startup\n"
" <span class=\"keycap\">Option</span> key (<span class=\"keycap\">Alt</span> key) until a list of possible startup\n"
" disks appears.</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " [[!img install/mac/option_key.png class=\"screenshot mac-dvd\" link=\"no\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment