Merged 2.1 changes

This commit is contained in:
Adolfo Gómez García 2017-01-10 02:24:04 +01:00
commit bf131f896c
27 changed files with 407 additions and 428 deletions

1
actors/.gitignore vendored
View File

@ -6,3 +6,4 @@ udsactor*.changes
/udsactor_1.7.0.dsc
/udsactor_1.7.0.tar.xz
/udsactor*.rpm
/udsactor_2.1.0_amd64.buildinfo

View File

@ -1,3 +0,0 @@
udsactor-nx_2.1.0_all.deb x11 optional
udsactor-xrdp_2.1.0_all.deb x11 optional
udsactor_2.1.0_all.deb admin optional

View File

@ -44,9 +44,14 @@ from udsactor.linux.daemon import Daemon
from udsactor.linux import renamer
import sys
import time
import os
import stat
import subprocess
POST_CMD = '/etc/udsactor/post'
try:
from prctl import set_proctitle
from prctl import set_proctitle # @UnresolvedImport
except Exception: # Platform may not include prctl, so in case it's not available, we let the "name" as is
def set_proctitle(_):
pass
@ -106,6 +111,21 @@ class UDSActorSvc(Daemon, CommonService):
logger.debug('Reboot has been requested, stopping service')
return
# Execute script in /etc/udsactor/post after interacting with broker, if no reboot is requested ofc
# This will be executed only when machine gets "ready"
try:
if os.path.isfile(POST_CMD):
if (os.stat(POST_CMD).st_mode & stat.S_IXUSR) != 0:
subprocess.call('/etc/udsactor/post')
else:
logger.info('POST file exists but it it is not executable (needs execution permission by root)')
else:
logger.info('POST file not found & not executed')
except Exception as e:
# Ignore output of execution command
logger.error('Executing post command give')
self.initIPC()
# *********************

View File

@ -59,7 +59,7 @@ class Authenticators(ModelHandler):
{'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
{'comments': {'title': _('Comments')}},
{'priority': {'title': _('Priority'), 'type': 'numeric', 'width': '5em'}},
{'small_name': {'title': _('Tag')}},
{'small_name': {'title': _('Label')}},
{'users_count': {'title': _('Users'), 'type': 'numeric', 'width': '5em'}},
{'tags': {'title': _('tags'), 'visible': False}},
]

View File

@ -188,7 +188,7 @@ class Services(DetailHandler): # pylint: disable=too-many-public-methods
{'name': {'title': _('Service name'), 'visible': True, 'type': 'iconType'}},
{'comments': {'title': _('Comments')}},
{'type_name': {'title': _('Type')}},
{'deployed_services_count': {'title': _('Deployed services'), 'type': 'numeric'}},
{'deployed_services_count': {'title': _('Services Pools'), 'type': 'numeric'}},
{'user_services_count': {'title': _('User services'), 'type': 'numeric'}},
{'tags': {'title': _('tags'), 'visible': False}},
]

View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"PO-Revision-Date: 2016-07-26 11:43+0000\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-07-28 11:21+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: German (http://www.transifex.com/openuds/openuds/language/"
"de/)\n"
@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: REST/methods/actor.py:97 REST/methods/client.py:92
#: REST/methods/actor.py:94 REST/methods/client.py:92
#: REST/methods/client.py:109
msgid "Correct"
msgstr "Korrigieren"
#: REST/methods/actor.py:107
#: REST/methods/actor.py:104
msgid "Invalid key"
msgstr "Ungültiger Schlüssel"
#: REST/methods/actor.py:172
#: REST/methods/actor.py:166
msgid "Unmanaged host"
msgstr "Nicht verwalteter host"
#: REST/methods/actor.py:204 web/errors.py:79
#: REST/methods/actor.py:198 web/errors.py:79
msgid "User service not found"
msgstr "Benutzer-Dienst nicht gefunden"
@ -1776,27 +1776,27 @@ msgstr ""
"benennt Maschine und Benachrichtigen Sie Zustand)"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
#: osmanagers/WindowsOsManager/WindowsOsManager.py:50
msgid "On Logout"
msgstr "Beim Abmelden"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:62
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
msgid "What to do when user logs out from service"
msgstr "Was tun, wenn der Benutzer abmeldet vom Dienst"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:64
#: osmanagers/WindowsOsManager/WindowsOsManager.py:58
#: osmanagers/WindowsOsManager/WindowsOsManager.py:55
msgid "Keep service assigned"
msgstr "Halten Sie Dienst zugewiesen"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
msgid "Remove service"
msgstr "Basisdienst"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:62
msgid "Max.Idle time"
msgstr "Max.Idle Zeit"
@ -2006,11 +2006,11 @@ msgstr "Aktuelle (Vorlage) Kennwort des Benutzerkontos"
msgid "Must provide a password for the account!!!"
msgstr "Muss ein Kennwort für das Konto angeben!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:46
#: osmanagers/WindowsOsManager/WindowsOsManager.py:43
msgid "Windows Basic OS Manager"
msgstr "Grundlegende Windows-OS-Manager"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:48
#: osmanagers/WindowsOsManager/WindowsOsManager.py:45
msgid ""
"Os Manager to control windows machines without domain. (Basically renames "
"machine)"
@ -2018,7 +2018,7 @@ msgstr ""
"OS-Manager, um Windows-Rechner ohne Domäne steuern. (Im Grunde benennt "
"Maschine)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:67
msgid ""
"Maximum idle time (in seconds) before session is automaticatlly closed to "
"the user (<= 0 means no max. idle time)"
@ -2026,11 +2026,11 @@ msgstr ""
"Maximale Leerlaufzeit (in Sekunden) vor der Sitzung ist Automaticatlly "
"geschlossen der Benutzer (< = 0 bedeutet keine max. idle-Zeit)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:79
#: osmanagers/WindowsOsManager/WindowsOsManager.py:76
msgid "Length must be numeric!!"
msgstr "Länge muss numerisch sein!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:81
#: osmanagers/WindowsOsManager/WindowsOsManager.py:78
msgid "Length must be betwen 1 and 6"
msgstr "Die Länge muss zwischen 1 und 6 sein."
@ -3718,15 +3718,13 @@ msgid "Or download another version"
msgstr "Oder laden Sie eine andere version"
#: templates/uds/html5/download_client.html:15
#| msgid ""
#| "In case that your platform has been incorrectly detected, you can "
#| "download manually the version required for your Operating System"
#: templates/uds/semantic/download_client.html:15
msgid ""
"If your platform couldnt be detected correctly, you can manually download "
"the version required for your Operating System."
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Wenn Ihre Plattform konnte nicht korrekt erkannt werden, können Sie manuell herunterladen "
"die Version für Ihr Betriebssystem erforderlich."
"Im Fall, dass Ihre Plattform falsch erkannt wurde können Sie herunterladen "
"manuell die Version für Ihr Betriebssystem erforderlich"
#: templates/uds/html5/download_client.html:19
#: templates/uds/semantic/download_client.html:19
@ -3744,15 +3742,14 @@ msgid "Mac OSX (>10.5) UDS plugin"
msgstr "Mac OSX (> 10.5) UDS-Plugin"
#: templates/uds/html5/download_client.html:35
#| msgid ""
#| "If you already have UDS Plugin installed but this message persists to "
#| "appear, you can disable automatic detection here"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed and you can still see this message, "
"you can disable automatic detection here."
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Wenn Sie bereits können UDS Plugin installiert und Sie immer noch diese Meldung sehen, "
"Sie können hier automatische Erkennung deaktivieren."
"Wenn Sie bereits UDS-Plugin installiert haben, aber diese Meldung weiterhin "
"angezeigt wird angezeigt werden, können Sie die automatischen Erkennung hier "
"deaktivieren"
#: templates/uds/html5/download_client.html:39
#: templates/uds/semantic/download_client.html:39
@ -3774,15 +3771,13 @@ msgstr ""
"Seite ausgelöst wird wieder im Fall müssen Sie nicht das Plugin installiert."
#: templates/uds/html5/download_client.html:45
#| msgid ""
#| "In this case, you will have to manually download the plugin by using the "
#| "menu on upper right corner."
#: templates/uds/semantic/download_client.html:45
msgid ""
"Hence, you will have to manually download the plugin by using the menu on "
"upper right corner."
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"Daher müssen Sie manuell das Plugin herunterladen mithilfe des Menüs auf "
"rechten oberen Ecke."
"In diesem Fall müssen Sie manuell das Plugin herunterladen mithilfe der Menü "
"auf der rechten oberen Ecke."
#: templates/uds/html5/download_client.html:47
#: templates/uds/semantic/download_client.html:47
@ -4051,31 +4046,6 @@ msgstr ""
"Wenn Sie festgestellt, dass wir verpasst zu erwähnen eine beliebige "
"Komponente, informieren Sie uns bitte"
#: templates/uds/semantic/download_client.html:15
msgid ""
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Im Fall, dass Ihre Plattform falsch erkannt wurde können Sie herunterladen "
"manuell die Version für Ihr Betriebssystem erforderlich"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Wenn Sie bereits UDS-Plugin installiert haben, aber diese Meldung weiterhin "
"angezeigt wird angezeigt werden, können Sie die automatischen Erkennung hier "
"deaktivieren"
#: templates/uds/semantic/download_client.html:45
msgid ""
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"In diesem Fall müssen Sie manuell das Plugin herunterladen mithilfe der Menü "
"auf der rechten oberen Ecke."
#: templates/uds/semantic/index.html:23
msgid "Administrator info"
msgstr "Administrator-info"
@ -4506,10 +4476,11 @@ msgstr "Alsa verwenden"
#: transports/RDP/BaseRDPTransport.py:74
#: transports/RDS_enterprise/BaseRDSTransport.py:74
msgid "If checked, Linux client will try to use alsa, pulse if not"
msgid ""
"If checked, Linux client will try to use ALSA, otherwise Pulse will be used"
msgstr ""
"Wenn diese Option aktiviert, werden die Linux-Client versuchen, nutzen Alsa, "
"Puls, wenn nicht"
"Wenn diese Option aktiviert, Linux-Client versucht, ALSA verwenden, sonst "
"wird Puls verwendet werden"
#: transports/RDP/RDPTransport.py:55
msgid "RDP Transport (direct)"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-04-20 13:25+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: German (http://www.transifex.com/openuds/openuds/language/"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,20 +17,20 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: REST/methods/actor.py:97 REST/methods/client.py:92
#: REST/methods/actor.py:94 REST/methods/client.py:92
#: REST/methods/client.py:109
msgid "Correct"
msgstr ""
#: REST/methods/actor.py:107
#: REST/methods/actor.py:104
msgid "Invalid key"
msgstr ""
#: REST/methods/actor.py:172
#: REST/methods/actor.py:166
msgid "Unmanaged host"
msgstr ""
#: REST/methods/actor.py:204 web/errors.py:79
#: REST/methods/actor.py:198 web/errors.py:79
msgid "User service not found"
msgstr ""
@ -1704,27 +1704,27 @@ msgid ""
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
#: osmanagers/WindowsOsManager/WindowsOsManager.py:50
msgid "On Logout"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:62
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
msgid "What to do when user logs out from service"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:64
#: osmanagers/WindowsOsManager/WindowsOsManager.py:58
#: osmanagers/WindowsOsManager/WindowsOsManager.py:55
msgid "Keep service assigned"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
msgid "Remove service"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:62
msgid "Max.Idle time"
msgstr ""
@ -1913,27 +1913,27 @@ msgstr ""
msgid "Must provide a password for the account!!!"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:46
#: osmanagers/WindowsOsManager/WindowsOsManager.py:43
msgid "Windows Basic OS Manager"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:48
#: osmanagers/WindowsOsManager/WindowsOsManager.py:45
msgid ""
"Os Manager to control windows machines without domain. (Basically renames "
"machine)"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:67
msgid ""
"Maximum idle time (in seconds) before session is automaticatlly closed to "
"the user (<= 0 means no max. idle time)"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:79
#: osmanagers/WindowsOsManager/WindowsOsManager.py:76
msgid "Length must be numeric!!"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:81
#: osmanagers/WindowsOsManager/WindowsOsManager.py:78
msgid "Length must be betwen 1 and 6"
msgstr ""
@ -3581,9 +3581,10 @@ msgid "Or download another version"
msgstr ""
#: templates/uds/html5/download_client.html:15
#: templates/uds/semantic/download_client.html:15
msgid ""
"If your platform couldnt be detected correctly, you can manually download "
"the version required for your Operating System."
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
#: templates/uds/html5/download_client.html:19
@ -3602,9 +3603,10 @@ msgid "Mac OSX (>10.5) UDS plugin"
msgstr ""
#: templates/uds/html5/download_client.html:35
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed and you can still see this message, "
"you can disable automatic detection here."
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
#: templates/uds/html5/download_client.html:39
@ -3625,9 +3627,10 @@ msgid ""
msgstr ""
#: templates/uds/html5/download_client.html:45
#: templates/uds/semantic/download_client.html:45
msgid ""
"Hence, you will have to manually download the plugin by using the menu on "
"upper right corner."
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
#: templates/uds/html5/download_client.html:47
@ -3879,24 +3882,6 @@ msgid ""
"If you found that we missed to mention any component, please let us know"
msgstr ""
#: templates/uds/semantic/download_client.html:15
msgid ""
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
#: templates/uds/semantic/download_client.html:45
msgid ""
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
#: templates/uds/semantic/index.html:23
msgid "Administrator info"
msgstr ""

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

View File

@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"PO-Revision-Date: 2016-07-26 11:44+0000\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-07-28 11:21+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Spanish (http://www.transifex.com/openuds/openuds/language/"
"es/)\n"
@ -24,20 +24,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: REST/methods/actor.py:97 REST/methods/client.py:92
#: REST/methods/actor.py:94 REST/methods/client.py:92
#: REST/methods/client.py:109
msgid "Correct"
msgstr "Correcto"
#: REST/methods/actor.py:107
#: REST/methods/actor.py:104
msgid "Invalid key"
msgstr "Clave no válida"
#: REST/methods/actor.py:172
#: REST/methods/actor.py:166
msgid "Unmanaged host"
msgstr "Host no administrado"
#: REST/methods/actor.py:204 web/errors.py:79
#: REST/methods/actor.py:198 web/errors.py:79
msgid "User service not found"
msgstr "Servicio de usuario no encontrado"
@ -1777,27 +1777,27 @@ msgstr ""
"máquinas y notifica los estados)"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
#: osmanagers/WindowsOsManager/WindowsOsManager.py:50
msgid "On Logout"
msgstr "Al salir"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:62
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
msgid "What to do when user logs out from service"
msgstr "Qué hacer cuando el usuario cierra la sesión del servicio"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:64
#: osmanagers/WindowsOsManager/WindowsOsManager.py:58
#: osmanagers/WindowsOsManager/WindowsOsManager.py:55
msgid "Keep service assigned"
msgstr "Mantener el servicio asignado"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
msgid "Remove service"
msgstr "Eliminar servicio"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:62
msgid "Max.Idle time"
msgstr "Tiempo máx de inactividad"
@ -2008,11 +2008,11 @@ msgstr "Contraseña actual (plantilla) de la cuenta de usuario"
msgid "Must provide a password for the account!!!"
msgstr "¡Debe indicar una contraseña para la cuenta!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:46
#: osmanagers/WindowsOsManager/WindowsOsManager.py:43
msgid "Windows Basic OS Manager"
msgstr "OS Manager para Windows Básico"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:48
#: osmanagers/WindowsOsManager/WindowsOsManager.py:45
msgid ""
"Os Manager to control windows machines without domain. (Basically renames "
"machine)"
@ -2020,7 +2020,7 @@ msgstr ""
"OS Manager para controlar máquinas Windows sin dominio. (Básicamente "
"renombra las máquinas)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:67
msgid ""
"Maximum idle time (in seconds) before session is automaticatlly closed to "
"the user (<= 0 means no max. idle time)"
@ -2029,11 +2029,11 @@ msgstr ""
"automáticamente para el usuario (< = 0 significa sin tiempo máx. de "
"inactividad)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:79
#: osmanagers/WindowsOsManager/WindowsOsManager.py:76
msgid "Length must be numeric!!"
msgstr "¡La longitud debe ser numérica!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:81
#: osmanagers/WindowsOsManager/WindowsOsManager.py:78
msgid "Length must be betwen 1 and 6"
msgstr "La longitud debe estar entre 1 y 6"
@ -3166,8 +3166,8 @@ msgid ""
"If more than one interface is found in machine, use the first found on this "
"network as main"
msgstr ""
"Si más de una interfaz se encuentra en la máquina, utilice el primero "
"encontrado en este red como principal"
"Si la máquina tiene más de una interfaz, utilice la primera de esta red como "
"la principal"
#: services/Vmware_enterprise/VCLinkedCloneService.py:86
msgid "Clones Folder"
@ -3691,7 +3691,7 @@ msgstr "UDS ha sido desarrollado utilizando estos componentes:"
#: templates/uds/html5/about.html:40
msgid "If you find that we missed any component, please let us know"
msgstr ""
"Si usted encuentra que perdimos cualquier componente, por favor háganoslo "
"Si descubre que nos hemos olvidado algún componente, por favor háganoslo "
"saber"
#: templates/uds/html5/about.html:41
@ -3726,15 +3726,13 @@ msgid "Or download another version"
msgstr "O descargar otra versión"
#: templates/uds/html5/download_client.html:15
#| msgid ""
#| "In case that your platform has been incorrectly detected, you can "
#| "download manually the version required for your Operating System"
#: templates/uds/semantic/download_client.html:15
msgid ""
"If your platform couldnt be detected correctly, you can manually download "
"the version required for your Operating System."
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Si su plataforma no se detecta correctamente, usted puede descargar manualmente "
"la versión para tu sistema operativo."
"En caso que su plataforma no haya sido bien detectada, puede descargar "
"manualmente la versión necesaria para su sistema operativo"
#: templates/uds/html5/download_client.html:19
#: templates/uds/semantic/download_client.html:19
@ -3752,15 +3750,13 @@ msgid "Mac OSX (>10.5) UDS plugin"
msgstr "Plugin UDS Mac OSX (> 10.5) "
#: templates/uds/html5/download_client.html:35
#| msgid ""
#| "If you already have UDS Plugin installed but this message persists to "
#| "appear, you can disable automatic detection here"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed and you can still see this message, "
"you can disable automatic detection here."
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Si ya tienes instalado el Plugin UDS y todavía se puede ver este mensaje, "
"para deshabilitar la detección automática aquí."
"Si ya tienes instalado el Plugin UDS pero este mensaje sigue apareciendo, "
"puede desactivar la detección automática aquí"
#: templates/uds/html5/download_client.html:39
#: templates/uds/semantic/download_client.html:39
@ -3782,15 +3778,13 @@ msgstr ""
"página no se volverá a activar si no tiene el plugin instalado."
#: templates/uds/html5/download_client.html:45
#| msgid ""
#| "In this case, you will have to manually download the plugin by using the "
#| "menu on upper right corner."
#: templates/uds/semantic/download_client.html:45
msgid ""
"Hence, you will have to manually download the plugin by using the menu on "
"upper right corner."
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"Por lo tanto, usted tendrá que descargar manualmente el plugin mediante el menú en "
"esquina superior derecha."
"En este caso, tendrá que descargar el plugin manualmente usando el menú de "
"la esquina superior derecha."
#: templates/uds/html5/download_client.html:47
#: templates/uds/semantic/download_client.html:47
@ -4057,30 +4051,6 @@ msgid ""
msgstr ""
"Si ve que nos hemos dejado algún componente, háganoslo saber, por favor"
#: templates/uds/semantic/download_client.html:15
msgid ""
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"En caso que su plataforma no haya sido bien detectada, puede descargar "
"manualmente la versión necesaria para su sistema operativo"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Si ya tienes instalado el Plugin UDS pero este mensaje sigue apareciendo, "
"puede desactivar la detección automática aquí"
#: templates/uds/semantic/download_client.html:45
msgid ""
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"En este caso, tendrá que descargar el plugin manualmente usando el menú de "
"la esquina superior derecha."
#: templates/uds/semantic/index.html:23
msgid "Administrator info"
msgstr "Información del administrador"
@ -4494,7 +4464,7 @@ msgstr "Sincronización multimedia"
#: transports/RDS_enterprise/BaseRDSTransport.py:73
msgid "If checked. Linux client will use multimedia parameter for xfreerdp"
msgstr ""
"Si está marcada. Cliente Linux usará el parámetro multimedia para xfreerdp"
"Si está marcada, el cliente Linux usará el parámetro multimedia para xfreerdp"
#: transports/RDP/BaseRDPTransport.py:74
#: transports/RDS_enterprise/BaseRDSTransport.py:74
@ -4503,8 +4473,11 @@ msgstr "Use ALSA"
#: transports/RDP/BaseRDPTransport.py:74
#: transports/RDS_enterprise/BaseRDSTransport.py:74
msgid "If checked, Linux client will try to use alsa, pulse if not"
msgstr "Si, Linux cliente intentará usar alsa, pulso si no"
msgid ""
"If checked, Linux client will try to use ALSA, otherwise Pulse will be used"
msgstr ""
"Si está marcado, el cliente Linux intentará usar ALSA, en caso contrario "
"usará Pulse"
#: transports/RDP/RDPTransport.py:55
msgid "RDP Transport (direct)"
@ -4766,7 +4739,7 @@ msgid ""
msgstr ""
"Este servicio está a punto de ser reemplazado por una nueva versión. Por "
"favor, cierre la sesión antes de {} y guarde todo su trabajo para evitar "
"perderla."
"perderlo."
#: web/views/service.py:115
msgid "Service not ready. Please, try again in a while."

View File

@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-04-20 13:25+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Spanish (http://www.transifex.com/openuds/openuds/language/"

View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"PO-Revision-Date: 2016-07-26 11:36+0000\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-07-28 11:21+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Basque (http://www.transifex.com/openuds/openuds/language/"
"eu/)\n"
@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: REST/methods/actor.py:97 REST/methods/client.py:92
#: REST/methods/actor.py:94 REST/methods/client.py:92
#: REST/methods/client.py:109
msgid "Correct"
msgstr "zuzena"
#: REST/methods/actor.py:107
#: REST/methods/actor.py:104
msgid "Invalid key"
msgstr ""
#: REST/methods/actor.py:172
#: REST/methods/actor.py:166
msgid "Unmanaged host"
msgstr ""
#: REST/methods/actor.py:204 web/errors.py:79
#: REST/methods/actor.py:198 web/errors.py:79
msgid "User service not found"
msgstr "ez aurkitutako erabiltzaile-zerbitzua"
@ -1706,27 +1706,27 @@ msgid ""
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
#: osmanagers/WindowsOsManager/WindowsOsManager.py:50
msgid "On Logout"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:62
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
msgid "What to do when user logs out from service"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:64
#: osmanagers/WindowsOsManager/WindowsOsManager.py:58
#: osmanagers/WindowsOsManager/WindowsOsManager.py:55
msgid "Keep service assigned"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
msgid "Remove service"
msgstr ""
#: osmanagers/LinuxOsManager/LinuxOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:62
msgid "Max.Idle time"
msgstr ""
@ -1915,27 +1915,27 @@ msgstr ""
msgid "Must provide a password for the account!!!"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:46
#: osmanagers/WindowsOsManager/WindowsOsManager.py:43
msgid "Windows Basic OS Manager"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:48
#: osmanagers/WindowsOsManager/WindowsOsManager.py:45
msgid ""
"Os Manager to control windows machines without domain. (Basically renames "
"machine)"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:67
msgid ""
"Maximum idle time (in seconds) before session is automaticatlly closed to "
"the user (<= 0 means no max. idle time)"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:79
#: osmanagers/WindowsOsManager/WindowsOsManager.py:76
msgid "Length must be numeric!!"
msgstr ""
#: osmanagers/WindowsOsManager/WindowsOsManager.py:81
#: osmanagers/WindowsOsManager/WindowsOsManager.py:78
msgid "Length must be betwen 1 and 6"
msgstr ""
@ -3583,9 +3583,10 @@ msgid "Or download another version"
msgstr ""
#: templates/uds/html5/download_client.html:15
#: templates/uds/semantic/download_client.html:15
msgid ""
"If your platform couldnt be detected correctly, you can manually download "
"the version required for your Operating System."
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
#: templates/uds/html5/download_client.html:19
@ -3604,9 +3605,10 @@ msgid "Mac OSX (>10.5) UDS plugin"
msgstr ""
#: templates/uds/html5/download_client.html:35
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed and you can still see this message, "
"you can disable automatic detection here."
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
#: templates/uds/html5/download_client.html:39
@ -3627,9 +3629,10 @@ msgid ""
msgstr ""
#: templates/uds/html5/download_client.html:45
#: templates/uds/semantic/download_client.html:45
msgid ""
"Hence, you will have to manually download the plugin by using the menu on "
"upper right corner."
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
#: templates/uds/html5/download_client.html:47
@ -3881,24 +3884,6 @@ msgid ""
"If you found that we missed to mention any component, please let us know"
msgstr ""
#: templates/uds/semantic/download_client.html:15
msgid ""
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
#: templates/uds/semantic/download_client.html:45
msgid ""
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
#: templates/uds/semantic/index.html:23
msgid "Administrator info"
msgstr ""

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-04-20 13:25+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Basque (http://www.transifex.com/openuds/openuds/language/"

View File

@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"PO-Revision-Date: 2016-07-26 11:43+0000\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-07-28 11:21+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: French (http://www.transifex.com/openuds/openuds/language/"
"fr/)\n"
@ -20,20 +20,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: REST/methods/actor.py:97 REST/methods/client.py:92
#: REST/methods/actor.py:94 REST/methods/client.py:92
#: REST/methods/client.py:109
msgid "Correct"
msgstr "Corriger"
#: REST/methods/actor.py:107
#: REST/methods/actor.py:104
msgid "Invalid key"
msgstr "Clé non valide"
#: REST/methods/actor.py:172
#: REST/methods/actor.py:166
msgid "Unmanaged host"
msgstr "Hôte non managé"
#: REST/methods/actor.py:204 web/errors.py:79
#: REST/methods/actor.py:198 web/errors.py:79
msgid "User service not found"
msgstr "Service utilisateur introuvable"
@ -1783,27 +1783,27 @@ msgstr ""
"(essentiellement renomme machine et notifier l'État)"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
#: osmanagers/WindowsOsManager/WindowsOsManager.py:50
msgid "On Logout"
msgstr "Sur Logout"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:62
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
msgid "What to do when user logs out from service"
msgstr "Que faire lorsque l'utilisateur se déconnecte du service"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:64
#: osmanagers/WindowsOsManager/WindowsOsManager.py:58
#: osmanagers/WindowsOsManager/WindowsOsManager.py:55
msgid "Keep service assigned"
msgstr "Garder les services affectés"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
msgid "Remove service"
msgstr "Retirer du service"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:62
msgid "Max.Idle time"
msgstr "Max.Idle temps"
@ -2015,11 +2015,11 @@ msgstr "Mot de passe actuel (modèle) du compte d'utilisateur"
msgid "Must provide a password for the account!!!"
msgstr "Doit fournir un mot de passe du compte!!!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:46
#: osmanagers/WindowsOsManager/WindowsOsManager.py:43
msgid "Windows Basic OS Manager"
msgstr "Gestionnaire de base de Windows OS"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:48
#: osmanagers/WindowsOsManager/WindowsOsManager.py:45
msgid ""
"Os Manager to control windows machines without domain. (Basically renames "
"machine)"
@ -2027,7 +2027,7 @@ msgstr ""
"Os Manager pour contrôler les machines windows sans domaine. "
"(Essentiellement renomme machine)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:67
msgid ""
"Maximum idle time (in seconds) before session is automaticatlly closed to "
"the user (<= 0 means no max. idle time)"
@ -2035,11 +2035,11 @@ msgstr ""
"Temps d'inactivité maximal (en secondes) avant la session est automaticatlly "
"fermé à l'utilisateur (< = 0 signifie aucune durée max. d'inactivité)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:79
#: osmanagers/WindowsOsManager/WindowsOsManager.py:76
msgid "Length must be numeric!!"
msgstr "La longueur doit être numérique!!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:81
#: osmanagers/WindowsOsManager/WindowsOsManager.py:78
msgid "Length must be betwen 1 and 6"
msgstr "La longueur doit être comprise entre 1 et 6"
@ -3729,15 +3729,13 @@ msgid "Or download another version"
msgstr "Ou télécharger une autre version"
#: templates/uds/html5/download_client.html:15
#| msgid ""
#| "In case that your platform has been incorrectly detected, you can "
#| "download manually the version required for your Operating System"
#: templates/uds/semantic/download_client.html:15
msgid ""
"If your platform couldnt be detected correctly, you can manually download "
"the version required for your Operating System."
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Si votre plate-forme ne pouvait pas être détectée correctement, vous pouvez télécharger manuellement "
"la version requise par votre système dexploitation."
"Dans le cas que votre plate-forme a été incorrectement détecté, vous pouvez "
"télécharger manuellement la version requise par votre système d'exploitation"
#: templates/uds/html5/download_client.html:19
#: templates/uds/semantic/download_client.html:19
@ -3755,15 +3753,13 @@ msgid "Mac OSX (>10.5) UDS plugin"
msgstr "Mac OSX (> 10,5) plugin de l'UDS"
#: templates/uds/html5/download_client.html:35
#| msgid ""
#| "If you already have UDS Plugin installed but this message persists to "
#| "appear, you can disable automatic detection here"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed and you can still see this message, "
"you can disable automatic detection here."
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Si vous avez déjà UDS Plugin installé et vous pouvez toujours voir ce message, "
"vous pouvez désactiver la détection automatique ici."
"Si vous avez déjà installé UDS Plugin, mais ce message persiste à "
"apparaissent, vous pouvez désactiver la détection automatique ici"
#: templates/uds/html5/download_client.html:39
#: templates/uds/semantic/download_client.html:39
@ -3786,15 +3782,13 @@ msgstr ""
"plugin installé."
#: templates/uds/html5/download_client.html:45
#| msgid ""
#| "In this case, you will have to manually download the plugin by using the "
#| "menu on upper right corner."
#: templates/uds/semantic/download_client.html:45
msgid ""
"Hence, you will have to manually download the plugin by using the menu on "
"upper right corner."
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"Par conséquent, vous devrez télécharger manuellement le plugin en utilisant le menu "
"coin supérieur droit."
"Dans ce cas, vous devrez télécharger manuellement le plugin à l'aide de la "
"menu sur le coin supérieur droit."
#: templates/uds/html5/download_client.html:47
#: templates/uds/semantic/download_client.html:47
@ -4064,30 +4058,6 @@ msgstr ""
"Si vous avez trouvé que nous avons manqué de mentionner tout composant, "
"veuillez nous le faire savoir"
#: templates/uds/semantic/download_client.html:15
msgid ""
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Dans le cas que votre plate-forme a été incorrectement détecté, vous pouvez "
"télécharger manuellement la version requise par votre système d'exploitation"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Si vous avez déjà installé UDS Plugin, mais ce message persiste à "
"apparaissent, vous pouvez désactiver la détection automatique ici"
#: templates/uds/semantic/download_client.html:45
msgid ""
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"Dans ce cas, vous devrez télécharger manuellement le plugin à l'aide de la "
"menu sur le coin supérieur droit."
#: templates/uds/semantic/index.html:23
msgid "Administrator info"
msgstr "Infos de ladministrateur"
@ -4510,8 +4480,10 @@ msgstr "Utiliser Alsa"
#: transports/RDP/BaseRDPTransport.py:74
#: transports/RDS_enterprise/BaseRDSTransport.py:74
msgid "If checked, Linux client will try to use alsa, pulse if not"
msgstr "Si cochée, Linux client essaiera dutiliser alsa, si pas dimpulsion"
msgid ""
"If checked, Linux client will try to use ALSA, otherwise Pulse will be used"
msgstr ""
"Si cochée, Linux client essaie dutiliser ALSA, sinon impulsion sera utilisée"
#: transports/RDP/RDPTransport.py:55
msgid "RDP Transport (direct)"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-07-26 11:44+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: French (http://www.transifex.com/openuds/openuds/language/"

View File

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"PO-Revision-Date: 2016-07-26 11:44+0000\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-07-28 11:21+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Italian (http://www.transifex.com/openuds/openuds/language/"
"it/)\n"
@ -18,20 +18,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: REST/methods/actor.py:97 REST/methods/client.py:92
#: REST/methods/actor.py:94 REST/methods/client.py:92
#: REST/methods/client.py:109
msgid "Correct"
msgstr "Correggere"
#: REST/methods/actor.py:107
#: REST/methods/actor.py:104
msgid "Invalid key"
msgstr "Chiave non valida"
#: REST/methods/actor.py:172
#: REST/methods/actor.py:166
msgid "Unmanaged host"
msgstr "Host non gestito"
#: REST/methods/actor.py:204 web/errors.py:79
#: REST/methods/actor.py:198 web/errors.py:79
msgid "User service not found"
msgstr "Servizio utente non trovato"
@ -1765,27 +1765,27 @@ msgstr ""
"Rinomina la macchina e notifica allo stato)"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
#: osmanagers/WindowsOsManager/WindowsOsManager.py:50
msgid "On Logout"
msgstr "Il Logout"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:62
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
msgid "What to do when user logs out from service"
msgstr "Cosa fare quando l'utente esegue il logout dal servizio"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:64
#: osmanagers/WindowsOsManager/WindowsOsManager.py:58
#: osmanagers/WindowsOsManager/WindowsOsManager.py:55
msgid "Keep service assigned"
msgstr "Mantenere il servizio assegnato"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
msgid "Remove service"
msgstr "Rimuovere il servizio"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:62
msgid "Max.Idle time"
msgstr "Max.Idle tempo"
@ -1995,11 +1995,11 @@ msgstr "Password attuale (modello) dell'account utente"
msgid "Must provide a password for the account!!!"
msgstr "Deve fornire una password per l'account!!!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:46
#: osmanagers/WindowsOsManager/WindowsOsManager.py:43
msgid "Windows Basic OS Manager"
msgstr "Windows base OS Manager"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:48
#: osmanagers/WindowsOsManager/WindowsOsManager.py:45
msgid ""
"Os Manager to control windows machines without domain. (Basically renames "
"machine)"
@ -2007,7 +2007,7 @@ msgstr ""
"OS Manager per controllare macchine windows senza dominio. (Fondamentalmente "
"Rinomina macchina)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:67
msgid ""
"Maximum idle time (in seconds) before session is automaticatlly closed to "
"the user (<= 0 means no max. idle time)"
@ -2015,11 +2015,11 @@ msgstr ""
"Tempo massimo di inattività (in secondi) prima sessione è automaticatlly "
"chiuso a l'utente (< = 0 significa nessun tempo di inattività massimo)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:79
#: osmanagers/WindowsOsManager/WindowsOsManager.py:76
msgid "Length must be numeric!!"
msgstr "Lunghezza deve essere numerico!!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:81
#: osmanagers/WindowsOsManager/WindowsOsManager.py:78
msgid "Length must be betwen 1 and 6"
msgstr "Lunghezza deve essere compresa tra 1 e 6"
@ -3697,15 +3697,13 @@ msgid "Or download another version"
msgstr "O scaricare un'altra versione"
#: templates/uds/html5/download_client.html:15
#| msgid ""
#| "In case that your platform has been incorrectly detected, you can "
#| "download manually the version required for your Operating System"
#: templates/uds/semantic/download_client.html:15
msgid ""
"If your platform couldnt be detected correctly, you can manually download "
"the version required for your Operating System."
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Se la piattaforma non poteva essere rilevata correttamente, è possibile scaricare manualmente "
"la versione per il proprio sistema operativo."
"Nel caso che la piattaforma è stata rilevata in modo errato, è possibile "
"scaricare manualmente la versione necessaria per il sistema operativo"
#: templates/uds/html5/download_client.html:19
#: templates/uds/semantic/download_client.html:19
@ -3723,15 +3721,13 @@ msgid "Mac OSX (>10.5) UDS plugin"
msgstr "Mac OSX (> 10.5) UDS plugin"
#: templates/uds/html5/download_client.html:35
#| msgid ""
#| "If you already have UDS Plugin installed but this message persists to "
#| "appear, you can disable automatic detection here"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed and you can still see this message, "
"you can disable automatic detection here."
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Se avete già installato il Plugin UDS e si vedono ancora questo messaggio, "
"è possibile disattivare il rilevamento automatico qui."
"Se avete già installato UDS Plugin ma questo messaggio persiste a apparire, "
"è possibile disattivare il rilevamento automatico qui"
#: templates/uds/html5/download_client.html:39
#: templates/uds/semantic/download_client.html:39
@ -3753,15 +3749,13 @@ msgstr ""
"attiveranno questa pagina ancora nel caso non hai installato il plugin."
#: templates/uds/html5/download_client.html:45
#| msgid ""
#| "In this case, you will have to manually download the plugin by using the "
#| "menu on upper right corner."
#: templates/uds/semantic/download_client.html:45
msgid ""
"Hence, you will have to manually download the plugin by using the menu on "
"upper right corner."
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"Quindi, sarà necessario scaricare manualmente il plugin utilizzando il menu su "
"angolo superiore destro."
"In questo caso, si dovrà scaricare manualmente il plugin utilizzando il menu "
"in alto a destra."
#: templates/uds/html5/download_client.html:47
#: templates/uds/semantic/download_client.html:47
@ -4029,30 +4023,6 @@ msgstr ""
"Se hai trovato che ci è sfuggito di citare qualsiasi componente, fatecelo "
"sapere"
#: templates/uds/semantic/download_client.html:15
msgid ""
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Nel caso che la piattaforma è stata rilevata in modo errato, è possibile "
"scaricare manualmente la versione necessaria per il sistema operativo"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Se avete già installato UDS Plugin ma questo messaggio persiste a apparire, "
"è possibile disattivare il rilevamento automatico qui"
#: templates/uds/semantic/download_client.html:45
msgid ""
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"In questo caso, si dovrà scaricare manualmente il plugin utilizzando il menu "
"in alto a destra."
#: templates/uds/semantic/index.html:23
msgid "Administrator info"
msgstr "Informazioni di amministratore"
@ -4470,9 +4440,11 @@ msgstr "Utilizzare Alsa"
#: transports/RDP/BaseRDPTransport.py:74
#: transports/RDS_enterprise/BaseRDSTransport.py:74
msgid "If checked, Linux client will try to use alsa, pulse if not"
msgid ""
"If checked, Linux client will try to use ALSA, otherwise Pulse will be used"
msgstr ""
"Se selezionata, Linux client tenterà di utilizzare alsa, se non di impulso"
"Se selezionata, Linux client tenterà di utilizzare ALSA, altrimenti verrà "
"utilizzato Pulse"
#: transports/RDP/RDPTransport.py:55
msgid "RDP Transport (direct)"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-04-20 13:25+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Italian (http://www.transifex.com/openuds/openuds/language/"

View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"PO-Revision-Date: 2016-07-26 11:44+0000\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-07-28 11:21+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/openuds/openuds/language/"
"pt/)\n"
@ -19,20 +19,20 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: REST/methods/actor.py:97 REST/methods/client.py:92
#: REST/methods/actor.py:94 REST/methods/client.py:92
#: REST/methods/client.py:109
msgid "Correct"
msgstr "Corrigir"
#: REST/methods/actor.py:107
#: REST/methods/actor.py:104
msgid "Invalid key"
msgstr "Chave inválida"
#: REST/methods/actor.py:172
#: REST/methods/actor.py:166
msgid "Unmanaged host"
msgstr "Host não gerenciado"
#: REST/methods/actor.py:204 web/errors.py:79
#: REST/methods/actor.py:198 web/errors.py:79
msgid "User service not found"
msgstr "Serviço de usuário não encontrado"
@ -1767,27 +1767,27 @@ msgstr ""
"(basicamente renomeia a máquina e Informe o estado)"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
#: osmanagers/WindowsOsManager/WindowsOsManager.py:50
msgid "On Logout"
msgstr "Logout"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:62
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
#: osmanagers/WindowsOsManager/WindowsOsManager.py:53
msgid "What to do when user logs out from service"
msgstr "O que fazer quando o usuário fizer check-out do serviço"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:64
#: osmanagers/WindowsOsManager/WindowsOsManager.py:58
#: osmanagers/WindowsOsManager/WindowsOsManager.py:55
msgid "Keep service assigned"
msgstr "Manter o serviço atribuído"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:59
#: osmanagers/WindowsOsManager/WindowsOsManager.py:56
msgid "Remove service"
msgstr "Remover o serviço"
#: osmanagers/LinuxOsManager/LinuxOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:65
#: osmanagers/WindowsOsManager/WindowsOsManager.py:62
msgid "Max.Idle time"
msgstr "Tempo de Max.Idle"
@ -1997,11 +1997,11 @@ msgstr "Senha da conta do usuário (modelo)"
msgid "Must provide a password for the account!!!"
msgstr "Deve fornecer uma senha para a conta!!!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:46
#: osmanagers/WindowsOsManager/WindowsOsManager.py:43
msgid "Windows Basic OS Manager"
msgstr "Windows básico OS Manager"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:48
#: osmanagers/WindowsOsManager/WindowsOsManager.py:45
msgid ""
"Os Manager to control windows machines without domain. (Basically renames "
"machine)"
@ -2009,7 +2009,7 @@ msgstr ""
"Gerente de sistema operacional para controlar máquinas windows sem domínio. "
"(Basicamente renomeia máquina)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:70
#: osmanagers/WindowsOsManager/WindowsOsManager.py:67
msgid ""
"Maximum idle time (in seconds) before session is automaticatlly closed to "
"the user (<= 0 means no max. idle time)"
@ -2017,11 +2017,11 @@ msgstr ""
"Tempo ocioso máximo (em segundos) antes da sessão é automaticatlly fechado "
"para o usuário (< = 0 significa que nenhum tempo ocioso máx.)"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:79
#: osmanagers/WindowsOsManager/WindowsOsManager.py:76
msgid "Length must be numeric!!"
msgstr "Comprimento deve ser numérico!!!!"
#: osmanagers/WindowsOsManager/WindowsOsManager.py:81
#: osmanagers/WindowsOsManager/WindowsOsManager.py:78
msgid "Length must be betwen 1 and 6"
msgstr "Comprimento deve ser entre 1 e 6"
@ -3706,15 +3706,13 @@ msgid "Or download another version"
msgstr "Ou baixar outra versão"
#: templates/uds/html5/download_client.html:15
#| msgid ""
#| "In case that your platform has been incorrectly detected, you can "
#| "download manually the version required for your Operating System"
#: templates/uds/semantic/download_client.html:15
msgid ""
"If your platform couldnt be detected correctly, you can manually download "
"the version required for your Operating System."
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"Se sua plataforma não poderia ser detectada corretamente, você pode baixar manualmente "
"a versão necessária para seu sistema operacional."
"No caso que sua plataforma foi detectada incorretamente, você pode baixar "
"manualmente a versão necessária para seu sistema operacional"
#: templates/uds/html5/download_client.html:19
#: templates/uds/semantic/download_client.html:19
@ -3732,15 +3730,13 @@ msgid "Mac OSX (>10.5) UDS plugin"
msgstr "Mac OSX (> 10.5) plugin UDS"
#: templates/uds/html5/download_client.html:35
#| msgid ""
#| "If you already have UDS Plugin installed but this message persists to "
#| "appear, you can disable automatic detection here"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed and you can still see this message, "
"you can disable automatic detection here."
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Se você já tem UDS Plugin instalado, e você ainda pode ver esta mensagem, "
"Você pode desabilitar a detecção automática aqui."
"Se você já tiver instalado Plugin UDS mas essa mensagem persiste para "
"aparecer, você pode desabilitar a detecção automática aqui"
#: templates/uds/html5/download_client.html:39
#: templates/uds/semantic/download_client.html:39
@ -3762,15 +3758,13 @@ msgstr ""
"página novamente, caso você não tem o plugin instalado."
#: templates/uds/html5/download_client.html:45
#| msgid ""
#| "In this case, you will have to manually download the plugin by using the "
#| "menu on upper right corner."
#: templates/uds/semantic/download_client.html:45
msgid ""
"Hence, you will have to manually download the plugin by using the menu on "
"upper right corner."
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"Daí, você terá que manualmente, baixe o plugin usando o menu na "
"canto superior direito."
"Neste caso, você terá que baixar manualmente o plugin usando o menu no canto "
"superior direito."
#: templates/uds/html5/download_client.html:47
#: templates/uds/semantic/download_client.html:47
@ -4035,30 +4029,6 @@ msgstr ""
"Se você achou que perdemos mencionar qualquer componente, por favor deixe-"
"nos saber"
#: templates/uds/semantic/download_client.html:15
msgid ""
"In case that your platform has been incorrectly detected, you can download "
"manually the version required for your Operating System"
msgstr ""
"No caso que sua plataforma foi detectada incorretamente, você pode baixar "
"manualmente a versão necessária para seu sistema operacional"
#: templates/uds/semantic/download_client.html:35
msgid ""
"If you already have UDS Plugin installed but this message persists to "
"appear, you can disable automatic detection here"
msgstr ""
"Se você já tiver instalado Plugin UDS mas essa mensagem persiste para "
"aparecer, você pode desabilitar a detecção automática aqui"
#: templates/uds/semantic/download_client.html:45
msgid ""
"In this case, you will have to manually download the plugin by using the "
"menu on upper right corner."
msgstr ""
"Neste caso, você terá que baixar manualmente o plugin usando o menu no canto "
"superior direito."
#: templates/uds/semantic/index.html:23
msgid "Administrator info"
msgstr "Informação do administrador"
@ -4471,8 +4441,10 @@ msgstr "Usar o Alsa"
#: transports/RDP/BaseRDPTransport.py:74
#: transports/RDS_enterprise/BaseRDSTransport.py:74
msgid "If checked, Linux client will try to use alsa, pulse if not"
msgstr "Se marcada, Linux cliente tentará usar alsa, pulso se não"
msgid ""
"If checked, Linux client will try to use ALSA, otherwise Pulse will be used"
msgstr ""
"Se marcada, Linux cliente tentará usar ALSA, caso contrário será usado pulso"
#: transports/RDP/RDPTransport.py:55
msgid "RDP Transport (direct)"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenUDS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-26 14:56+0200\n"
"POT-Creation-Date: 2016-07-28 13:32+0200\n"
"PO-Revision-Date: 2016-04-20 13:25+0000\n"
"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/openuds/openuds/language/"

View File

@ -40,7 +40,7 @@ from uds.core.ui import gui
import logging
__updated__ = '2016-07-22'
__updated__ = '2016-11-23'
logger = logging.getLogger(__name__)
@ -263,8 +263,5 @@ class LiveService(Service):
'''
return int(self.lenName.value)
def getDisplay(self):
'''
Returns the selected display type (for created machines, for administration
'''
return self.display.value
def getConsoleConnection(self, machineId):
return self.parent().getConsoleConnection(machineId)

View File

@ -50,7 +50,7 @@ import six
# Python bindings for OpenNebula
# import oca
__updated__ = '2016-07-22'
__updated__ = '2016-11-24'
logger = logging.getLogger(__name__)
@ -241,6 +241,23 @@ class Provider(ServiceProvider):
'''
return on.vm.getNetInfo(self.api, machineId, networkId)
def getConsoleConnection(self, machineId):
display = on.vm.getDisplayConnection(self.api, machineId)
return {
'type': display['type'],
'address': display['host'],
'port': display['port'],
'secure_port':-1,
'monitors': 1,
'cert_subject': '',
'ticket': {
'value': display['passwd'],
'expiry': ''
}
}
@staticmethod
def test(env, data):
'''

View File

@ -39,7 +39,7 @@ from defusedxml import minidom
# Python bindings for OpenNebula
from .common import VmState
__updated__ = '2016-07-26'
__updated__ = '2016-11-24'
logger = logging.getLogger(__name__)
@ -174,6 +174,35 @@ def getNetInfo(api, machineId, networkId=None):
except Exception:
raise Exception('No network interface found on template. Please, add a network and republish.')
def getDisplayConnection(api, machineId):
'''
If machine is not running or there is not a display, will return NONE
SPICE connections should check that 'type' is 'SPICE'
'''
md = minidom.parseString(api.VMInfo(machineId)[1])
try:
graphics = md.getElementsByTagName('GRAPHICS')[0]
type_ = graphics.getElementsByTagName('TYPE')[0].childNodes[0].data
port = graphics.getElementsByTagName('PORT')[0].childNodes[0].data
try:
passwd = graphics.getElementsByTagName('PASSWD').childNodes[0].data
except Exception:
passwd = ''
host = md.getElementsByTagName('HISTORY_RECORDS')[0].lastChild.getElementsByTagName('HOSTNAME')[0].childNodes[0].data
return {
'type': type_,
'host': host,
'port': int(port),
'passwd': passwd
}
except Exception:
return None # No SPICE connection
# Sample NIC Content (there will be as much as nics)
# <NIC>
# <BRIDGE><![CDATA[br0]]></BRIDGE>

View File

@ -48,10 +48,10 @@ class IPMachinesService(services.Service):
ipList = gui.EditableList(label=_('List of IPS'))
# Description of service
typeName = _('Static IP machines service')
typeName = _('Static Multiple IP')
typeType = 'IPMachinesService'
typeDescription = _('This service provides access to POWERED-ON Machines by IP')
iconFile = 'machine.png'
iconFile = 'machines.png'
# Characteristics of service
maxDeployed = -1 # If the service provides more than 1 "provided service" (-1 = no limit, 0 = ???? (do not use it!!!), N = max number to deploy

View File

@ -0,0 +1,88 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2012 Virtual Cable S.L.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# * Neither the name of Virtual Cable S.L. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
'''
@author: Adolfo Gómez, dkmaster at dkmon dot com
'''
from django.utils.translation import ugettext_lazy as _
from uds.core import services
from uds.core.services import types as serviceTypes
from uds.core.ui.UserInterface import gui
from .IPMachineDeployed import IPMachineDeployed
import logging
import pickle
logger = logging.getLogger(__name__)
class IPSingleMachineService(services.Service):
# Gui
ip = gui.TextField(length=64, label=_('Machine IP'), order=1, tooltip=_('Machine IP'), required=True)
# Description of service
typeName = _('Static Single IP')
typeType = 'IPSingleMachineService'
typeDescription = _('This service provides access to POWERED-ON Machine by IP')
iconFile = 'machine.png'
# Characteristics of service
maxDeployed = -1 # If the service provides more than 1 "provided service" (-1 = no limit, 0 = ???? (do not use it!!!), N = max number to deploy
usesCache = False # Cache are running machine awaiting to be assigned
usesCache_L2 = False # L2 Cache are running machines in suspended state
needsManager = False # If the service needs a s.o. manager (managers are related to agents provided by services itselfs, i.e. virtual machines with agent)
mustAssignManually = False # If true, the system can't do an automatic assignation of a deployed user service from this service
deployedType = IPMachineDeployed
servicesTypeProvided = (serviceTypes.VDI,)
def initialize(self, values):
pass
def getUnassignedMachine(self):
ip = None
try:
self.storage.lock()
counter = self.storage.getPickle('counter')
counter = counter + 1 if counter is not None else 1
self.storage.putPickle('counter', counter)
ip = '{}~{}'.format(self.ip.value, counter)
except Exception:
ip = None
logger.exception("Exception at getUnassignedMachine")
finally:
self.storage.unlock()
return ip
def unassignMachine(self, ip):
pass

View File

@ -46,8 +46,8 @@ class PhysicalMachinesProvider(services.ServiceProvider):
iconFile = 'provider.png'
from .IPMachinesService import IPMachinesService
from .IPServerService import IPServerService
offers = [IPMachinesService, IPServerService]
from .IPSingleMachineService import IPSingleMachineService
offers = [IPMachinesService, IPSingleMachineService]
def __unicode__(self):
return "Physical Machines Provider"

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

View File

@ -1,6 +1,6 @@
{% extends "uds/admin/tmpl/fld/form-group.html" %}
{% block field %}
{% verbatim %}
<textarea class="form-control {{ css }}" rows="{{ multiline }}" name="{{ name }}" id="{{ name }}_field" placeholder="{{ tooltip }}" {{# if readonly }} readonly{{/ if }} tabindex="{{ index }}">{{ value }}</textarea>
<textarea class="form-control {{ css }}" rows="{{ multiline }}" name="{{ name }}" id="{{ name }}_field" placeholder="{{ tooltip }}" {{# if required }} required {{/ if }} {{# if readonly }} readonly{{/ if }} tabindex="{{ index }}">{{ value }}</textarea>
{% endverbatim %}
{% endblock %}