diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:51:51 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:51:51 +0200 |
| commit | b3d0edb99a4723879887064280c5b6a5761322b1 (patch) | |
| tree | bf83bdc5f9b797a4bdac78d45aa6d36f1fe7279b /es/misc-params.html | |
| parent | 2e4709a8fe3e15cfceae673670a910aa68e115c1 (diff) | |
| download | drakx-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/misc-params.html')
| -rw-r--r-- | es/misc-params.html | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/es/misc-params.html b/es/misc-params.html index 1c43eba..3a91ccc 100644 --- a/es/misc-params.html +++ b/es/misc-params.html @@ -44,24 +44,41 @@ <tr> <td align="left" valign="top"> +<<<<<<< HEAD + <p>Como regla general, se recomienda la configuración por defecto, que se puede + manterner salvo 3 excepciones: +======= <p>As a general rule, default settings are recommended and you can keep them with 3 exceptions: +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> <div class="itemizedlist"> <ul class="itemizedlist"> <li class="listitem"> +<<<<<<< HEAD + <p>se conocen algunos problemas en la configuración por defecto</p> +======= <p>there are known issues with a default setting</p> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> +<<<<<<< HEAD + <p>la configuración por defecto se ha probado ya y falla</p> +======= <p>the default setting has already been tried and it fails</p> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> <li class="listitem"> +<<<<<<< HEAD + <p>se da más información en las secciones siguientes</p> +======= <p>something else is said in the detailed sections below</p> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </li> </ul> @@ -116,7 +133,11 @@ </p> +<<<<<<< HEAD + <p><a name="misc-params-system-pa4b"></a>No cambie nada, a menos que sepa como configurar Grub2 +======= <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2 +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -194,8 +215,13 @@ <tr> <td align="left" valign="top"> +<<<<<<< HEAD + <p>Si nota una configuración errónea de teclado y quiere cambiarla, tenga en + cuenta que las contraseñas cambiarán también. +======= <p>If you notice a wrong keyboard layout and want to change it, keep in mind that your passwords are going to change too. +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </td> @@ -360,9 +386,15 @@ </p> +<<<<<<< HEAD + <p><a name="misc-params-security-pa2b"></a>Seleccione los servicios que desea tener acceso a su sistema. Sus + selecciones dependerán de lo que utilice su computadora. Para obtener más + información, consulte <a class="xref" href="">???</a>. +======= <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your selections will depend on what you use your computer for. For more information, see <a class="xref" href="">???</a>. +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> |