aboutsummaryrefslogtreecommitdiffstats
path: root/es/diskdrake.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /es/diskdrake.html
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'es/diskdrake.html')
-rw-r--r--es/diskdrake.html10
1 files changed, 0 insertions, 10 deletions
diff --git a/es/diskdrake.html b/es/diskdrake.html
index f77fc58..e89be2e 100644
--- a/es/diskdrake.html
+++ b/es/diskdrake.html
@@ -89,14 +89,9 @@
<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>
@@ -117,13 +112,8 @@
<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>