aboutsummaryrefslogtreecommitdiffstats
path: root/es/diskdrake.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
commitb3d0edb99a4723879887064280c5b6a5761322b1 (patch)
treebf83bdc5f9b797a4bdac78d45aa6d36f1fe7279b /es/diskdrake.html
parent2e4709a8fe3e15cfceae673670a910aa68e115c1 (diff)
downloaddrakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.gz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.bz2
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.xz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.zip
Update Spanish files
Diffstat (limited to 'es/diskdrake.html')
-rw-r--r--es/diskdrake.html11
1 files changed, 11 insertions, 0 deletions
diff --git a/es/diskdrake.html b/es/diskdrake.html
index d229432..f77fc58 100644
--- a/es/diskdrake.html
+++ b/es/diskdrake.html
@@ -89,8 +89,14 @@
<tr>
<td align="left" valign="top">
+<<<<<<< HEAD
+ <p>Si est&aacute; instalando Mageia en un ordenador con UEFI, compruebe que existe una
+ partici&oacute;n ESP (EFI System Partition) correctamente montada en /boot/EFI (ver
+ m&aacute;s abajo)
+=======
<p>If you are installing Mageia on an UEFI system, check that an ESP (EFI
System Partition) is present and correctly mounted on /boot/EFI (see below)
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -111,8 +117,13 @@
<tr>
<td align="left" valign="top">
+<<<<<<< HEAD
+ <p>Si est&aacute; instalando Mageia en un sistema Legacy/GPT, compruebe que existe una
+ partici&oacute;n BIOS de arranque de tipo correcto
+=======
<p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
partition is present with a correct type
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>