Skip to content

Commit

Permalink
Merge pull request #409 from NethServer/master
Browse files Browse the repository at this point in the history
Upgrade v7 branch
  • Loading branch information
DavidePrincipi committed Feb 25, 2019
2 parents a1e3278 + 410c84c commit f55d75d
Show file tree
Hide file tree
Showing 12 changed files with 369 additions and 78 deletions.
12 changes: 12 additions & 0 deletions administrator-manual/en/backup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,18 @@ During data transfer, SFTP assures encryption and data is compressed to minimize
Please note that |product| doesn't support links on Samba shares due to security implications.
Also symlinks are not supported on WebDAV.

Command line execution
----------------------

To run a backup from command line, use: ::

backup-data -b <name>

where ``name`` is the name of the backup you want to run.

.. note::
By default, the name of the *first* data backup configured on |product| is ``backup-data``


.. _backup_customization-section:

Expand Down
4 changes: 2 additions & 2 deletions administrator-manual/en/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
# All configuration values have a default; values that are commented out
# serve to show the default.

import sys, os
import sys, os, datetime

try:
import sphinx_rtd_theme
import sphinx_bootstrap_theme
except ImportError:
pass

copyright = u'2018, Nethesis Srl and the NethServer project contributors'
copyright = u'%d, Nethesis Srl and the NethServer project contributors' % datetime.date.today().year

if 'READTHEDOCS_PROJECT' in os.environ and 'cockpit' in os.environ['READTHEDOCS_PROJECT']:
tags.add('cockpit')
Expand Down
8 changes: 4 additions & 4 deletions administrator-manual/en/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ Installing from ISO
Media creation
--------------

**Download the ISO file** from official site |download_site|. The
downloaded ISO file can be used to **create a bootable media** such as
DVD or USB stick.
**Download the latest ISO file** from official site |download_site|.
The downloaded ISO file can be used to **create a bootable media**
such as DVD or USB stick.

USB stick
^^^^^^^^^
Expand All @@ -75,7 +75,7 @@ On a Linux machine, open the shell and execute: ::
dd if=NethServer.iso of=/dev/sdc

Where `NethServer.iso` is the file name of the downloaded ISO and `/dev/sdc` is the
destination device corresponding to the USB key and
destination device corresponding to the USB key and
not a partition (such as /dev/sdc1).

On a Windows machine, make sure to format the USB drive then unmount it.
Expand Down
108 changes: 108 additions & 0 deletions administrator-manual/en/locale/es/LC_MESSAGES/collabora.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# #-#-#-#-# collabora.pot (NethServer 7) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018, Nethesis Srl and the NethServer project contributors
# This file is distributed under the same license as the NethServer package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# #-#-#-#-# collabora.pot (NethServer Enterprise 7) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018, Nethesis Srl and the NethServer project contributors
# This file is distributed under the same license as the NethServer Enterprise package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: NethServer Enterprise 7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-29 09:14+0100\n"
"PO-Revision-Date: 2019-01-29 08:15+0000\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: ../../collabora.rst:5 ../../collabora.rst:16
msgid "Collabora Online"
msgstr ""

#: ../../collabora.rst:9
msgid "This package is not supported in |product| Enterprise"
msgstr ""

#: ../../collabora.rst:13
msgid ""
"Collabora Online is a powerful LibreOffice-based online office that supports"
" all major document, spreadsheet and presentation file formats, which you "
"can integrate in your own infrastructure. Please see the `official website "
"<https://www.collaboraoffice.com/collabora-online/>`_."
msgstr ""

#: ../../collabora.rst:19
msgid "Installation"
msgstr ""

#: ../../collabora.rst:21
msgid "Install from the Software Center or use the command line: ::"
msgstr ""

#: ../../collabora.rst:26
msgid "Virtual host configuration"
msgstr ""

#: ../../collabora.rst:28
msgid ""
"Collabora Online requires a dedicated virtual host and it's only accessible "
"from HTTPS with a valid certificate."
msgstr ""

#: ../../collabora.rst:33
msgid ""
"Collabora Online will **not be enabled** without a dedicated virtual host"
msgstr ""

#: ../../collabora.rst:35
msgid "To configure Collobora Online, execute: ::"
msgstr ""

#: ../../collabora.rst:40
msgid ""
"After virtual host configuration, obtain a valid HTTPS certificate via Let's"
" Encrypt from ``Server certificate`` section of Server Manager interface."
msgstr ""

#: ../../collabora.rst:44
msgid "Usage"
msgstr ""

#: ../../collabora.rst:46
msgid ""
"Collabora Online will be automatically enabled in Nextcloud if the package "
"``nethserver-nextcloud`` is present when the virtual host is configured, "
"otherwise you can enable with: ::"
msgstr ""

#: ../../collabora.rst:52
msgid ""
"If your instance of Nextcloud is not installed in the same server of "
"Collabora Online, you must set the host name of Nextcloud in the prop "
"``AllowWopiHost``: ::"
msgstr ""

#: ../../collabora.rst:58
msgid ""
"And manually configure the Nextcloud `richdocuments app "
"<https://github.com/nextcloud/richdocuments#nextcloud-app>`_."
msgstr ""

#: ../../collabora.rst:61
msgid "Admin user"
msgstr ""

#: ../../collabora.rst:63
msgid ""
"After installation, admin dashboard can be enabled with ``loolconfig set-"
"admin-password`` and accessible at: ::"
msgstr ""
46 changes: 35 additions & 11 deletions administrator-manual/en/locale/it/LC_MESSAGES/access.po
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Translators:
# Davide Principi <davide.principi@nethesis.it>, 2017
# Youssef Mehni <mehniyoussef@gmail.com>, 2018
# Nicola <nicola.rauso@nethesis.it>, 2018
# Nicola <nicola.rauso@nethesis.it>, 2019
#
#, fuzzy
msgid ""
Expand All @@ -22,7 +22,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-28 10:04+0100\n"
"PO-Revision-Date: 2017-02-06 14:48+0000\n"
"Last-Translator: Nicola <nicola.rauso@nethesis.it>, 2018\n"
"Last-Translator: Nicola <nicola.rauso@nethesis.it>, 2019\n"
"Language-Team: Italian (https://www.transifex.com/nethserver/teams/35834/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -77,86 +77,107 @@ msgid ""
"installed on the system. After logging in, go to the :ref:`software-center-"
"section` page to install additional languages."
msgstr ""
"La pagina di accesso consente di selezionare una lingua alternativa tra "
"quelle già installate sul sistema. Dopo aver effettuato l'accesso, spostarsi"
" alla pagina: ref:`software-center-section` per installare altre lingue."

#: ../../access.rst:29
msgid ""
"The login page will give you a trusted access to the web interface. Log in "
"as **root** and type the password chosen during |product| installation."
msgstr ""
"La pagina di accesso fornirà un accesso affidabile all'interfaccia web. "
"Accedere come **root** digitando la password scelta durante l'installazione "
"di |product|."

#: ../../access.rst:34
msgid ""
"The *unattended* install procedure sets the root password to the default "
"``Nethesis,1234``."
msgstr ""
"La procedura di installazione *unattended* imposta la password di root al "
"valore predefinito ``Nethesis,1234``."

#: ../../access.rst:40
msgid "First configuration wizard"
msgstr ""
msgstr "Wizard di prima configurazione"

#: ../../access.rst:42
msgid ""
"The first time **root** logs in, the *First configuration wizard* procedure "
"is displayed."
msgstr ""
"La prima volta che viene eseguito l'accesso con l'utente **root**, viene "
"visualizzato il *Wizard di prima configurazione*."

#: ../../access.rst:45
msgid ""
"If the root password is still at the default value, a password change is "
"required."
msgstr ""
"Se la password di root è ancora quella predefinita, è necessario "
"modificarla."

#: ../../access.rst:47
msgid ""
"It is possible to restore a **configuration backup**. Refer to :ref"
":`disaster-recovery-section` for more information."
msgstr ""
"Il Wizard di prima configurazione consente di ripristinare un *backup della "
"configurazione*. Fare rifermento alla sezione :ref:`disaster-recovery-"
"section` per maggiori dettagli."

#: ../../access.rst:50
msgid "Otherwise the wizard procedure helps on setting up:"
msgstr ""
msgstr "In alternativa il Wizard consente di configurare:"

#: ../../access.rst:52
msgid "Host name"
msgstr ""
msgstr "Nome host"

#: ../../access.rst:53
msgid ":ref:`Date and time zone <date-time-section>`"
msgstr ""
msgstr ":ref:`Data e fuso orario<date-time-section>`"

#: ../../access.rst:54
msgid "SSH port"
msgstr ""
msgstr "Porta SSH"

#: ../../access.rst:55
msgid ":ref:`Smarthost configuration <smarthost-configuration>`"
msgstr ""
msgstr ":ref:`Configurazione smarthost <smarthost-configuration>`"

#: ../../access.rst:56
msgid ":ref:`Usage statistics <phonehome-section>`"
msgstr ""
msgstr ":ref:`Statistiche d'utilizzo <phonehome-section>`"

#: ../../access.rst:59
msgid "Change the current password"
msgstr ""
msgstr "Cambiare la password attuale"

#: ../../access.rst:61
msgid ""
"You can change the root password from the web interface by going to the "
":guilabel:`root@host.domain.com` label on the upper right corner of the "
"screen and clicking on :guilabel:`Profile`."
msgstr ""
"Si può modificare la password di root dall'interfaccia web andando "
"sull'etichetta :guilabel:`root@host.domain.com`, nell'angolo in alto a "
"destra dello schermo, e cliccando su :guilabel:`Profilo`."

#: ../../access.rst:67
msgid "Logout"
msgstr ""
msgstr "Logout"

#: ../../access.rst:69
msgid ""
"Terminate the current Server Manager session by going to the "
":guilabel:`root@host.domain.com` label on the upper right corner of the "
"screen and by clicking on :guilabel:`Logout`."
msgstr ""
"Per terminare la sessione corrente del Server Manager andare sull'etichetta "
":guilabel:`root@host.domain.com` nell'angolo in alto a destra dello schermo "
"e cliccare su :guilabel:`Logout`."

#: ../../access.rst:76
msgid "Session timeouts"
Expand All @@ -168,6 +189,9 @@ msgid ""
"terminates after **60 minutes of inactivity** (idle timeout) and **expires 8"
" hours after the login** (session life time)."
msgstr ""
"Di default (a partire da |product| 7.5.1804), una sessione Server Manager "
"viene terminata dopo **60 minuti di inattività** (idle timeout) e **scade 8 "
"ore dopo il login** (session life time)."

#: ../../access.rst:82
msgid ""
Expand Down

0 comments on commit f55d75d

Please sign in to comment.