Big load of changes

- Added callback functionality for taskmanager tasks. You can launch
  a task and define a callback function to be run when the task finished.
  This requires activating the cronjob
- Added cron functionality: Add cronjob that calls the cron api every 5
  minutes to use it. (See cron.inc.php)
- Added eventlog
- Added missing translations
- Merged main-menu-login and main-menu-logout

22 files changed, 65 insertions, 174 deletions

diff --git a/lang/de/messages.json b/lang/de/messages.json
index 0c9bd3d6..70dce460 100644
--- a/lang/de/messages.json
+++ b/lang/de/messages.json
@@ -14,11 +14,12 @@
     "error-read": "Fehler beim Lesen von {{0}}",
     "error-rename": "Konnte {{0}} nicht in {{1}} umbenennen",
     "error-write": "Fehler beim Schreiben von {{0}}",
-    "i18n-empty-tag": "Ein String wurde ohne Tag \u00fcbermittelt.",
+    "i18n-empty-tag": "Ein String wurde ohne Tag \u00fcbermittelt",
     "i18n-invalid-lang": "Ung\u00fcltige Sprache: {{0}}",
     "invalid-action": "Ung\u00fcltige Aktion: {{0}}",
     "invalid-file": "Die Datei {{0}} existiert nicht!",
     "invalid-ip": "Kein Interface ist auf die Adresse {{0}} konfiguriert",
+    "invalid-path": "Ung\u00fcltiger Pfad.",
     "invalid-template": "Ausgew\u00e4hlte Template ist nicht g\u00fcltig",
     "loginfail": "Benutzername oder Kennwort falsch",
     "missing-file": "Es wurde keine Datei ausgew\u00e4hlt!",
diff --git a/lang/de/settings/cat_setting.json b/lang/de/settings/cat_setting.json
index ab3d80a9..a545f513 100644
--- a/lang/de/settings/cat_setting.json
+++ b/lang/de/settings/cat_setting.json
@@ -3,5 +3,6 @@
     "cat_1": "Inaktivit\u00e4t und Abschaltung",
     "cat_2": "Internetzugriff",
     "cat_3": "Zeitsynchronisation",
-    "cat_4": "Grundsystem"
+    "cat_4": "Grundsystem",
+    "cat_5": "Gemeinsames Netzlaufwerk"
 }
\ No newline at end of file
diff --git a/lang/de/settings/setting.json b/lang/de/settings/setting.json
index 04249776..1c8cc537 100644
--- a/lang/de/settings/setting.json
+++ b/lang/de/settings/setting.json
@@ -1,16 +1,18 @@
 {
     "SLX_ADDONS": "Zu ladende Addons. Zur Zeit steht nur vmware zur Verf\u00fcgung.",
-    "SLX_BIOS_CLOCK": "Legt fest, ob und wie die interne Uhr des Rechners im Bezug auf die Systemzeit des \/MiniLinux\/ gesetzt werden soll.\n*off* = Die interne Uhr des Rechners wird nicht ver\u00e4ndert.\n*local* = Die interne Uhr wird auf die Lokalzeit gesetzt. Bevorzugt wenn z.B. noch eine native Windows-Installation auf dem PC vorhanden ist.\n*utc* = Die interne Uhr wird auf die \/Koordinierte Weltzeit\/ gesetzt. Dies ist die g\u00e4ngige Einstellung in einem reinen Linux-Umfeld.",
-    "SLX_LOGOUT_TIMEOUT": "Zeit \/in Sekunden\/, die eine Benutzersitzung ohne Aktion sein darf, bevor sie beendet wird.\nFeld leer lassen, um die Funktion zu deaktivieren.",
+    "SLX_BIOS_CLOCK": "Legt fest, ob und wie die interne Uhr des Rechners im Bezug auf die Systemzeit des \/MiniLinux\/ gesetzt werden soll.*off* = Die interne Uhr des Rechners wird nicht ver\u00e4ndert.*local* = Die interne Uhr wird auf die Lokalzeit gesetzt. Bevorzugt wenn z.B. noch eine native Windows-Installation auf dem PC vorhanden ist.*utc* = Die interne Uhr wird auf die \/Koordinierte Weltzeit\/ gesetzt. Dies ist die g\u00e4ngige Einstellung in einem reinen Linux-Umfeld.",
+    "SLX_COMMON_SHARE_AUTH": "Authentifizierungsmethode f\u00fcr das gemeinsame Netzlaufwerk. *guest* bedeutet, dass keine Authentifizierung notwendig ist, *user* bedeutet, dass die Credentials des angemeldeten Benutzers verwendet werden.",
+    "SLX_COMMON_SHARE_PATH": "Netzwerkpfad des gemeinsamen Netzlaufwerks. Es werden NFS (keine Authentifizierung) und CIFS\/SMB (mit und ohne Authentifizierung) unterst\u00fctzt.",
+    "SLX_LOGOUT_TIMEOUT": "Zeit \/in Sekunden\/, die eine Benutzersitzung ohne Aktion sein darf, bevor sie beendet wird.Feld leer lassen, um die Funktion zu deaktivieren.",
     "SLX_NET_DOMAIN": "DNS-Dom\u00e4ne, in die sich die Clients eingliedern, sofern der DHCP Server keine solche vorgibt.",
-    "SLX_NTP_SERVER": "Adresse des NTP-Zeitservers. Es k\u00f6nnen mehrere Server mit Leerzeichen getrennt angegeben werden.\nDie Server werden der Reihe nach angefragt, bis ein antwortender Server gefunden wird.",
+    "SLX_NTP_SERVER": "Adresse des NTP-Zeitservers. Es k\u00f6nnen mehrere Server mit Leerzeichen getrennt angegeben werden.Die Server werden der Reihe nach angefragt, bis ein antwortender Server gefunden wird.",
     "SLX_PROXY_BLACKLIST": "Adressen bzw. Adressbereiche, f\u00fcr die der Proxyserver nicht verwendet werden soll (z.B. der Adressbereich der Einrichtung). G\u00fcltige Angaben sind einzelne IP-Adressen, sowie IP-Bereiche in CIDR-Notation (z.B. 1.2.0.0\/16). Mehrere Angaben k\u00f6nnen durch Leerzeichen getrennt werden.",
     "SLX_PROXY_IP": "Die Adresse des zu verwendenden Proxy Servers.",
-    "SLX_PROXY_MODE": "Legt fest, ob zum Zugriff aufs Internet ein Proxy-Server ben\u00f6tigt wird.\n*off* = keinen Proxy benutzen.\n*on* = Proxy immer benutzen.\n*auto* = Proxy nur benutzen, wenn sich der Client-PC in einem privaten Adressbereich befindet.",
+    "SLX_PROXY_MODE": "Legt fest, ob zum Zugriff aufs Internet ein Proxy-Server ben\u00f6tigt wird.*off* = keinen Proxy benutzen.*on* = Proxy immer benutzen.*auto* = Proxy nur benutzen, wenn sich der Client-PC in einem privaten Adressbereich befindet.",
     "SLX_PROXY_PORT": "Der Port des zu verwendenden Proxy Servers.",
-    "SLX_PROXY_TYPE": "Art des Proxys.\n*socks4*, *socks5*,\n*http-connect* (HTTP Proxy mit Unterst\u00fctzung der CONNECT-Methode),\n*http-relay* (Klassischer HTTP Proxy)",
-    "SLX_REMOTE_LOG_SESSIONS": "Legt fest, ob Logins und Logouts der Benutzer an den Satelliten gemeldet werden sollen.\n*yes* = Mit Benutzerkennung loggen\n*anonymous* = Anonym loggen\n*no* = Nicht loggen",
-    "SLX_ROOT_PASS": "Das root-Passwort des Grundsystems. Wird nur f\u00fcr Diagnosezwecke am Client ben\u00f6tigt.\nFeld leer lassen, um root-Logins zu verbieten.\n\/Hinweis\/: Das Passwort wird crypt $6$ gehasht, daher wir das Passwort nach dem Speichern nicht mehr lesbar sein!",
-    "SLX_SHUTDOWN_SCHEDULE": "Feste Uhrzeit, zu der sich die Rechner ausschalten, auch wenn noch ein Benutzer aktiv ist.\nMehrere Zeitpunkte k\u00f6nnen durch Leerzeichen getrennt angegeben werden.",
-    "SLX_SHUTDOWN_TIMEOUT": "Zeit in Sekunden, nach dem ein Rechner abgeschaltet wird, sofern kein Benutzer angemeldet ist.\nFeld leer lassen, um die Funktion zu deaktivieren."
+    "SLX_PROXY_TYPE": "Art des Proxys.*socks4*, *socks5*,*http-connect* (HTTP Proxy mit Unterst\u00fctzung der CONNECT-Methode),*http-relay* (Klassischer HTTP Proxy)",
+    "SLX_REMOTE_LOG_SESSIONS": "Legt fest, ob Logins und Logouts der Benutzer an den Satelliten gemeldet werden sollen.*yes* = Mit Benutzerkennung loggen*anonymous* = Anonym loggen*no* = Nicht loggen",
+    "SLX_ROOT_PASS": "Das root-Passwort des Grundsystems. Wird nur f\u00fcr Diagnosezwecke am Client ben\u00f6tigt.Feld leer lassen, um root-Logins zu verbieten.\/Hinweis\/: Das Passwort wird crypt $6$ gehasht, daher wir das Passwort nach dem Speichern nicht mehr lesbar sein!",
+    "SLX_SHUTDOWN_SCHEDULE": "Feste Uhrzeit, zu der sich die Rechner ausschalten, auch wenn noch ein Benutzer aktiv ist.Mehrere Zeitpunkte k\u00f6nnen durch Leerzeichen getrennt angegeben werden.",
+    "SLX_SHUTDOWN_TIMEOUT": "Zeit in Sekunden, nach dem ein Rechner abgeschaltet wird, sofern kein Benutzer angemeldet ist.Feld leer lassen, um die Funktion zu deaktivieren."
 }
\ No newline at end of file
diff --git a/lang/de/templates/main-menu-login.json b/lang/de/templates/main-menu-login.json
deleted file mode 100644
index 083d68a7..00000000
--- a/lang/de/templates/main-menu-login.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "lang_administration": "\u00dcbersetzungen",
-    "lang_client": "Client",
-    "lang_clientLog": "Client Log",
-    "lang_configurationBasic": "Grundkonfiguration",
-    "lang_configurationVariables": "KonfigurationsVariablen",
-    "lang_language": "Sprachen",
-    "lang_localization": "Lokalisierung",
-    "lang_login": "Anmelden",
-    "lang_news": "News",
-    "lang_server": "Server",
-    "lang_settings": "Einstellungen",
-    "lang_vmLocation": "VM Speicherort"
-}
\ No newline at end of file
diff --git a/lang/de/templates/main-menu-logout.json b/lang/de/templates/main-menu.json
index 6b7ba9ff..b61cc1bb 100644
--- a/lang/de/templates/main-menu-logout.json
+++ b/lang/de/templates/main-menu.json
@@ -6,9 +6,11 @@
     "lang_configurationVariables": "KonfigurationsVariablen",
     "lang_language": "Sprachen",
     "lang_localization": "Lokalisierung",
+    "lang_login": "Anmelden",
     "lang_logout": "Abmelden",
     "lang_news": "News",
     "lang_server": "Server",
     "lang_settings": "Einstellungen",
-    "lang_vmLocation": "VM Speicherort"
+    "lang_vmLocation": "VM Speicherort",
+    "lang_warning": "Warnung"
 }
\ No newline at end of file
diff --git a/lang/de/templates/translation/edit.json b/lang/de/templates/translation/edit.json
index c2c6b755..671e51d8 100644
--- a/lang/de/templates/translation/edit.json
+++ b/lang/de/templates/translation/edit.json
@@ -7,6 +7,6 @@
     "lang_newTAG": "Neue Tag",
     "lang_portugueseTAG": "Portugiesisch TAG",
     "lang_save": "Speichern",
-    "lang_templateAdminHelp": "",
+    "lang_templateAdminHelp": "Hier k\u00f6nnen Sie die verwendeten Texte und S\u00e4tze \u00fcbersetzen.",
     "lang_templateHint": "Hinweis: Gelbe Linie zeigt eine \u00dcbersetzung fehlt und roten Linien zeigen ein Tag wird nicht von das Template verwendet."
 }
\ No newline at end of file
diff --git a/lang/de/templates/translation/template-list.json b/lang/de/templates/translation/template-list.json
new file mode 100644
index 00000000..5d6945bc
--- /dev/null
+++ b/lang/de/templates/translation/template-list.json
@@ -0,0 +1,5 @@
+{
+    "lang_adminInfo": "Dies ist eine Liste aller Templates. Die \u0022Status\u0022-Spalte zeigt an, wenn f\u00fcr ein Template \u00fcbersetzungen fehlen, oder veraltete Tags definiert sind.",
+    "lang_langAdministration": "Templates",
+    "lang_status": "Status"
+}
\ No newline at end of file
diff --git a/lang/en/messages.json b/lang/en/messages.json
index fbec163e..37ca550a 100644
--- a/lang/en/messages.json
+++ b/lang/en/messages.json
@@ -14,9 +14,12 @@
     "error-read": "Error reading {{0}}",
     "error-rename": "Could not rename {{0}} into {{1}}",
     "error-write": "Failed to write {{0}}",
+    "i18n-empty-tag": "A string without tag was submitted",
+    "i18n-invalid-lang": "Invalid language: {{0}}",
     "invalid-action": "Invalid action: {{0}}",
     "invalid-file": "The file {{0}} does not exist!",
     "invalid-ip": "No interface is configured with the address {{0}}",
+    "invalid-path": "Invalid path.",
     "invalid-template": "Selected template is not valid",
     "loginfail": "Username or Password incorrect",
     "missing-file": "There was no file selected!",
@@ -36,6 +39,8 @@
     "taskmanager-error": "Failed to connect to the Task Manager",
     "taskmanager-format": "Task Manager has returned invalid data",
     "token": "Invalid token. CSRF attack?",
+    "unsuccessful-action": "Not successful",
+    "updated-tags": "Tags have been updated",
     "upload-complete": "Upload of {{0}} was successful",
     "upload-failed": "Upload failed: {{0}}",
     "value-invalid": "The value {{1}} is invalid for option {{0}} and has been ignored"
diff --git a/lang/en/settings/cat_setting.json b/lang/en/settings/cat_setting.json
index 4f408f32..8d15df18 100644
--- a/lang/en/settings/cat_setting.json
+++ b/lang/en/settings/cat_setting.json
@@ -3,5 +3,6 @@
     "cat_1": "Inactivity and Shutdown",
     "cat_2": "Internet Access",
     "cat_3": "Time Synchronization",
-    "cat_4": "Basic System"
+    "cat_4": "Basic System",
+    "cat_5": "Common network share"
 }
\ No newline at end of file
diff --git a/lang/en/settings/setting.json b/lang/en/settings/setting.json
index fc857465..68378b9a 100644
--- a/lang/en/settings/setting.json
+++ b/lang/en/settings/setting.json
@@ -1,16 +1,18 @@
 {
     "SLX_ADDONS": "To load addons. There currently only vmware is available.",
-    "SLX_BIOS_CLOCK": "Specifies whether and how the internal clock of the computer should be set in relation to the system time of the \/MiniLinux\/.\n*off* = The internal clock of the computer is not changed.\n*local* = The internal clock is set to local time. Preferably if, for example, there is still a native Windows installation available on the PC.\n*utc* = The internal clock is set to the \/Coordinated Universal Time\/. This is the most common setup in a pure Linux environment.",
-    "SLX_LOGOUT_TIMEOUT": "Time \/in seconds\/, in which a user session may remain without action before it is terminated.\nLeave field blank to disable the function.",
+    "SLX_BIOS_CLOCK": "Specifies whether and how the internal clock of the computer should be set in relation to the system time of the \/MiniLinux\/.*off* = The internal clock of the computer is not changed.*local* = The internal clock is set to local time. Preferably if, for example, there is still a native Windows installation available on the PC.*utc* = The internal clock is set to the \/Coordinated Universal Time\/. This is the most common setup in a pure Linux environment.",
+    "SLX_COMMON_SHARE_AUTH": "Athentication method for the common network share. *guest* means no authentication (public share), *user* means the user's credentials will be used.",
+    "SLX_COMMON_SHARE_PATH": "Path of network share. Supported are NFS (no authentication only) and CIFS\/SMB (with and without authentication).",
+    "SLX_LOGOUT_TIMEOUT": "Time \/in seconds\/, in which a user session may remain without action before it is terminated.Leave field blank to disable the function.",
     "SLX_NET_DOMAIN": "DNS domain in which the client integrate, provided the DHCP server does not specifies such.",
-    "SLX_NTP_SERVER": "Address of the NTP time server. Multiple servers can be specified separated by spaces.\nThe servers are queried in sequence until a responding server is found.",
+    "SLX_NTP_SERVER": "Address of the NTP time server. Multiple servers can be specified separated by spaces.The servers are queried in sequence until a responding server is found.",
     "SLX_PROXY_BLACKLIST": "Address or addresses ranges in which the proxy server is not used (for example the address range of the device). Valid entries are individual IP addresses and IP ranges in CIDR notation (for example 1.2.0.0\/16). Multiple selections can be separated by spaces.",
     "SLX_PROXY_IP": "The address to use for the proxy server.",
-    "SLX_PROXY_MODE": "Determines whether a proxy server is required to access the Internet.\n*off* = do not use a Proxy.\n*on* = Always use proxy.\n*auto* = Only use proxy when the client PC is in a private address space.",
+    "SLX_PROXY_MODE": "Determines whether a proxy server is required to access the Internet.*off* = do not use a Proxy.*on* = Always use proxy.*auto* = Only use proxy when the client PC is in a private address space.",
     "SLX_PROXY_PORT": "The port to use for the proxy server.",
-    "SLX_PROXY_TYPE": "Type of the proxy.\n*socks4*, *socks5*,\n*http-connect* (HTTP proxy with support from the CONNECT method),\n*http-relay* (Classic HTTP proxy)",
-    "SLX_REMOTE_LOG_SESSIONS": "Determines whether logins and logouts of the users should be reported to the satellite.\n*yes* = login with user ID\n*anonymous* = anonymous login\n*no* = no login",
-    "SLX_ROOT_PASS": "The root password of the basic system. Only required for diagnostic purposes on the client.\nLeave field blank to disallow root logins.\n\/Hint\/: The password is encrypted with $6$ hash, so it is no longer readable after saving!",
-    "SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.\nSeveral times can be specified, separated by spaces.",
-    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.\nLeave blank to disable the function."
+    "SLX_PROXY_TYPE": "Type of the proxy.*socks4*, *socks5*,*http-connect* (HTTP proxy with support from the CONNECT method),*http-relay* (Classic HTTP proxy)",
+    "SLX_REMOTE_LOG_SESSIONS": "Determines whether logins and logouts of the users should be reported to the satellite.*yes* = login with user ID*anonymous* = anonymous login*no* = no login",
+    "SLX_ROOT_PASS": "The root password of the basic system. Only required for diagnostic purposes on the client.Leave field blank to disallow root logins.\/Hint\/: The password is encrypted with $6$ hash, so it is no longer readable after saving!",
+    "SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.Several times can be specified, separated by spaces.",
+    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function."
 }
\ No newline at end of file
diff --git a/lang/en/templates/main-menu-login.json b/lang/en/templates/main-menu-login.json
deleted file mode 100644
index 26391c9f..00000000
--- a/lang/en/templates/main-menu-login.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "lang_administration": "Translations",
-    "lang_client": "Client",
-    "lang_clientLog": "Client Log",
-    "lang_configurationBasic": "Basic Configuration",
-    "lang_configurationVariables": "Configuration Variables",
-    "lang_language": "Language",
-    "lang_localization": "Localization",
-    "lang_login": "Login",
-    "lang_news": "News",
-    "lang_server": "Server",
-    "lang_settings": "Settings",
-    "lang_vmLocation": "VM Location"
-}
\ No newline at end of file
diff --git a/lang/en/templates/main-menu-logout.json b/lang/en/templates/main-menu.json
index 54d7831e..16e83084 100644
--- a/lang/en/templates/main-menu-logout.json
+++ b/lang/en/templates/main-menu.json
@@ -6,9 +6,11 @@
     "lang_configurationVariables": "Configuration Variables",
     "lang_language": "Language",
     "lang_localization": "Localization",
+    "lang_login": "Login",
     "lang_logout": "Logout",
     "lang_news": "News",
     "lang_server": "Server",
     "lang_settings": "Settings",
-    "lang_vmLocation": "VM Location"
+    "lang_vmLocation": "VM Location",
+    "lang_warning": "Warning"
 }
\ No newline at end of file
diff --git a/lang/en/templates/sysconfig/_page.json b/lang/en/templates/sysconfig/_page.json
index 679514c2..e6c643a0 100644
--- a/lang/en/templates/sysconfig/_page.json
+++ b/lang/en/templates/sysconfig/_page.json
@@ -1,6 +1,6 @@
 {
     "lang_activate": "Activate",
-    "lang_active": "",
+    "lang_active": "Active",
     "lang_availableModules": "Available Configuration Modules",
     "lang_availableSystem": "Available System Configuration",
     "lang_close": "Close",
diff --git a/lang/en/templates/translation/edit.json b/lang/en/templates/translation/edit.json
index ff3f44ca..05c6697a 100644
--- a/lang/en/templates/translation/edit.json
+++ b/lang/en/templates/translation/edit.json
@@ -7,6 +7,6 @@
     "lang_newTAG": "New TAG",
     "lang_portugueseTAG": "Portuguese TAG",
     "lang_save": "Save",
-    "lang_templateAdminHelp": "",
+    "lang_templateAdminHelp": "Here you can translate and edit phrases and texts.",
     "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template."
 }
\ No newline at end of file
diff --git a/lang/en/templates/translation/template-list.json b/lang/en/templates/translation/template-list.json
new file mode 100644
index 00000000..e3feb70b
--- /dev/null
+++ b/lang/en/templates/translation/template-list.json
@@ -0,0 +1,5 @@
+{
+    "lang_adminInfo": "This is a list of all templates. The \u0022status\u0022-column tells if there are translations missing, or unused tags are defined.",
+    "lang_langAdministration": "Templates",
+    "lang_status": "Status"
+}
\ No newline at end of file
diff --git a/lang/lang.sql b/lang/lang.sql
deleted file mode 100644
index d6ad37c5..00000000
--- a/lang/lang.sql
+++ /dev/null
@@ -1,95 +0,0 @@
-ALTER TABLE cat_setting ADD COLUMN en varchar(250);
-ALTER TABLE cat_setting ADD COLUMN de varchar(250);
-ALTER TABLE cat_setting ADD COLUMN pt varchar(250);
-
-UPDATE cat_setting SET en='Uncategorized', de='Unkategorisiert', pt='Sem Categoria' WHERE catid=0;
-UPDATE cat_setting SET en='Inactivity and Shutdown', de='Inaktivität und Abschaltung', pt='Inatividade e Desligamento' WHERE catid=1;
-UPDATE cat_setting SET en='Internet Access', de='Internetzugriff', pt='Acesso à Internet' WHERE catid=2;
-UPDATE cat_setting SET en='Time Synchronization', de='Zeitsynchronisation', pt='Sincronização de Tempo' WHERE catid=3;
-UPDATE cat_setting SET en='Basic System', de='Grundsystem', pt='Sistema Básico' WHERE catid=4;
-
-ALTER TABLE setting ADD COLUMN en text;
-ALTER TABLE setting ADD COLUMN de text;
-ALTER TABLE setting ADD COLUMN pt text;
-
-UPDATE setting SET en='To load addons. There currently only vmware is available.', de='Zu ladende Addons. Zur Zeit steht nur vmware zur Verfügung.', pt='Para carregar addons. Atualmente apenas o vmware está disponível.' WHERE setting='SLX_ADDONS';
-
-UPDATE setting SET en='Determines whether logins and logouts of the users should be reported to the satellite.
-*yes* = login with user ID
-*anonymous* = anonymous login
-*no* = no login', de='Legt fest, ob Logins und Logouts der Benutzer an den Satelliten gemeldet werden sollen.
-*yes* = Mit Benutzerkennung loggen
-*anonymous* = Anonym loggen
-*no* = Nicht loggen', pt='Determina se logins e logouts dos usuários devem ser reportados ao satélite.
-*yes* = Login com ID de usuário
-*anonymous* = login anônimo
-*no* = sem login' WHERE setting='SLX_REMOTE_LOG_SESSIONS';
-
-UPDATE setting SET en='Time /in seconds/, in which a user session may remain without action before it is terminated.
-Leave field blank to disable the function.', de='Zeit /in Sekunden/, die eine Benutzersitzung ohne Aktion sein darf, bevor sie beendet wird.
-Feld leer lassen, um die Funktion zu deaktivieren.', pt='Hora /em segundos/, em que uma sessão de usuário pode permanecer sem ação antes de ser encerrada.
-Deixe o campo em branco para desativar a função.' WHERE setting='SLX_LOGOUT_TIMEOUT';
-
-UPDATE setting SET en='Fixed time to turn off the computer, even if there is a user active.
-Several times can be specified, separated by spaces.', de='Feste Uhrzeit, zu der sich die Rechner ausschalten, auch wenn noch ein Benutzer aktiv ist.
-Mehrere Zeitpunkte können durch Leerzeichen getrennt angegeben werden.', pt='Horário fixo para desligar o computador, até mesmo caso tenha um usuário ativo.
-Múltiplos horários podem ser especificados, separados por espaços.' WHERE setting='SLX_SHUTDOWN_SCHEDULE';
-
-UPDATE setting SET en='Time in seconds after which a computer is switched off, if no user is logged on.
-Leave blank to disable the function.', de='Zeit in Sekunden, nach dem ein Rechner abgeschaltet wird, sofern kein Benutzer angemeldet ist.
-Feld leer lassen, um die Funktion zu deaktivieren.', pt='Tempo em segundos no qual um computador é desligado, caso não tenha um usuário logado.
-Deixar em branco para desabilitar a função.' WHERE setting='SLX_SHUTDOWN_TIMEOUT';
-
-UPDATE setting SET en='DNS domain in which the client integrate, provided the DHCP server does not specifies such.', de='DNS-Domäne, in die sich die Clients eingliedern, sofern der DHCP Server keine solche vorgibt.', pt='Domínio DNS no qual o cliente se integra, desde que o servidor DHCP não especifique tal.' WHERE setting='SLX_NET_DOMAIN';
-
-UPDATE setting SET en='Address or addresses ranges in which the proxy server is not used (for example the address range of the device). Valid entries are individual IP addresses and IP ranges in CIDR notation (for example 1.2.0.0/16). Multiple selections can be separated by spaces.', de='Adressen bzw. Adressbereiche, für die der Proxyserver nicht verwendet werden soll (z.B. der Adressbereich der Einrichtung). Gültige Angaben sind einzelne IP-Adressen, sowie IP-Bereiche in CIDR-Notation (z.B. 1.2.0.0/16). Mehrere Angaben können durch Leerzeichen getrennt werden.', pt='Intervalos de endereços em que o servidor proxy não é usado (por exemplo, o intervalo de endereço do dispositivo). As entradas válidas são endereços IP individuais e intervalos de IP em notação CIDR (por exemplo 1.2.0.0/16). Seleções múltiplas podem ser separadas por espaços.' WHERE setting='SLX_PROXY_BLACKLIST';
-
-UPDATE setting SET en='The address to use for the proxy server.', de='Die Adresse des zu verwendenden Proxy Servers.', pt='O endereço de servidor proxy a ser usado.' WHERE setting='SLX_PROXY_IP';
-
-UPDATE setting SET en='Determines whether a proxy server is required to access the Internet.
-*off* = do not use a Proxy.
-*on* = Always use proxy.
-*auto* = Only use proxy when the client PC is in a private address space.', de='Legt fest, ob zum Zugriff aufs Internet ein Proxy-Server benötigt wird.
-*off* = keinen Proxy benutzen.
-*on* = Proxy immer benutzen.
-*auto* = Proxy nur benutzen, wenn sich der Client-PC in einem privaten Adressbereich befindet.', pt='Determina se um servidor proxy é necessário para acessar a Internet.
-*off* = não utilizar proxy.
-*on* = sempre utilizar proxy.
-*auto* = apenas utilizar proxy quando o PC cliente estiver em um espaço de endereço privado.' WHERE setting='SLX_PROXY_MODE';
-
-UPDATE setting SET en='The port to use for the proxy server.', de='Der Port des zu verwendenden Proxy Servers.', pt='A porta a ser utilizada pelo servidor proxy.' WHERE setting='SLX_PROXY_PORT';
-
-UPDATE setting SET en='Type of the proxy.
-*socks4*, *socks5*,
-*http-connect* (HTTP proxy with support from the CONNECT method),
-*http-relay* (Classic HTTP proxy)', de='Art des Proxys.
-*socks4*, *socks5*,
-*http-connect* (HTTP Proxy mit Unterstützung der CONNECT-Methode),
-*http-relay* (Klassischer HTTP Proxy)', pt='Tipo do proxy.
-*socks4*, *socks5*,
-*http-connect* (Proxy HTTP com suporte ao método CONNECT),
-*http-relay* (Clássico proxy HTTP)' WHERE setting='SLX_PROXY_TYPE';
-
-UPDATE setting SET en='Specifies whether and how the internal clock of the computer should be set in relation to the system time of the /MiniLinux/.
-*off* = The internal clock of the computer is not changed.
-*local* = The internal clock is set to local time. Preferably if, for example, there is still a native Windows installation available on the PC.
-*utc* = The internal clock is set to the /Coordinated Universal Time/. This is the most common setup in a pure Linux environment.', de='Legt fest, ob und wie die interne Uhr des Rechners im Bezug auf die Systemzeit des /MiniLinux/ gesetzt werden soll.
-*off* = Die interne Uhr des Rechners wird nicht verändert.
-*local* = Die interne Uhr wird auf die Lokalzeit gesetzt. Bevorzugt wenn z.B. noch eine native Windows-Installation auf dem PC vorhanden ist.
-*utc* = Die interne Uhr wird auf die /Koordinierte Weltzeit/ gesetzt. Dies ist die gängige Einstellung in einem reinen Linux-Umfeld.', pt='Especifica se e como o relógio interno do computador deve ser definido em relação ao horário do sistema do /MiniLinux/.
-*off* = O relógio interno do computador não é alterado.
-*local* = O relógio interno está definido para a hora local. De preferência se, por exemplo, ainda existe uma instalação Windows nativo disponível no PC.
-*utc* = O relógio interno é definido para o /Tempo Universal Coordenado/. Esta é a configuração mais comum em um ambiente puramente Linux' WHERE setting='SLX_BIOS_CLOCK';
-
-UPDATE setting SET en='Address of the NTP time server. Multiple servers can be specified separated by spaces.
-The servers are queried in sequence until a responding server is found.', de='Adresse des NTP-Zeitservers. Es können mehrere Server mit Leerzeichen getrennt angegeben werden.
-Die Server werden der Reihe nach angefragt, bis ein antwortender Server gefunden wird.', pt='Endereço do servidor de horário NTP. Vários servidores podem ser especificados separados por espaços.
-Os servidores são consultados em seqüência até que um servidor respondendo for encontrado.' WHERE setting='SLX_NTP_SERVER';
-
-UPDATE setting SET en='The root password of the basic system. Only required for diagnostic purposes on the client.
-Leave field blank to disallow root logins.
-/Hint/: The password is encrypted with $6$ hash, so it is no longer readable after saving!', de='Das root-Passwort des Grundsystems. Wird nur für Diagnosezwecke am Client benötigt.
-Feld leer lassen, um root-Logins zu verbieten.
-/Hinweis/: Das Passwort wird crypt $6$ gehasht, daher wir das Passwort nach dem Speichern nicht mehr lesbar sein!', pt='A senha root do sistema base. Exigido somente para fins de diagnóstico no cliente.
-Deixar campo em branco para não permitir login com root.
-/Dica/: A senha é criptografada com hash $6$, então se torna ilegível após ser salva!' WHERE setting='SLX_ROOT_PASS';
diff --git a/lang/pt/settings/setting.json b/lang/pt/settings/setting.json
index f8c0d672..66ec3b1c 100644
--- a/lang/pt/settings/setting.json
+++ b/lang/pt/settings/setting.json
@@ -1,16 +1,16 @@
 {
     "SLX_ADDONS": "Para carregar addons. Atualmente apenas o vmware est\u00e1 dispon\u00edvel.",
-    "SLX_BIOS_CLOCK": "Especifica se e como o rel\u00f3gio interno do computador deve ser definido em rela\u00e7\u00e3o ao hor\u00e1rio do sistema do \/MiniLinux\/.\n*off* = O rel\u00f3gio interno do computador n\u00e3o \u00e9 alterado.\n*local* = O rel\u00f3gio interno est\u00e1 definido para a hora local. De prefer\u00eancia se, por exemplo, ainda existe uma instala\u00e7\u00e3o Windows nativo dispon\u00edvel no PC.\n*utc* = O rel\u00f3gio interno \u00e9 definido para o \/Tempo Universal Coordenado\/. Esta \u00e9 a configura\u00e7\u00e3o mais comum em um ambiente puramente Linux",
-    "SLX_LOGOUT_TIMEOUT": "Hora \/em segundos\/, em que uma sess\u00e3o de usu\u00e1rio pode permanecer sem a\u00e7\u00e3o antes de ser encerrada.\nDeixe o campo em branco para desativar a fun\u00e7\u00e3o.",
+    "SLX_BIOS_CLOCK": "Especifica se e como o rel\u00f3gio interno do computador deve ser definido em rela\u00e7\u00e3o ao hor\u00e1rio do sistema do \/MiniLinux\/.*off* = O rel\u00f3gio interno do computador n\u00e3o \u00e9 alterado.*local* = O rel\u00f3gio interno est\u00e1 definido para a hora local. De prefer\u00eancia se, por exemplo, ainda existe uma instala\u00e7\u00e3o Windows nativo dispon\u00edvel no PC.*utc* = O rel\u00f3gio interno \u00e9 definido para o \/Tempo Universal Coordenado\/. Esta \u00e9 a configura\u00e7\u00e3o mais comum em um ambiente puramente Linux",
+    "SLX_LOGOUT_TIMEOUT": "Hora \/em segundos\/, em que uma sess\u00e3o de usu\u00e1rio pode permanecer sem a\u00e7\u00e3o antes de ser encerrada.Deixe o campo em branco para desativar a fun\u00e7\u00e3o.",
     "SLX_NET_DOMAIN": "Dom\u00ednio DNS no qual o cliente se integra, desde que o servidor DHCP n\u00e3o especifique tal.",
-    "SLX_NTP_SERVER": "Endere\u00e7o do servidor de hor\u00e1rio NTP. V\u00e1rios servidores podem ser especificados separados por espa\u00e7os.\nOs servidores s\u00e3o consultados em seq\u00fc\u00eancia at\u00e9 que um servidor respondendo for encontrado.",
+    "SLX_NTP_SERVER": "Endere\u00e7o do servidor de hor\u00e1rio NTP. V\u00e1rios servidores podem ser especificados separados por espa\u00e7os.Os servidores s\u00e3o consultados em seq\u00fc\u00eancia at\u00e9 que um servidor respondendo for encontrado.",
     "SLX_PROXY_BLACKLIST": "Intervalos de endere\u00e7os em que o servidor proxy n\u00e3o \u00e9 usado (por exemplo, o intervalo de endere\u00e7o do dispositivo). As entradas v\u00e1lidas s\u00e3o endere\u00e7os IP individuais e intervalos de IP em nota\u00e7\u00e3o CIDR (por exemplo 1.2.0.0\/16). Sele\u00e7\u00f5es m\u00faltiplas podem ser separadas por espa\u00e7os.",
     "SLX_PROXY_IP": "O endere\u00e7o de servidor proxy a ser usado.",
-    "SLX_PROXY_MODE": "Determina se um servidor proxy \u00e9 necess\u00e1rio para acessar a Internet.\n*off* = n\u00e3o utilizar proxy.\n*on* = sempre utilizar proxy.\n*auto* = apenas utilizar proxy quando o PC cliente estiver em um espa\u00e7o de endere\u00e7o privado.",
+    "SLX_PROXY_MODE": "Determina se um servidor proxy \u00e9 necess\u00e1rio para acessar a Internet.*off* = n\u00e3o utilizar proxy.*on* = sempre utilizar proxy.*auto* = apenas utilizar proxy quando o PC cliente estiver em um espa\u00e7o de endere\u00e7o privado.",
     "SLX_PROXY_PORT": "A porta a ser utilizada pelo servidor proxy.",
-    "SLX_PROXY_TYPE": "Tipo do proxy.\n*socks4*, *socks5*,\n*http-connect* (Proxy HTTP com suporte ao m\u00e9todo CONNECT),\n*http-relay* (Cl\u00e1ssico proxy HTTP)",
-    "SLX_REMOTE_LOG_SESSIONS": "Determina se logins e logouts dos usu\u00e1rios devem ser reportados ao sat\u00e9lite.\n*yes* = Login com ID de usu\u00e1rio\n*anonymous* = login an\u00f4nimo\n*no* = sem login",
-    "SLX_ROOT_PASS": "A senha root do sistema base. Exigido somente para fins de diagn\u00f3stico no cliente.\nDeixar campo em branco para n\u00e3o permitir login com root.\n\/Dica\/: A senha \u00e9 criptografada com hash $6$, ent\u00e3o se torna ileg\u00edvel ap\u00f3s ser salva!",
-    "SLX_SHUTDOWN_SCHEDULE": "Hor\u00e1rio fixo para desligar o computador, at\u00e9 mesmo caso tenha um usu\u00e1rio ativo.\nM\u00faltiplos hor\u00e1rios podem ser especificados, separados por espa\u00e7os.",
-    "SLX_SHUTDOWN_TIMEOUT": "Tempo em segundos no qual um computador \u00e9 desligado, caso n\u00e3o tenha um usu\u00e1rio logado.\nDeixar em branco para desabilitar a fun\u00e7\u00e3o."
+    "SLX_PROXY_TYPE": "Tipo do proxy.*socks4*, *socks5*,*http-connect* (Proxy HTTP com suporte ao m\u00e9todo CONNECT),*http-relay* (Cl\u00e1ssico proxy HTTP)",
+    "SLX_REMOTE_LOG_SESSIONS": "Determina se logins e logouts dos usu\u00e1rios devem ser reportados ao sat\u00e9lite.*yes* = Login com ID de usu\u00e1rio*anonymous* = login an\u00f4nimo*no* = sem login",
+    "SLX_ROOT_PASS": "A senha root do sistema base. Exigido somente para fins de diagn\u00f3stico no cliente.Deixar campo em branco para n\u00e3o permitir login com root.\/Dica\/: A senha \u00e9 criptografada com hash $6$, ent\u00e3o se torna ileg\u00edvel ap\u00f3s ser salva!",
+    "SLX_SHUTDOWN_SCHEDULE": "Hor\u00e1rio fixo para desligar o computador, at\u00e9 mesmo caso tenha um usu\u00e1rio ativo.M\u00faltiplos hor\u00e1rios podem ser especificados, separados por espa\u00e7os.",
+    "SLX_SHUTDOWN_TIMEOUT": "Tempo em segundos no qual um computador \u00e9 desligado, caso n\u00e3o tenha um usu\u00e1rio logado.Deixar em branco para desabilitar a fun\u00e7\u00e3o."
 }
\ No newline at end of file
diff --git a/lang/pt/templates/main-menu-logout.json b/lang/pt/templates/main-menu-logout.json
deleted file mode 100644
index d329ac47..00000000
--- a/lang/pt/templates/main-menu-logout.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "lang_administration": "Tradu\u00e7\u00f5es",
-    "lang_client": "Cliente",
-    "lang_clientLog": "Log dos Clientes",
-    "lang_configurationBasic": "Comfigura\u00e7\u00e3o B\u00e1sica",
-    "lang_configurationVariables": "Vari\u00e1veis de Configura\u00e7\u00e3o",
-    "lang_language": "L\u00edngua",
-    "lang_localization": "Localiza\u00e7\u00e3o",
-    "lang_logout": "Sair",
-    "lang_news": "Novidades",
-    "lang_server": "Servidor",
-    "lang_settings": "Op\u00e7\u00f5es",
-    "lang_vmLocation": "Localiza\u00e7\u00e3o da VM"
-}
\ No newline at end of file
diff --git a/lang/pt/templates/main-menu-login.json b/lang/pt/templates/main-menu.json
index 460a9180..7c0b13d6 100644
--- a/lang/pt/templates/main-menu-login.json
+++ b/lang/pt/templates/main-menu.json
@@ -7,6 +7,7 @@
     "lang_language": "L\u00edngua",
     "lang_localization": "Localiza\u00e7\u00e3o",
     "lang_login": "Entrar",
+    "lang_logout": "Sair",
     "lang_news": "Novidades",
     "lang_server": "Servidor",
     "lang_settings": "Op\u00e7\u00f5es",
diff --git a/lang/pt/templates/sysconfig/_page.json b/lang/pt/templates/sysconfig/_page.json
index b0c1f8e9..059e0169 100644
--- a/lang/pt/templates/sysconfig/_page.json
+++ b/lang/pt/templates/sysconfig/_page.json
@@ -1,6 +1,5 @@
 {
     "lang_activate": "Ativar",
-    "lang_active": "",
     "lang_availableModules": "M\u00f3dulos de Configura\u00e7\u00e3o Dispon\u00edveis",
     "lang_availableSystem": "Configura\u00e7\u00f5es de Sistema Dispon\u00edveis",
     "lang_close": "Fechar",
diff --git a/lang/pt/templates/translation/edit.json b/lang/pt/templates/translation/edit.json
index 42eb5b28..326fa334 100644
--- a/lang/pt/templates/translation/edit.json
+++ b/lang/pt/templates/translation/edit.json
@@ -7,6 +7,5 @@
     "lang_newTAG": "Nova TAG",
     "lang_portugueseTAG": "TAG em Portugu\u00eas",
     "lang_save": "Salvar",
-    "lang_templateAdminHelp": "",
     "lang_templateHint": "Dica: linhas amarelas indicam que uma tradu\u00e7\u00e3o est\u00e1 faltando e linhas vermelhas indicam que uma tag n\u00e3o \u00e9 utilizada pelo template."
 }
\ No newline at end of file
diff --git a/lang/pt/templates/translation/template-list.json b/lang/pt/templates/translation/template-list.json
new file mode 100644
index 00000000..c44dc44f
--- /dev/null
+++ b/lang/pt/templates/translation/template-list.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file