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 Feb 14, 2018
2 parents 858d423 + 513ef7b commit c54947f
Show file tree
Hide file tree
Showing 27 changed files with 2,719 additions and 286 deletions.
1 change: 1 addition & 0 deletions administrator-manual/en/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
html_favicon = 'nsent/_static/favicon.ico'
html_static_path = ['nsent/_static']
html_extra_path = ['nsent/robots.txt']
exclude_patterns.extend([
'webvirtmgr.rst',
'nscom_*.rst'
Expand Down
1 change: 1 addition & 0 deletions administrator-manual/en/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Modules

backup
mail
mail2
webmail
webtop4
webtop5
Expand Down
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/accounts.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: 2018-01-12 11:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/firewall.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-07-27 15:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/freepbx.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-09-01 14:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
68 changes: 40 additions & 28 deletions administrator-manual/en/locale/es/LC_MESSAGES/hotsync.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-12 12:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -108,7 +108,7 @@ msgid ""
msgstr ""

#: ../../hotsync.rst:50 ../../hotsync.rst:53
msgid "If you want to install Cockpit-based web interface, execute also: ::"
msgid "If you want to tests the Cockpit-based web interface, execute also: ::"
msgstr ""

#: ../../hotsync.rst:55 ../../hotsync.rst:58
Expand All @@ -134,108 +134,120 @@ msgid ""
msgstr ""

#: ../../hotsync.rst:90 ../../hotsync.rst:93
msgid "Restore: put SLAVE in production"
msgid "Enabling/Disabling"
msgstr ""

#: ../../hotsync.rst:92 ../../hotsync.rst:95
msgid "Hotsync is enabled by default. To disable it:"
msgstr ""

#: ../../hotsync.rst:100 ../../hotsync.rst:103
msgid "and to re-enable it:"
msgstr ""

#: ../../hotsync.rst:110 ../../hotsync.rst:113
msgid "Restore: put SLAVE in production"
msgstr ""

#: ../../hotsync.rst:112 ../../hotsync.rst:115
msgid "Switch off MASTER if it's on"
msgstr ""

#: ../../hotsync.rst:93 ../../hotsync.rst:96
#: ../../hotsync.rst:113 ../../hotsync.rst:116
msgid "On SLAVE launch restore command:"
msgstr ""

#: ../../hotsync.rst:100 ../../hotsync.rst:103
#: ../../hotsync.rst:120 ../../hotsync.rst:123
msgid "Don't forget to:"
msgstr ""

#: ../../hotsync.rst:102 ../../hotsync.rst:105
#: ../../hotsync.rst:122 ../../hotsync.rst:125
msgid "connect modem to spare if you have one"
msgstr ""

#: ../../hotsync.rst:103 ../../hotsync.rst:106
#: ../../hotsync.rst:123 ../../hotsync.rst:126
msgid "connect backup HD to spare"
msgstr ""

#: ../../hotsync.rst:104 ../../hotsync.rst:107
#: ../../hotsync.rst:124 ../../hotsync.rst:127
msgid "connect router"
msgstr ""

#: ../../hotsync.rst:106 ../../hotsync.rst:109
#: ../../hotsync.rst:126 ../../hotsync.rst:129
msgid ""
"To put again in production original server, configure it as SLAVE, sync it, "
"switch off current MASTER and restore configuration backup."
msgstr ""

#: ../../hotsync.rst:111 ../../hotsync.rst:114
#: ../../hotsync.rst:131 ../../hotsync.rst:134
msgid "Supported packages"
msgstr ""

#: ../../hotsync.rst:113 ../../hotsync.rst:126 ../../hotsync.rst:116
#: ../../hotsync.rst:129
#: ../../hotsync.rst:133 ../../hotsync.rst:146 ../../hotsync.rst:136
#: ../../hotsync.rst:149
msgid "nethserver-nextcloud"
msgstr ""

#: ../../hotsync.rst:114 ../../hotsync.rst:117
#: ../../hotsync.rst:134 ../../hotsync.rst:137
msgid "nethserver-mysql"
msgstr ""

#: ../../hotsync.rst:115 ../../hotsync.rst:118
#: ../../hotsync.rst:135 ../../hotsync.rst:138
msgid "nethserver-dnsmasq"
msgstr ""

#: ../../hotsync.rst:116 ../../hotsync.rst:119
#: ../../hotsync.rst:136 ../../hotsync.rst:139
msgid "nethserver-squidguard"
msgstr ""

#: ../../hotsync.rst:117 ../../hotsync.rst:120
#: ../../hotsync.rst:137 ../../hotsync.rst:140
msgid "nethserver-pulledpork"
msgstr ""

#: ../../hotsync.rst:118 ../../hotsync.rst:121
#: ../../hotsync.rst:138 ../../hotsync.rst:141
msgid "nethserver-antivirus"
msgstr ""

#: ../../hotsync.rst:119 ../../hotsync.rst:122
#: ../../hotsync.rst:139 ../../hotsync.rst:142
msgid "nethserver-samba-audit"
msgstr ""

#: ../../hotsync.rst:120 ../../hotsync.rst:123
#: ../../hotsync.rst:140 ../../hotsync.rst:143
msgid "nethserver-freepbx > 14.0.3"
msgstr ""

#: ../../hotsync.rst:121 ../../hotsync.rst:124
#: ../../hotsync.rst:141 ../../hotsync.rst:144
msgid "nethserver-webtop5 (z-push state is not synchronized)"
msgstr ""

#: ../../hotsync.rst:122 ../../hotsync.rst:125
#: ../../hotsync.rst:142 ../../hotsync.rst:145
msgid "nethserver-collectd"
msgstr ""

#: ../../hotsync.rst:123 ../../hotsync.rst:126
#: ../../hotsync.rst:143 ../../hotsync.rst:146
msgid "nethserver-cups"
msgstr ""

#: ../../hotsync.rst:124 ../../hotsync.rst:127
#: ../../hotsync.rst:144 ../../hotsync.rst:147
msgid "nethserver-dc"
msgstr ""

#: ../../hotsync.rst:125 ../../hotsync.rst:128
#: ../../hotsync.rst:145 ../../hotsync.rst:148
msgid "nethserver-letsencrypt"
msgstr ""

#: ../../hotsync.rst:127 ../../hotsync.rst:130
#: ../../hotsync.rst:147 ../../hotsync.rst:150
msgid "nethserver-sssd"
msgstr ""

#: ../../hotsync.rst:128 ../../hotsync.rst:131
#: ../../hotsync.rst:148 ../../hotsync.rst:151
msgid "nethserver-directory"
msgstr ""

#: ../../hotsync.rst:129 ../../hotsync.rst:132
#: ../../hotsync.rst:149 ../../hotsync.rst:152
msgid "nethserver-ibays"
msgstr ""

#: ../../hotsync.rst:130 ../../hotsync.rst:133
#: ../../hotsync.rst:150 ../../hotsync.rst:153
msgid "nethserver-mail-server"
msgstr ""
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/index.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: 2018-01-12 11:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
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: 2018-01-12 11:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/mail.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: 2018-01-12 11:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
30 changes: 19 additions & 11 deletions administrator-manual/en/locale/es/LC_MESSAGES/nextcloud.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: 2017-07-27 15:13+0200\n"
"POT-Creation-Date: 2018-02-12 12:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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 @@ -100,11 +100,19 @@ msgstr ""
"instalación de NextCloud. Después de la instalación, se agrega un nuevo "
"widget de aplicación al panel de interfaz web |product|."

#: ../../nextcloud.rst:40 ../../nextcloud.rst:43
#: ../../nextcloud.rst:39 ../../nextcloud.rst:42
msgid ""
"Nextcloud update/upgrade procedure disables the apps to avoid "
"incompatibility problems. Server logs keep track of which apps were "
"disabled. After a successful update/upgrade procedure you can use the "
"Applications page to update and re-enable the apps."
msgstr ""

#: ../../nextcloud.rst:44 ../../nextcloud.rst:47
msgid "User list"
msgstr "Lista de usuarios"

#: ../../nextcloud.rst:42 ../../nextcloud.rst:45
#: ../../nextcloud.rst:46 ../../nextcloud.rst:49
msgid ""
"All users are listed inside the administrator panel of NextCloud using a "
"unique identifier containing letters and numbers. This is because the system"
Expand All @@ -118,7 +126,7 @@ msgstr ""
"duplicados como se informó en la sección `Nombre de usuario interno` de "
"`Official NextCloud documentation <https://docs.nextcloud.com>`_."

#: ../../nextcloud.rst:46 ../../nextcloud.rst:49
#: ../../nextcloud.rst:50 ../../nextcloud.rst:53
msgid ""
"If |product| is bound to a remote Active Directory account provider a "
"dedicated user account in AD is required by the module to be fully "
Expand All @@ -128,30 +136,30 @@ msgstr ""
" necesita una cuenta AD dedicada para que el módulo esté completamente "
"operativo. Ver :ref:`join-existing-ad-section`."

#: ../../nextcloud.rst:51 ../../nextcloud.rst:54
#: ../../nextcloud.rst:55 ../../nextcloud.rst:58
msgid "Trusted Domains"
msgstr "Dominios confiables"

#: ../../nextcloud.rst:53 ../../nextcloud.rst:56
#: ../../nextcloud.rst:57 ../../nextcloud.rst:60
msgid ""
"Trusted domains are a list of domains that users can log into. Default "
"trusted domains are:"
msgstr ""
"Los dominios de confianza son una lista de dominios en los que los usuarios "
"pueden iniciar sesión. Los dominios de confianza predeterminados son:"

#: ../../nextcloud.rst:55 ../../nextcloud.rst:58
#: ../../nextcloud.rst:59 ../../nextcloud.rst:62
msgid "domain name"
msgstr "nombre de dominio"

#: ../../nextcloud.rst:56 ../../nextcloud.rst:59
#: ../../nextcloud.rst:60 ../../nextcloud.rst:63
msgid "ip address"
msgstr "dirección ip"

#: ../../nextcloud.rst:58 ../../nextcloud.rst:61
#: ../../nextcloud.rst:62 ../../nextcloud.rst:65
msgid "To add a new one use: ::"
msgstr "Para añadir uno nuevo use: ::"

#: ../../nextcloud.rst:63 ../../nextcloud.rst:66
#: ../../nextcloud.rst:67 ../../nextcloud.rst:70
msgid "To add more than one, concatenate the names with a comma."
msgstr "Para agregar más de uno, concatene los nombres con una coma."
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/packages.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: 2018-01-12 11:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
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: 2018-01-12 11:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
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: 2018-01-12 11:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
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-07-27 15:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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
2 changes: 1 addition & 1 deletion administrator-manual/en/locale/es/LC_MESSAGES/webmail.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-07-27 15:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: JѳƝ Ҝᶖμ <elnene.jonkiu@gmail.com>, 2017\n"
"Last-Translator: Jon M. <elnene.jonkiu@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

0 comments on commit c54947f

Please sign in to comment.