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 Mar 7, 2018
2 parents b822167 + 5a5f4bf commit 23db49c
Show file tree
Hide file tree
Showing 168 changed files with 589 additions and 212 deletions.
13 changes: 13 additions & 0 deletions administrator-manual/en/base_system.rst
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,19 @@ configuring the network clients to use it. As alternatives, the
.. [#CSM] Website http://www.canyouseeme.org/
.. [#VDNS] Website http://viewdns.info/
Disable Let's Encrypt
---------------------

Let's Encrypt certificate can be disabled following these steps:

1. Access the guilabel:`Server certificate` page, set as default the self-signed certificate or an uploaded one
2. Open the shell and execute the following commands:

::

rm -rf /etc/letsencrypt/*
config setprop pki LetsEncryptDomains ''

Shutdown
========

Expand Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/access.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Martin Abeleira <mabeleira@gmail.com>, 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/backup.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-02-28 16:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Rubén Rothermel <ruben_rothermel@yahoo.com>, 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand Down
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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
54 changes: 36 additions & 18 deletions administrator-manual/en/locale/es/LC_MESSAGES/base_system.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down Expand Up @@ -633,10 +633,28 @@ msgid "Website http://viewdns.info/"
msgstr "Sitio web http://viewdns.info/"

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

#: ../../base_system.rst:254 ../../base_system.rst:257
msgid "Let's Encrypt certificate can be disabled following these steps:"
msgstr ""

#: ../../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 ""

#: ../../base_system.rst:257 ../../base_system.rst:260
msgid "Open the shell and execute the following commands:"
msgstr ""

#: ../../base_system.rst:265 ../../base_system.rst:268
msgid "Shutdown"
msgstr "Apagar"

#: ../../base_system.rst:254 ../../base_system.rst:257
#: ../../base_system.rst:267 ../../base_system.rst:270
msgid ""
"The machine where |product| is installed can be rebooted or halted from the "
":menuselection:`Shutdown` page. Choose an option (reboot or halt) then click"
Expand All @@ -646,18 +664,18 @@ msgstr ""
"desde la página :menuselection:`Apagar`. Seleccione una opción (reiniciar o "
"detener) y, a continuación, haga clic en el botón Enviar."

#: ../../base_system.rst:257 ../../base_system.rst:260
#: ../../base_system.rst:270 ../../base_system.rst:273
msgid ""
"Always use this module to avoid bad shutdown which can cause data damages."
msgstr ""
"Utilice siempre este módulo para evitar un apagado incorrecto que pueda "
"causar daños en los datos."

#: ../../base_system.rst:260 ../../base_system.rst:263
#: ../../base_system.rst:273 ../../base_system.rst:276
msgid "Log viewer"
msgstr "Visor de registro"

#: ../../base_system.rst:262 ../../base_system.rst:265
#: ../../base_system.rst:275 ../../base_system.rst:278
msgid ""
"All services will save operations inside files called :dfn:`logs`. The "
":index:`log` analysis is the main tool to find and resolve problems. To "
Expand All @@ -668,27 +686,27 @@ msgstr ""
"principal para encontrar y resolver problemas. Para analizar los archivos de"
" registro, haga clic en :menuselection:`Visor de registro`."

#: ../../base_system.rst:266 ../../base_system.rst:269
#: ../../base_system.rst:279 ../../base_system.rst:282
msgid "This module allows to:"
msgstr "Este módulo permite:"

#: ../../base_system.rst:268 ../../base_system.rst:271
#: ../../base_system.rst:281 ../../base_system.rst:284
msgid "start search on all server's logs"
msgstr "Iniciar la búsqueda en todos los registros del servidor"

#: ../../base_system.rst:269 ../../base_system.rst:272
#: ../../base_system.rst:282 ../../base_system.rst:285
msgid "display a single log"
msgstr "Mostrar un solo registro"

#: ../../base_system.rst:270 ../../base_system.rst:273
#: ../../base_system.rst:283 ../../base_system.rst:286
msgid "follow the content of a log in real time"
msgstr "Seguir el contenido de un registro en tiempo real"

#: ../../base_system.rst:275 ../../base_system.rst:278
#: ../../base_system.rst:288 ../../base_system.rst:291
msgid "Date and time"
msgstr "Fecha y hora"

#: ../../base_system.rst:277 ../../base_system.rst:280
#: ../../base_system.rst:290 ../../base_system.rst:293
msgid ""
"After installation, make sure the server is configured with the correct "
"timezone. The machine clock can be configured manually or automatically "
Expand All @@ -698,7 +716,7 @@ msgstr ""
" la zona horaria correcta. El reloj de la máquina puede configurarse manual "
"o automáticamente utilizando servidores públicos NTP (de preferencia)."

#: ../../base_system.rst:280 ../../base_system.rst:283
#: ../../base_system.rst:293 ../../base_system.rst:296
msgid ""
"The machine clock is very important in many protocols. To avoid problems, "
"all hosts in LAN can be configured to use the server as NTP server."
Expand All @@ -707,11 +725,11 @@ msgstr ""
"problemas, todos los hosts en LAN se pueden configurar para utilizar el "
"servidor como servidor NTP."

#: ../../base_system.rst:284 ../../base_system.rst:287
#: ../../base_system.rst:297 ../../base_system.rst:300
msgid "Inline help"
msgstr "Ayuda en línea"

#: ../../base_system.rst:286 ../../base_system.rst:289
#: ../../base_system.rst:299 ../../base_system.rst:302
msgid ""
"All packages inside the Server Manager contain an :index:`inline help`. The "
"inline help explains how the module works and all available options."
Expand All @@ -720,24 +738,24 @@ msgstr ""
":index:`ayuda en línea`. La ayuda en línea explica cómo funciona el módulo y"
" todas las opciones disponibles."

#: ../../base_system.rst:289 ../../base_system.rst:292
#: ../../base_system.rst:302 ../../base_system.rst:305
msgid "These help pages are available in all Server Manager's languages."
msgstr ""
"Estas páginas de ayuda están disponibles en todos los idiomas del "
"Administrador de servidores."

#: ../../base_system.rst:291 ../../base_system.rst:294
#: ../../base_system.rst:304 ../../base_system.rst:307
msgid ""
"A list of all available inline help pages can be found at the address: ::"
msgstr ""
"Puede encontrar una lista de todas las páginas de ayuda en línea disponibles"
" en la dirección: ::"

#: ../../base_system.rst:295 ../../base_system.rst:298
#: ../../base_system.rst:308 ../../base_system.rst:311
msgid "**Example**"
msgstr "**Ejemplo**"

#: ../../base_system.rst:297 ../../base_system.rst:300
#: ../../base_system.rst:310 ../../base_system.rst:313
msgid ""
"If the server has address ``192.168.1.2``, and you want to see all English "
"help pages, use this address: ::"
Expand Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/chat.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: 2017-10-09 17:25+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Jose G. Jimenez S. <josegjimenez@gmail.com>, 2017\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
Expand Down
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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/dhcp.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/dns.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/ftp.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/hotspot.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/license.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/migration.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-28 16:02+0100\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 Down

0 comments on commit 23db49c

Please sign in to comment.