Skip to content

Commit

Permalink
Merge branch 'master' into v7
Browse files Browse the repository at this point in the history
  • Loading branch information
gsanchietti committed Apr 26, 2018
2 parents 6f8d689 + 4d55d5a commit 17686d8
Show file tree
Hide file tree
Showing 35 changed files with 2,617 additions and 1,056 deletions.
5 changes: 4 additions & 1 deletion administrator-manual/en/fax_server.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ Faxes will be sent using the sending user id. This information will be displayed
Mail2Fax
========

.. warning::
To enable this function, make sure that ``Email`` module is installed.

All emails sent to the local network at ``sendfax@<domainname>`` will be transformed into a fax and sent to the recipient.

The ``<domainname>`` must match a local mail domain configured for local delivery.
Expand All @@ -86,7 +89,7 @@ The email must comply with this format:
* The email must be in plain text format
* It may contain attachments such as PDF or PS which will be converted and sent with your fax

.. Note :: This service is enabled only for clients that send email from the green network.
.. Note :: This service is enabled only for clients that send mails from the green network.
.. _iax-modem:

Expand Down
41 changes: 18 additions & 23 deletions administrator-manual/en/locale/es/LC_MESSAGES/accounts.po
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-12 11:06+0100\n"
"POT-Creation-Date: 2018-04-17 16:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Jon M. <elnene.jonkiu@gmail.com>, 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand Down Expand Up @@ -966,15 +966,10 @@ msgstr "Vencimiento"
#: ../../accounts.rst:465 ../../accounts.rst:468
msgid ""
"The :index:`password expiration` is enabled by default to 6 months from the"
" time when the password is set. The system will send an e-mail to inform the"
" users when their password is about to expire."
" time when the password is set."
msgstr ""
"La :index:`Caducidad de contraseña` está habilitada de forma predeterminada "
"a 6 meses desde el momento en que se establece la contraseña. El sistema "
"enviará un correo electrónico para informar a los usuarios cuando su "
"contraseña está a punto de expirar."

#: ../../accounts.rst:468 ../../accounts.rst:471
#: ../../accounts.rst:467 ../../accounts.rst:470
msgid ""
"The system will refer to the date of the last password change, if password "
"is older than 6 months, the server will send an email to indicate that "
Expand All @@ -990,19 +985,19 @@ msgstr ""
"realizó en enero y la activación de la fecha límite en octubre, el sistema "
"asumirá que la contraseña cambiada en enero expiró y notifica al usuario."

#: ../../accounts.rst:478 ../../accounts.rst:481
#: ../../accounts.rst:477 ../../accounts.rst:480
msgid "Effects of expired passwords"
msgstr "Efectos de contraseñas caducadas"

#: ../../accounts.rst:480 ../../accounts.rst:483
#: ../../accounts.rst:479 ../../accounts.rst:482
msgid ""
"After password expiration, the user is still able to read and send email "
"messages."
msgstr ""
"Después de la expiración de la contraseña, el usuario sigue siendo capaz de "
"leer y enviar mensajes de correo electrónico."

#: ../../accounts.rst:482 ../../accounts.rst:485
#: ../../accounts.rst:481 ../../accounts.rst:484
msgid ""
"If |product| has an Active Directory account provider, the user cannot "
"access shared folders, printers (by Samba) and other domain computers."
Expand All @@ -1011,67 +1006,67 @@ msgstr ""
" puede tener acceso a carpetas compartidas, impresoras (por Samba) y otros "
"equipos de dominio."

#: ../../accounts.rst:488 ../../accounts.rst:491
#: ../../accounts.rst:487 ../../accounts.rst:490
msgid "Import accounts from plain-text files"
msgstr ""

#: ../../accounts.rst:491 ../../accounts.rst:494
#: ../../accounts.rst:490 ../../accounts.rst:493
msgid "Import users"
msgstr "Importar usuarios"

#: ../../accounts.rst:493 ../../accounts.rst:496
#: ../../accounts.rst:492 ../../accounts.rst:495
msgid ""
"It is possible to create user accounts from a TSV (Tab Separated Values) "
"file with the following format: ::"
msgstr ""
"Es posible crear cuentas de usuario desde un archivo TSV (Tab Separated "
"Values, valores separados por tabulación) con el siguiente formato: ::"

#: ../../accounts.rst:497 ../../accounts.rst:500
#: ../../accounts.rst:496 ../../accounts.rst:499
msgid "Example: ::"
msgstr "Ejemplo: ::"

#: ../../accounts.rst:501 ../../accounts.rst:504
#: ../../accounts.rst:500 ../../accounts.rst:503
msgid "then execute: ::"
msgstr "Luego ejecutar: ::"

#: ../../accounts.rst:505 ../../accounts.rst:508
#: ../../accounts.rst:504 ../../accounts.rst:507
msgid ""
"For example, if the user’s file is /root/users.tsv, execute following "
"command: ::"
msgstr ""
"Por ejemplo, si el archivo del usuario es /root/users.tsv, ejecute el "
"siguiente comando: ::"

#: ../../accounts.rst:509 ../../accounts.rst:512
#: ../../accounts.rst:508 ../../accounts.rst:511
msgid "Alternative separator character: ::"
msgstr "Carácter de separador alternativo: ::"

#: ../../accounts.rst:514 ../../accounts.rst:517
#: ../../accounts.rst:513 ../../accounts.rst:516
msgid "Import emails"
msgstr ""

#: ../../accounts.rst:516 ../../accounts.rst:519
#: ../../accounts.rst:515 ../../accounts.rst:518
msgid ""
"It is possible to create mail aliases from a TSV (Tab Separated Values) file"
" with the following format: ::"
msgstr ""
"Es posible crear alias de correo desde un archivo TSV (Tab Separated Values,"
" valores separados por tabulación) con el siguiente formato: ::"

#: ../../accounts.rst:520 ../../accounts.rst:523
#: ../../accounts.rst:519 ../../accounts.rst:522
msgid ""
"Then you can use the ``import_emails`` script. See :ref:`import-"
"users_section` for a sample script invocation."
msgstr ""
"A continuación, puede utilizar el script ``import_emails``. Ver :ref"
":`import-users_section` para una invocación del script de ejemplo."

#: ../../accounts.rst:523 ../../accounts.rst:526
#: ../../accounts.rst:522 ../../accounts.rst:525
msgid "Import groups"
msgstr ""

#: ../../accounts.rst:525 ../../accounts.rst:528
#: ../../accounts.rst:524 ../../accounts.rst:527
msgid ""
"Group management is available from the command line through ``group-create``"
" and ``group-modify`` events ::"
Expand Down
35 changes: 10 additions & 25 deletions administrator-manual/en/locale/es/LC_MESSAGES/bandwidth_monitor.po
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-28 16:02+0100\n"
"POT-Creation-Date: 2018-04-17 16:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand All @@ -30,25 +30,10 @@ msgid "Bandwidth monitor"
msgstr "Monitor de ancho de banda"

#: ../../bandwidth_monitor.rst:13 ../../bandwidth_monitor.rst:16
msgid "BandwidthD"
msgstr "BandwidthD"

#: ../../bandwidth_monitor.rst:15 ../../bandwidth_monitor.rst:18
msgid ""
"BandwidthD tracks usage of TCP/IP network subnets and builds graphs to "
"display utilization. After installation, BandwidthD is automatically "
"started. Graphs can be accessed using the Server Manager."
msgstr ""
"BandwidthD controla el uso de subredes de red TCP/IP y genera gráficos para "
"mostrar su utilización. Después de la instalación, BandwidthD se inicia "
"automáticamente. Se puede acceder a los gráficos mediante el Administrador "
"del servidor."

#: ../../bandwidth_monitor.rst:20 ../../bandwidth_monitor.rst:23
msgid "ntopng"
msgstr "ntopng"

#: ../../bandwidth_monitor.rst:22 ../../bandwidth_monitor.rst:25
#: ../../bandwidth_monitor.rst:15 ../../bandwidth_monitor.rst:18
msgid ""
"ntopng is a powerful tool that allows you to analyze real-time network "
"traffic. It allows you to evaluate the bandwidth used by individual hosts "
Expand All @@ -58,11 +43,11 @@ msgstr ""
"en tiempo real. Le permite evaluar el ancho de banda utilizado por los hosts"
" individuales e identificar los protocolos de red más utilizados."

#: ../../bandwidth_monitor.rst:28 ../../bandwidth_monitor.rst:31
#: ../../bandwidth_monitor.rst:21 ../../bandwidth_monitor.rst:24
msgid "Enable ntopng"
msgstr "Habilitar ntopng"

#: ../../bandwidth_monitor.rst:27 ../../bandwidth_monitor.rst:30
#: ../../bandwidth_monitor.rst:20 ../../bandwidth_monitor.rst:23
msgid ""
"Enabling ntopng, all traffic passing through the network interfaces will be "
"analyzed. It can cause a slowdown of the network and an increased in system "
Expand All @@ -72,30 +57,30 @@ msgstr ""
"interfaces de red. Puede causar una ralentización de la red y un aumento en "
"la carga del sistema."

#: ../../bandwidth_monitor.rst:30 ../../bandwidth_monitor.rst:33
#: ../../bandwidth_monitor.rst:23 ../../bandwidth_monitor.rst:26
msgid "Port"
msgstr "Puerto"

#: ../../bandwidth_monitor.rst:31 ../../bandwidth_monitor.rst:34
#: ../../bandwidth_monitor.rst:24 ../../bandwidth_monitor.rst:27
msgid "The port where to view the ntopng web interface."
msgstr "El puerto donde ver la interfaz web ntopng."

#: ../../bandwidth_monitor.rst:33 ../../bandwidth_monitor.rst:36
#: ../../bandwidth_monitor.rst:26 ../../bandwidth_monitor.rst:29
msgid "Password for 'admin' user"
msgstr "Contraseña para el usuario 'admin'"

#: ../../bandwidth_monitor.rst:33 ../../bandwidth_monitor.rst:36
#: ../../bandwidth_monitor.rst:26 ../../bandwidth_monitor.rst:29
msgid ""
"Admin user password. This password is not related to the |product| admin "
"password."
msgstr ""
"Contraseña del usuario administrador. Esta contraseña no está relacionada "
"con la clave de administrador de |product| ."

#: ../../bandwidth_monitor.rst:35 ../../bandwidth_monitor.rst:38
#: ../../bandwidth_monitor.rst:28 ../../bandwidth_monitor.rst:31
msgid "Interfaces"
msgstr "Interfaces"

#: ../../bandwidth_monitor.rst:36 ../../bandwidth_monitor.rst:39
#: ../../bandwidth_monitor.rst:29 ../../bandwidth_monitor.rst:32
msgid "Interfaces on which ntopng will listens to."
msgstr "Interfaces en las que ntopng escuchará."
11 changes: 7 additions & 4 deletions administrator-manual/en/locale/es/LC_MESSAGES/base_system.po
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-28 16:02+0100\n"
"POT-Creation-Date: 2018-04-17 16:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@gmail.com>, 2018\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 @@ -634,21 +634,24 @@ msgstr "Sitio web http://viewdns.info/"

#: ../../base_system.rst:252 ../../base_system.rst:255
msgid "Disable Let's Encrypt"
msgstr ""
msgstr "Deshabilitar Let's Encrypt"

#: ../../base_system.rst:254 ../../base_system.rst:257
msgid "Let's Encrypt certificate can be disabled following these steps:"
msgstr ""
"El certificado Let's Encrypt se puede deshabilitar siguiendo estos pasos:"

#: ../../base_system.rst:256 ../../base_system.rst:259
msgid ""
"Access the guilabel:`Server certificate` page, set as default the self-"
"signed certificate or an uploaded one"
msgstr ""
"Accede a la página guilabel:`Server certificate` y configura como "
"predeterminado el certificado autofirmado o uno cargado previamente"

#: ../../base_system.rst:257 ../../base_system.rst:260
msgid "Open the shell and execute the following commands:"
msgstr ""
msgstr "Abre el shell y ejecuta los siguientes comandos:"

#: ../../base_system.rst:265 ../../base_system.rst:268
msgid "Shutdown"
Expand Down

0 comments on commit 17686d8

Please sign in to comment.