Skip to content

Commit

Permalink
Merge branch 'master' into v7
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidePrincipi committed Mar 9, 2017
2 parents a1f26c5 + f9a9a32 commit f89ebcc
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 28 deletions.
4 changes: 2 additions & 2 deletions administrator-manual/en/locale/es/LC_MESSAGES/fax_server.po
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,15 @@ msgid ""
"transformed into a fax and sent to the recipient."
msgstr ""
"Todos los correos electrónicos enviados a la red local en "
"``sendfax@<nombrededominio>`` serán transformados en un fax y enviados al "
"``sendfax@<domainname>`` serán transformados en un fax y enviados al "
"destinatario."

#: ../../fax_server.rst:88 ../../fax_server.rst:91
msgid ""
"The ``<domainname>`` must match a local mail domain configured for local "
"delivery."
msgstr ""
"El ``<nombrededominio>`` debe coincidir con un dominio de correo local "
"El ``<domainname>`` debe coincidir con un dominio de correo local "
"configurado para la entrega local."

#: ../../fax_server.rst:90 ../../fax_server.rst:93
Expand Down
4 changes: 3 additions & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/hotspot.po
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ msgstr "Gestión de acceso con usuario / contraseña"
msgid ""
"Pricing based on prepaid credit, date expiration, traffic usage or freely "
"accessible"
msgstr "Gestión de acceso con usuario / contraseña"
msgstr ""
"Precios basados en crédito prepagado, vencimiento de la fecha, uso del "
"tráfico o acceso libre"

#: ../../hotspot.rst:23
msgid "Login manager from web panel"
Expand Down
18 changes: 9 additions & 9 deletions administrator-manual/en/locale/es/LC_MESSAGES/installation.po
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ msgstr "Tipos de instalación"

#: ../../installation.rst:47 ../../installation.rst:50
msgid "|product| supports two installation modes. In short:"
msgstr "|product| admite dos modos de instalación. En breve:"
msgstr "|product| admite dos modos de instalación. En resumen:"

#: ../../installation.rst:49 ../../installation.rst:52
msgid "**Installing from ISO**"
Expand Down Expand Up @@ -309,7 +309,7 @@ msgid ""
msgstr ""
"En el menú de arranque, puede agregar parámetros adicionales pulsando "
":kbd:`TAB` y editando la línea de comandos del kernel. Esto puede ser útil "
"en modo *desatendido *."
"en modo *desatendido*."

#: ../../installation.rst:165 ../../installation.rst:168
msgid "To disable raid, just add this option to the command line: ::"
Expand Down Expand Up @@ -501,15 +501,15 @@ msgstr "Zona horaria: UTC"

#: ../../installation.rst:262 ../../installation.rst:265
msgid "Default ``root`` password: ``Nethesis,1234``"
msgstr "Predeterminado ``root`` contraseña: ``Nethesis,1234``"
msgstr "Contraseña predeterminada de``root``: ``Nethesis,1234``"

#: ../../installation.rst:263 ../../installation.rst:266
msgid ""
"DHCP enabled on all network interfaces; if no DHCP lease is received the "
":ref:`fallback IP configuration <fallback-ip-configuration>` is applied"
msgstr ""
"DHCP habilitado en todas las interfaces de red; Si no se recibe una "
"concesión DHCP, se aplica la opción: ref: `fallback IP configuration "
"concesión DHCP, se aplica la opción :ref:`Configuración IP alternativa "
"<fallback-ip-configuration>"

#: ../../installation.rst:265 ../../installation.rst:268
Expand Down Expand Up @@ -564,7 +564,7 @@ msgstr ""

#: ../../installation.rst:305 ../../installation.rst:308
msgid "Enterprise promotion"
msgstr "Promoción de empresas"
msgstr "Promoción de Enterprise"

#: ../../installation.rst:307 ../../installation.rst:310
msgid "To promote to the Enterprise version run the following command: ::"
Expand All @@ -576,7 +576,7 @@ msgid ""
"Proceed with :ref:`registration <registration-section>` then run the "
"following command: ::"
msgstr ""
"Proceda con el :ref: `registro <registration-section>` y luego ejecute el "
"Proceda con el :ref:`registro <registration-section>` y luego ejecute el "
"siguiente comando: ::"

#: ../../installation.rst:318 ../../installation.rst:321
Expand All @@ -589,6 +589,6 @@ msgid ""
"<access-section>` to :ref:`install additional software <package_manager-"
"section>`."
msgstr ""
"Al final del procedimiento de instalación, ref: `access the server-manager "
"<access-section>` a: ref:`install additional software <package_manager-"
"section>`."
"Al final del procedimiento de instalación, ref:`acceda del administrador del"
" servidor <access-section>` a: ref:`Instalar software adicional "
"<package_manager-section>`."
18 changes: 17 additions & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/migration.po
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ msgid ""
"Before running the migration procedure, read carefully all the sections of "
"this chapter."
msgstr ""
"Antes de ejecutar el procedimiento de migración, lea atentamente todas las "
"secciones de este capítulo. "

#: ../../migration.rst:24 ../../migration.rst:27
msgid ""
Expand Down Expand Up @@ -98,35 +100,49 @@ msgid ""
"You should configure an :ref:`accounts provider <account-providers>` before "
"starting the migration procedure."
msgstr ""
"Debe configurar un :ref:`proveedor de cuentas <account-providers>` antes de "
"iniciar el procedimiento de migración."

#: ../../migration.rst:54 ../../migration.rst:57
msgid ""
"If the source system was joined to an Active Directory domain (Samba server "
"role was ADS), configure a *remote Active Directory* accounts provider."
msgstr ""
"Si el sistema de origen se unió a un dominio de Active Directory (la función"
" de servidor Samba era ADS), configure un proveedor de cuentas *remoto de "
"Active Directory*."

#: ../../migration.rst:57 ../../migration.rst:60
msgid ""
"If the source system was a NT Primary Domain Controller (Samba server role "
"was PDC) install a *local Active Directory* accounts provider."
msgstr ""
"Si el sistema de origen era un Primary Domain Controller de NT (el rol del "
"servidor de Samba era PDC), instale un proveedor de cuentas *Active "
"Directory local*."

#: ../../migration.rst:60 ../../migration.rst:63
msgid ""
"If access to Shared Folders on the destination system requires user "
"authentication, install a *local Active Directory* accounts provider."
msgstr ""
"Si el acceso a carpetas compartidas en el sistema de destino requiere "
"autenticación de usuario, instale un proveedor de cuentas *Active Directory "
"local*."

#: ../../migration.rst:63 ../../migration.rst:66
msgid "In any other case, install a *local LDAP* accounts provider."
msgstr ""
msgstr "En cualquier otro caso, instale un proveedor de cuentas *LDAP local*."

#: ../../migration.rst:67 ../../migration.rst:70
msgid ""
"If you choose a local Active Directory accounts provider, remember to fully "
"configure and start the DC before executing the ``migration-import`` event. "
"See :ref:`account-providers`."
msgstr ""
"Si elige un proveedor de cuentas de Active Directory local, recuerde "
"configurar e iniciar completamente el controlador de dominio antes de "
"ejecutar el evento ``migration-import``. Véase :ref:`account-providers`."

#: ../../migration.rst:78 ../../migration.rst:81
msgid "Email"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ msgid ""
msgstr ""
"Si se seleccionó una cuenta para la entrega y se ha suprimido "
"posteriormente, la configuración se vuelve incoherente. Si esto sucede, la "
"configuración de la cuenta existente en :guilabel: `Conector POP3` debe "
"estar deshabilitada o borrada."
"configuración de la cuenta existente en :guilabel:`Conector POP3` debe estar"
" deshabilitada o borrada."

#: ../../pop3_connector.rst:59 ../../pop3_connector.rst:62
msgid "References"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ msgstr "Filtro Web: fijar perfiles basados en grupos"

#: ../../release_notes.rst:26 ../../release_notes.rst:29
msgid "Firewall: fix selection of time conditions"
msgstr "Cortafuegos: fija la selección de las condiciones de tiempo"
msgstr "Firewall: fija la selección de las condiciones de tiempo"

#: ../../release_notes.rst:27 ../../release_notes.rst:30
msgid "IPS: update configuration for latest pulledpork release"
Expand Down
9 changes: 5 additions & 4 deletions administrator-manual/en/locale/es/LC_MESSAGES/vpn.po
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ msgstr "El sistema admite dos tipos de VPN:"

#: ../../vpn.rst:17 ../../vpn.rst:20
msgid ":index:`roadwarrior`: connect a remote client to the internal network"
msgstr ":index:`roadwarrior`: conecta un cliente remoto a la red interna"
msgstr ""
":index:`roadwarrior`: o modo guerrero, conecta un cliente remoto a la red "
"interna"

#: ../../vpn.rst:19 ../../vpn.rst:22
msgid ":index:`net2net` or :index:`tunnel`: connect two remote networks"
Expand Down Expand Up @@ -88,15 +90,14 @@ msgstr "Configuración sencilla"

#: ../../vpn.rst:34 ../../vpn.rst:37
msgid "Roadwarrior"
msgstr "Roadwarrior"
msgstr "Roadwarrior/modo guerrero"

#: ../../vpn.rst:36 ../../vpn.rst:39
msgid ""
"The OpenVPN server in roadwarrior mode allows connection of multiple "
"clients."
msgstr ""
"El servidor OpenVPN en modo roadwarrior permite la conexión de varios "
"clientes."
"El servidor OpenVPN en modo guerrero permite la conexión de varios clientes."

#: ../../vpn.rst:38 ../../vpn.rst:41
msgid "Supported authentication methods are:"
Expand Down
8 changes: 5 additions & 3 deletions administrator-manual/en/locale/es/LC_MESSAGES/webtop4.po
Original file line number Diff line number Diff line change
Expand Up @@ -460,15 +460,17 @@ msgstr "API de Dropbox"

#: ../../webtop4.rst:240 ../../webtop4.rst:243
msgid "Access https://www.dropbox.com/developers/apps and create a new app"
msgstr "Acceder a https://www.dropbox.com/developers/apps y crear una nueva r"
msgstr ""
"Acceder a https://www.dropbox.com/developers/apps y crear una nueva "
"aplicación"

#: ../../webtop4.rst:241 ../../webtop4.rst:244
msgid ""
"Insert the new credential key pair (App key e App secret) inside WebTop "
"configuration"
msgstr ""
"Inserte el nuevo par de claves de credencial (clave de aplicación y secreto "
"de aplicación) dentro de la configuración de WebTop"
"Inserte el nuevo par de claves de credencial (App key e App secret) dentro "
"de la configuración de WebTop"

#: ../../webtop4.rst:253 ../../webtop4.rst:256
msgid ""
Expand Down
14 changes: 9 additions & 5 deletions administrator-manual/en/locale/es/LC_MESSAGES/webtop5.po
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-08 15:42+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Giacomo Sanchietti <giacomo.sanchietti@nethesis.it>, 2017\n"
"Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -48,6 +48,8 @@ msgid ""
"Always use the full user name format ``<user>@<domain>`` for login for the "
"web application and Active Sync."
msgstr ""
"Utilice siempre el formato de nombre de usuario completo \"<user>@<domain>\""
" para iniciar sesión en la aplicación web y Active Sync"

#: ../../webtop5.rst:22 ../../webtop5.rst:58 ../../webtop5.rst:25
#: ../../webtop5.rst:61
Expand Down Expand Up @@ -213,7 +215,7 @@ msgid ""
"Insert new credentials (Client ID e Client Secret) inside WebTop "
"configuration"
msgstr ""
"Inserte nuevas credenciales (Client ID e Client Secret) dentro de la "
"Inserte nuevas credenciales (Client ID y Client Secret) dentro de la "
"configuración de WebTop"

#: ../../webtop5.rst:103 ../../webtop5.rst:118 ../../webtop5.rst:106
Expand All @@ -236,15 +238,17 @@ msgstr "API de Dropbox"

#: ../../webtop5.rst:115 ../../webtop5.rst:118
msgid "Access https://www.dropbox.com/developers/apps and create a new app"
msgstr "Acceder a https://www.dropbox.com/developers/apps y crear una nueva r"
msgstr ""
"Acceder a https://www.dropbox.com/developers/apps y crear una nueva "
"aplicación"

#: ../../webtop5.rst:116 ../../webtop5.rst:119
msgid ""
"Insert the new credential key pair (App key e App secret) inside WebTop "
"configuration"
msgstr ""
"Inserte el nuevo par de claves de credencial (clave de aplicación y secreto "
"de aplicación) dentro de la configuración de WebTop"
"Inserte el nuevo par de claves de credencial (App key e App secret) dentro "
"de la configuración de WebTop"

#: ../../webtop5.rst:128 ../../webtop5.rst:131
msgid ""
Expand Down

0 comments on commit f89ebcc

Please sign in to comment.