More Progress; Merged changes from ufpr up to 775cdbd29f5d0f70946d1d5ff09c091e6189c9e9

author: Simon Rettberg 2016-04-29 17:43:58 +0200
committer: Simon Rettberg 2016-04-29 17:43:58 +0200
commit: f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0 (patch)
tree: 13c41f05ef5920eb13c76be05f749de9a9a809fa
parent: Implemented new menu, added logic for defining dependencies, move translation... (diff)
download: slx-admin-f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0.tar.gz
slx-admin-f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0.tar.xz
slx-admin-f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0.zip
209 files changed, 678 insertions, 78 deletions
diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php
index b56106cc..e8f51e24 100644
--- a/inc/dictionary.inc.php
+++ b/inc/dictionary.inc.php
@@ -104,7 +104,7 @@ class Dictionary
 		}
 		$string = self::translate($out[1], 'categories', $out[2]);
 		if ($string === false) {
-			return $category;
+			return '!!' . $category . '!!';
 		}
 		return $string;
 	}
diff --git a/inc/module.inc.php b/inc/module.inc.php
index 9126cb32..73959471 100644
--- a/inc/module.inc.php
+++ b/inc/module.inc.php
@@ -27,6 +27,11 @@ class Module
 		return self::resolveDeps(self::$modules[$name]);
 	}
 
+	/**
+	 * 
+	 * @param \Module $mod the module to check
+	 * @return boolean true iff module deps are all found and enabled
+	 */
 	private static function resolveDeps($mod)
 	{
 		if (!$mod->depsChecked) {
@@ -34,7 +39,7 @@ class Module
 			foreach ($mod->dependencies as $dep) {
 				if (!self::resolveDepsByName($dep)) {
 					if ($mod->enabled) {
-						error_log("Disabling module $name: Dependency $dep failed.");
+						error_log("Disabling module {$mod->name}: Dependency $dep failed.");
 					}
 					$mod->enabled = false;
 					$mod->depsMissing = true;
@@ -142,10 +147,15 @@ class Module
 	{
 		$string = Dictionary::translate($this->name, 'module', 'module_name');
 		if ($string === false) {
-			return $this->name;
+			return '!!' . $this->name . '!!';
 		}
 		return $string;
 	}
+
+	public function getPageTitle()
+	{
+		return Dictionary::translate($this->name, 'module', 'page_title');
+	}
 	
 	public function getCategory()
 	{
diff --git a/inc/render.inc.php b/inc/render.inc.php
index 14d5a810..b8abaf71 100644
--- a/inc/render.inc.php
+++ b/inc/render.inc.php
@@ -45,7 +45,7 @@ class Render
 		'<!DOCTYPE html>
 	<html>
 		<head>
-			<title>', RENDER_DEFAULT_TITLE, self::$title, '</title>
+			<title>', self::$title, RENDER_DEFAULT_TITLE, '</title>
 			<meta charset="utf-8"> 
 			<meta http-equiv="X-UA-Compatible" content="IE=edge">
 			<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -93,7 +93,7 @@ class Render
 	 */
 	public static function setTitle($title)
 	{
-		self::$title = ' - ' . $title;
+		self::$title = $title . ' - ';
 	}
 
 	/**
@@ -177,28 +177,39 @@ class Render
 		if ($html === false) {
 			return '<h3>Template ' . htmlspecialchars($template) . '</h3>' . nl2br(htmlspecialchars(print_r($params, true))) . '<hr>';
 		}
-		// Get all translated strings for this template
-		if($module === false){
-			$module = strtolower(empty($_REQUEST['do']) ? 'main' : $_REQUEST['do']);
+		if($module === false) {
+			$module = Page::getModule()->getIdentifier();
+		}
+		if (!is_array($params)) {
+			$params = array();
 		}
-		$dictionary = Dictionary::getArrayTemplate($template, $module);
-		
 		// Now find all language tags in this array
-		preg_match_all('/{{(lang_.+?)}}/', $html, $out);
-		foreach ($out[1] as $tag) {
-			// Add untranslated strings to the dictionary, so their tag is seen in the rendered page
-			if (empty($dictionary[$tag]))
-				$dictionary[$tag] = '{{' . $tag . '}}';
+		if (preg_match_all('/{{(lang_.+?)}}/', $html, $out) > 0) {
+			$dictionary = Dictionary::getArrayTemplate($template, $module);
+			$fallback = false;
+			foreach ($out[1] as $tag) {
+				// Add untranslated strings to the dictionary, so their tag is seen in the rendered page
+				if ($fallback === false && empty($dictionary[$tag])) {
+					$fallback = true; // Fallback to general dictionary of module
+					$dictionary = $dictionary + Dictionary::getArray($module, 'module');
+					if ($module !== 'main') {
+						$dictionary = $dictionary + Dictionary::getArray('main', 'module');
+					}
+				}
+				if (empty($dictionary[$tag])) {
+					$dictionary[$tag] = '{{' . $tag . '}}';
+				}
+			}
+			$params = $params + $dictionary;
 		}
 		// Always add token to parameter list
-		if (is_array($params) || $params === false || is_null($params))
-			$params['token'] = Session::get('token');
-		// Likewise, add currently selected language ( its two letter code) to params
+		$params['token'] = Session::get('token');
+		// Likewise, add currently selected language (its two letter code) to params
 		$params['current_lang'] = LANG;
 		// Add desired password field type
 		$params['password_type'] = Property::getPasswordFieldType();
 		// Return rendered html
-		return self::$mustache->render($html, array_merge($dictionary,$params));
+		return self::$mustache->render($html, $params);
 	}
 
 	/**
diff --git a/index.php b/index.php
index 06be1b05..8a11820e 100644
--- a/index.php
+++ b/index.php
@@ -40,6 +40,10 @@ abstract class Page
 
 	public static function render()
 	{
+		$pageTitle = self::$module->getPageTitle();
+		if ($pageTitle !== false) {
+			Render::setTitle($pageTitle);
+		}
 		self::$instance->doRender();
 	}
 
diff --git a/lang/de/modules/adduser.json b/lang/de/modules/adduser.json
deleted file mode 100644
index 0f446025..00000000
--- a/lang/de/modules/adduser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "lang_confirmation": "Wiederholen",
-    "lang_createUser": "Benutzer anlegen",
-    "lang_fullName": "Vollst\u00e4ndiger Name",
-    "lang_password": "Passwort",
-    "lang_telephone": "Telefon",
-    "lang_username": "Benutzerkennung"
-}
-\ No newline at end of file
diff --git a/lang/de/templates/pagenav.json b/lang/de/templates/pagenav.json
deleted file mode 100644
index 0967ef42..00000000
--- a/lang/de/templates/pagenav.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/lang/en/messages-hardcoded.json b/lang/en/messages-hardcoded.json
index 7c781d4e..55ac6a50 100644
--- a/lang/en/messages-hardcoded.json
+++ b/lang/en/messages-hardcoded.json
@@ -1,9 +1,6 @@
 {
     "lang_administration": "Translations",
-    "lang_backup": "Backup",
-    "lang_baseconfig": "Variables",
-    "lang_cities":"Cities",
-    "lang_citymanagement":"Management",
+    "lang_cities": "Cities",
     "lang_clientLog": "Client Log",
     "lang_clientSshConfig": "SSH configuration",
     "lang_configurationCompilation": "Compile configuration",
@@ -11,45 +8,28 @@
     "lang_contentOf": "Content of \"",
     "lang_createUser": "Create User",
     "lang_days": "Day(s)",
-    "lang_dozmod": "Tutor Module",
     "lang_eventLog": "Server Log",
-    "lang_eventlog": "Client Log",
     "lang_hours": "Hour(s)",
-    "lang_internetaccess": "Internet Access",
-    "lang_imgmanagement": "Image Management",
-    "lang_locations": "Room/Locations",
     "lang_login": "Login",
-    "lang_minilinux": "Minilinux",
     "lang_modules": "Modules",
     "lang_moduleAdd": "Add Module",
-    "lang_news": "News",
     "lang_noModuleFromThisGroup": "(No module from this group)",
     "lang_server": "iPXE \/ Boot Menu",
     "lang_serverConfiguration": "Server-side Configuration",
     "lang_serverStatus": "Server",
-    "lang_serversetup": "iPXE \/ Boot Menu",
     "lang_settings": "Settings",
-    "lang_statistics": "Client Statistics",
     "lang_status": "Status",
-    "lang_support": "Support",
-    "lang_sysconfig": "Modules",
-    "lang_syslog": "Server Log",
-    "lang_systemstatus": "Server",
     "lang_titleBackup": "Save and Restore",
     "lang_titleClientStatistics": "Client statistics",
     "lang_titleEventLog": "Event log",
-    "lang_translation": "Translation",
     "lang_user": "Users",
     "lang_userManagement": "Management",
-    "lang_usermanagement": "Management",
     "lang_users": "Users",
     "lang_variables": "Variables",
     "lang_vmLocation": "Virtual Machine",
-    "lang_vmstore": "Virtual Machine",
     "lang_titleWebinterface": "Web Interface",
     "lang_unknwonTaskManager": "Unknown Task Manager error",
-    "lang_webinterface": "Web Interface",
     "today": "Today",
     "unused": "Unused",
     "yesterday": "Yesterday"
-}
+}
+\ No newline at end of file
diff --git a/lang/en/modules/messagebox-info.json b/lang/en/modules/messagebox-info.json
deleted file mode 100644
index 2c63c085..00000000
--- a/lang/en/modules/messagebox-info.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/lang/en/modules/messagebox-success.json b/lang/en/modules/messagebox-success.json
deleted file mode 100644
index 2c63c085..00000000
--- a/lang/en/modules/messagebox-success.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/lang/en/modules/pagenav.json b/lang/en/modules/pagenav.json
deleted file mode 100644
index 2c63c085..00000000
--- a/lang/en/modules/pagenav.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/lang/pt/messages-hardcoded.json b/lang/pt/messages-hardcoded.json
index 3e90bd80..0f500e07 100644
--- a/lang/pt/messages-hardcoded.json
+++ b/lang/pt/messages-hardcoded.json
@@ -1,12 +1,26 @@
 {
-    "lang_configurationCompilation": "Compilar configura\u00e7\u00e3o",
-    "lang_contentOf": "Conte\u00fado de \"",
+    "lang_administration": "Tradu\u00e7\u00f5es",
+    "lang_cities": "Cidades",
+    "lang_clientLog": "Log dos Clientes",
+    "lang_content": "Conte\u00fado",
     "lang_createUser": "Criar Usu\u00e1rio",
     "lang_days": "Dia(s)",
+    "lang_eventLog": "Log dos Servidores",
     "lang_hours": "Hora(s)",
-    "lang_location": "Localiza\u00e7\u00e3o",
     "lang_login": "Entrar",
-    "lang_moduleAdd": "Adicionar M\u00f3dulo",
+    "lang_modules": "M\u00f3dulos",
+    "lang_server": "iPXE \/ Boot Menu",
     "lang_serverConfiguration": "Configura\u00e7\u00e3o do servidor",
-    "lang_unknwonTaskManager": "Erro desconhecido do Gerenciador de Tarefas"
+    "lang_serverStatus": "Servidor",
+    "lang_settings": "Configura\u00e7\u00f5es",
+    "lang_status": "Status",
+    "lang_titleBackup": "Salvar e Recuperar",
+    "lang_titleEventLog": "Log de Eventos",
+    "lang_user": "Usu\u00e1rios",
+    "lang_userManagement": "Gerenciamento",
+    "lang_users": "Usu\u00e1rios",
+    "lang_variables": "Vari\u00e1veis",
+    "lang_vmLocation": "M\u00e1quina Virtual",
+    "today": "Hoje",
+    "yesterday": "Ontem"
 }
 \ No newline at end of file
diff --git a/lang/de/templates/page-adduser.json b/modules/adduser/lang/de/templates/page-adduser.json
index 0f446025..0f446025 100644
--- a/lang/de/templates/page-adduser.json
+++ b/modules/adduser/lang/de/templates/page-adduser.json
diff --git a/modules/adduser/lang/en/module.json b/modules/adduser/lang/en/module.json
new file mode 100644
index 00000000..170c12f6
--- /dev/null
+++ b/modules/adduser/lang/en/module.json
@@ -0,0 +1,8 @@
+{
+    "lang_confirmation": "Confirm Password",
+    "lang_createUser": "Create User",
+    "lang_fullName": "Fullname",
+    "lang_password": "Password",
+    "lang_telephone": "Telephone",
+    "lang_username": "Username"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/adduser/page-adduser.json b/modules/adduser/lang/en/templates/page-adduser.json
index 42bae6dc..42bae6dc 100644
--- a/lang/en/modules/adduser/page-adduser.json
+++ b/modules/adduser/lang/en/templates/page-adduser.json
diff --git a/modules/adduser/lang/pt/module.json b/modules/adduser/lang/pt/module.json
new file mode 100644
index 00000000..524f3dd5
--- /dev/null
+++ b/modules/adduser/lang/pt/module.json
@@ -0,0 +1,8 @@
+{
+    "lang_confirmation": "Confirmar Senha",
+    "lang_createUser": "Criar Usu\u00e1rio",
+    "lang_fullName": "Nome Completo",
+    "lang_password": "Senha",
+    "lang_telephone": "Telefone",
+    "lang_username": "Nome de Usu\u00e1rio"
+}
+\ No newline at end of file
diff --git a/lang/de/modules/backup.json b/modules/backup/lang/de/module.json
index 5e3efea2..5e3efea2 100644
--- a/lang/de/modules/backup.json
+++ b/modules/backup/lang/de/module.json
diff --git a/lang/de/templates/backup/_page.json b/modules/backup/lang/de/templates/_page.json
index 5e3efea2..5e3efea2 100644
--- a/lang/de/templates/backup/_page.json
+++ b/modules/backup/lang/de/templates/_page.json
diff --git a/lang/de/templates/backup/restore.json b/modules/backup/lang/de/templates/restore.json
index 6b3a7cdd..6b3a7cdd 100644
--- a/lang/de/templates/backup/restore.json
+++ b/modules/backup/lang/de/templates/restore.json
diff --git a/modules/backup/lang/en/module.json b/modules/backup/lang/en/module.json
new file mode 100644
index 00000000..c9379ffd
--- /dev/null
+++ b/modules/backup/lang/en/module.json
@@ -0,0 +1,14 @@
+{
+    "lang_backup": "Backup",
+    "lang_backupDescription": "Here you can backup the complete configuration of this satellite server.",
+    "lang_backupRestore": "Backup and restore",
+    "lang_download": "Download",
+    "lang_file": "File",
+    "lang_reboot": "System reboot",
+    "lang_restore": "Upload",
+    "lang_restoreConfig": "Restore config",
+    "lang_restoreDescription": "Here you can restore a configuration backup. Please note that this will reboot the server, so it is advised to do this while nobody is using the system. Please note that this will also restore the password for the web interface that was active when the configuration backup was created.",
+    "lang_restoreFailed": "Restoring configuration failed.",
+    "lang_stopping": "Stopping",
+    "module_name": "Backup"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/backup/_page.json b/modules/backup/lang/en/templates/_page.json
index 799c6168..799c6168 100644
--- a/lang/en/modules/backup/_page.json
+++ b/modules/backup/lang/en/templates/_page.json
diff --git a/lang/en/modules/backup/restore.json b/modules/backup/lang/en/templates/restore.json
index 5a5f6f64..5a5f6f64 100644
--- a/lang/en/modules/backup/restore.json
+++ b/modules/backup/lang/en/templates/restore.json
diff --git a/modules/backup/lang/pt/module.json b/modules/backup/lang/pt/module.json
new file mode 100644
index 00000000..5077cbfa
--- /dev/null
+++ b/modules/backup/lang/pt/module.json
@@ -0,0 +1,14 @@
+{
+    "lang_backup": "Backup",
+    "lang_backupDescription": "Aqui voc\u00ea pode fazer um backup completo da configura\u00e7\u00e3o deste server.",
+    "lang_backupRestore": "Backup e Recupera\u00e7\u00e3o",
+    "lang_download": "Baixar",
+    "lang_file": "Arquivo",
+    "lang_reboot": "Reinicializar Sistema",
+    "lang_restore": "Carregar",
+    "lang_restoreConfig": "Recuperar Configura\u00e7\u00e3o",
+    "lang_restoreDescription": "Aqui voc\u00ea pode recuperar um backup de configura\u00e7\u00e3o. Por favor note que isso ir\u00e1 reinicializar o servidor, portanto \u00e9 recomendado faz\u00ea-lo quando ningu\u00e9m estiver utilizando o sistema. Por favor note que isso tamb\u00e9m ir\u00e1 recuperar a senha da interface web que estava ativa quando a configura\u00e7\u00e3o de backup foi criada.",
+    "lang_restoreFailed": "Recupera\u00e7\u00e3o da configura\u00e7\u00e3o falhou",
+    "lang_stopping": "Parando",
+    "module_name": "Backup"
+}
+\ No newline at end of file
diff --git a/lang/de/settings/cat_setting.json b/modules/baseconfig/lang/de/cat_setting.json
index b8cb6935..b8cb6935 100644
--- a/lang/de/settings/cat_setting.json
+++ b/modules/baseconfig/lang/de/cat_setting.json
diff --git a/lang/de/settings/setting.json b/modules/baseconfig/lang/de/setting.json
index af1007be..af1007be 100644
--- a/lang/de/settings/setting.json
+++ b/modules/baseconfig/lang/de/setting.json
diff --git a/lang/de/templates/baseconfig/_page.json b/modules/baseconfig/lang/de/templates/_page.json
index 0f4819b4..0f4819b4 100644
--- a/lang/de/templates/baseconfig/_page.json
+++ b/modules/baseconfig/lang/de/templates/_page.json
diff --git a/lang/en/settings/cat_setting.json b/modules/baseconfig/lang/en/cat_setting.json
index 7c0ab654..7c0ab654 100644
--- a/lang/en/settings/cat_setting.json
+++ b/modules/baseconfig/lang/en/cat_setting.json
diff --git a/modules/baseconfig/lang/en/module.json b/modules/baseconfig/lang/en/module.json
index 7b1bb316..9345c27c 100644
--- a/modules/baseconfig/lang/en/module.json
+++ b/modules/baseconfig/lang/en/module.json
@@ -1,3 +1,27 @@
 {
-	"module_name": "Config Variables"
-}
+    "lang_basicConfiguration": "Basic Configuration",
+    "lang_catPartition": "Partition Managment",
+    "lang_catUser": "User Managment",
+    "lang_close": "Close",
+    "lang_confirm": "Would you like to save the settings on [ \/srv\/openslx\/www\/boot\/config ] ?",
+    "lang_create": "Create",
+    "lang_delete": "Delete",
+    "lang_help": "Help",
+    "lang_helpId": "Partition Id",
+    "lang_helpMountPoint": "Must be a directory: \/example\/directory\/",
+    "lang_helpOptions": "Currently, only option 'bootable' is available",
+    "lang_helpSize": "Must be in Gigabytes e.g. 15G",
+    "lang_newPartition": "New Partition",
+    "lang_newUser": "New User",
+    "lang_partitionId": "Id",
+    "lang_partitionMountPoint": "Mount Point",
+    "lang_partitionOptions": "Options",
+    "lang_partitionSize": "Size",
+    "lang_reset": "Reset",
+    "lang_resetConfirm": "Do you really wish to reset the variable to their default values?",
+    "lang_resetDefault": "Reset Default",
+    "lang_save": "Save",
+    "lang_userName": "Username",
+    "lang_userPasswd": "Password",
+    "module_name": "Variables"
+}
+\ No newline at end of file
diff --git a/lang/en/settings/setting.json b/modules/baseconfig/lang/en/setting.json
index 36ac6e8c..36ac6e8c 100644
--- a/lang/en/settings/setting.json
+++ b/modules/baseconfig/lang/en/setting.json
diff --git a/lang/en/modules/baseconfig/_page.json b/modules/baseconfig/lang/en/templates/_page.json
index 6429a835..6429a835 100644
--- a/lang/en/modules/baseconfig/_page.json
+++ b/modules/baseconfig/lang/en/templates/_page.json
diff --git a/modules/baseconfig/lang/pt/module.json b/modules/baseconfig/lang/pt/module.json
new file mode 100644
index 00000000..0ac0a075
--- /dev/null
+++ b/modules/baseconfig/lang/pt/module.json
@@ -0,0 +1,27 @@
+{
+    "lang_basicConfiguration": "Configura\u00e7\u00e3o B\u00e1sica",
+    "lang_catPartition": "Gerenciamento de Parti\u00e7\u00f5es",
+    "lang_catUser": "Gerenciamente de Usu\u00e1rios",
+    "lang_close": "Fechar",
+    "lang_confirm": "Voc\u00ea deseja salvar configura\u00e7\u00f5es em [ \/srv\/openslx\/www\/boot\/default\/config ] ?",
+    "lang_create": "Criar",
+    "lang_delete": "Deletar",
+    "lang_help": "Ajuda",
+    "lang_helpId": "Id da parti\u00e7\u00e3o",
+    "lang_helpMountPoint": "Precisa ser um diret\u00f3rio: \/exemplo\/diret\u00f3rio\/",
+    "lang_helpOptions": "Atualmente, apenas a op\u00e7\u00e3o 'bootable' est\u00e1 dispon\u00edvel",
+    "lang_helpSize": "Precisa estar em Gigabytes, por exemplo 15G",
+    "lang_newPartition": "Nova Parti\u00e7\u00e3o",
+    "lang_newUser": "Novo Usu\u00e1rio",
+    "lang_partitionId": "Id",
+    "lang_partitionMountPoint": "Mount Point",
+    "lang_partitionOptions": "Op\u00e7\u00f5es",
+    "lang_partitionSize": "Tamanho",
+    "lang_reset": "Limpar",
+    "lang_resetConfirm": "Voc\u00ea realmente deseja restaurar as vari\u00e1veis para seus valores padr\u00f5es?",
+    "lang_resetDefault": "Restaurar Padr\u00e3o",
+    "lang_save": "Salvar",
+    "lang_userName": "Nome",
+    "lang_userPasswd": "Senha",
+    "module_name": "Vari\u00e1veis"
+}
+\ No newline at end of file
diff --git a/modules/baseconfig/page.inc.php b/modules/baseconfig/page.inc.php
index 3d187d30..8f914376 100644
--- a/modules/baseconfig/page.inc.php
+++ b/modules/baseconfig/page.inc.php
@@ -8,7 +8,7 @@ class Page_BaseConfig extends Page
 	{
 		User::load();
 
-		// Determine if we're setting global, distro or pool
+		// Determine if we're setting global, distro or location
 		if (isset($_REQUEST['distroid'])) {
 			// TODO: Everything
 			$this->qry_extra[] = array(
@@ -16,11 +16,11 @@ class Page_BaseConfig extends Page
 				'value' => (int)$_REQUEST['distroid'],
 				'table' => 'setting_distro',
 			);
-			if (isset($_REQUEST['poolid'])) {
+			if (isset($_REQUEST['locationid'])) {
 				$this->qry_extra[] = array(
-					'name'  => 'poolid',
-					'value' => (int)$_REQUEST['poolid'],
-					'table' => 'setting_pool',
+					'name'  => 'locationid',
+					'value' => (int)$_REQUEST['locationid'],
+					'table' => 'setting_location',
 				);
 			}
 		}
@@ -82,12 +82,14 @@ class Page_BaseConfig extends Page
 			LEFT JOIN setting_global AS tbl USING (setting)
 			ORDER BY cat_setting.sortval ASC, setting.setting ASC');
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$row['description'] = Util::markup(Dictionary::translate('settings/setting', $row['setting']));
+			$row['description'] = Util::markup(Page::translate($row['setting'], 'setting'));
 			if (is_null($row['displayvalue'])) $row['displayvalue'] = $row['defaultvalue'];
 			$row['item'] = $this->makeInput($row['validator'], $row['setting'], $row['displayvalue']);
 			$settings[$row['catid']]['settings'][] = $row;
-			$settings[$row['catid']]['category_name'] = Dictionary::translate('settings/cat_setting', 'cat_' . $row['catid']);
-			$settings[$row['catid']]['category_id'] = $row['catid'];
+			if (!isset($settings[$row['catid']]['category_id'])) {
+				$settings[$row['catid']]['category_name'] = Page::translate('cat_' . $row['catid'], 'cat_setting');
+				$settings[$row['catid']]['category_id'] = $row['catid'];
+			}
 		}
 		Render::addTemplate('_page', array(
 			'categories'  => array_values($settings)
diff --git a/modules/citymanagement/lang/en/module.json b/modules/citymanagement/lang/en/module.json
new file mode 100644
index 00000000..ba6c5c44
--- /dev/null
+++ b/modules/citymanagement/lang/en/module.json
@@ -0,0 +1,14 @@
+{
+    "lang_cancelConfirm": "Do you really want to remove this city?",
+    "lang_cityInfo": "Here you can create new cities for the website, besides editing or removing the existing ones",
+    "lang_cityPage": "Manage cities",
+    "lang_cityname": "City name",
+    "lang_close": "Close",
+    "lang_create": "Create",
+    "lang_edit": "Edit",
+    "lang_editcity": "Edit City",
+    "lang_operations": "Operations",
+    "lang_remove": "Remove",
+    "lang_save": "Save",
+    "module_name": "Management"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/citymanagement/citymanagement.json b/modules/citymanagement/lang/en/templates/citymanagement.json
index 27bb60c0..27bb60c0 100644
--- a/lang/en/modules/citymanagement/citymanagement.json
+++ b/modules/citymanagement/lang/en/templates/citymanagement.json
diff --git a/modules/citymanagement/lang/pt/module.json b/modules/citymanagement/lang/pt/module.json
new file mode 100644
index 00000000..c514f437
--- /dev/null
+++ b/modules/citymanagement/lang/pt/module.json
@@ -0,0 +1,14 @@
+{
+    "lang_cancelConfirm": "Deseja realmente remover a cidade?",
+    "lang_cityInfo": "Nesta se\u00e7\u00e3o voc\u00ea poder\u00e1 criar cidades para o site, al\u00e9m de editar ou remover cidades existentes",
+    "lang_cityPage": "Gerenciar cidades",
+    "lang_cityname": "Nome da cidade",
+    "lang_close": "Fechar",
+    "lang_create": "Criar",
+    "lang_edit": "Editar",
+    "lang_editcity": "Editar Cidade",
+    "lang_operations": "Opera\u00e7\u00f5es",
+    "lang_remove": "Remover",
+    "lang_save": "Salvar",
+    "module_name": "Gerenciamento"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/dozmod/images-delete.json b/modules/dozmod/lang/de/templates/images-delete.json
index 8c54e4d1..8c54e4d1 100644
--- a/lang/de/templates/dozmod/images-delete.json
+++ b/modules/dozmod/lang/de/templates/images-delete.json
diff --git a/lang/de/templates/dozmod/mailconfig.json b/modules/dozmod/lang/de/templates/mailconfig.json
index 4509c3c7..4509c3c7 100644
--- a/lang/de/templates/dozmod/mailconfig.json
+++ b/modules/dozmod/lang/de/templates/mailconfig.json
diff --git a/lang/de/templates/dozmod/orglist.json b/modules/dozmod/lang/de/templates/orglist.json
index 938429f0..938429f0 100644
--- a/lang/de/templates/dozmod/orglist.json
+++ b/modules/dozmod/lang/de/templates/orglist.json
diff --git a/lang/de/templates/dozmod/userlist.json b/modules/dozmod/lang/de/templates/userlist.json
index e9e33cc2..e9e33cc2 100644
--- a/lang/de/templates/dozmod/userlist.json
+++ b/modules/dozmod/lang/de/templates/userlist.json
diff --git a/modules/dozmod/lang/en/module.json b/modules/dozmod/lang/en/module.json
new file mode 100644
index 00000000..e42d21ea
--- /dev/null
+++ b/modules/dozmod/lang/en/module.json
@@ -0,0 +1,3 @@
+{
+    "module_name": "Tutor Module"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/dozmod/images-delete.json b/modules/dozmod/lang/en/templates/images-delete.json
index fcc8c7e7..fcc8c7e7 100644
--- a/lang/en/modules/dozmod/images-delete.json
+++ b/modules/dozmod/lang/en/templates/images-delete.json
diff --git a/lang/en/modules/dozmod/mailconfig.json b/modules/dozmod/lang/en/templates/mailconfig.json
index 0c0dcd7f..0c0dcd7f 100644
--- a/lang/en/modules/dozmod/mailconfig.json
+++ b/modules/dozmod/lang/en/templates/mailconfig.json
diff --git a/lang/en/modules/dozmod/orglist.json b/modules/dozmod/lang/en/templates/orglist.json
index 37b89e02..37b89e02 100644
--- a/lang/en/modules/dozmod/orglist.json
+++ b/modules/dozmod/lang/en/templates/orglist.json
diff --git a/lang/en/modules/dozmod/userlist.json b/modules/dozmod/lang/en/templates/userlist.json
index 615f1b14..615f1b14 100644
--- a/lang/en/modules/dozmod/userlist.json
+++ b/modules/dozmod/lang/en/templates/userlist.json
diff --git a/lang/de/templates/eventlog/_page.json b/modules/eventlog/lang/de/templates/_page.json
index b1a292e6..b1a292e6 100644
--- a/lang/de/templates/eventlog/_page.json
+++ b/modules/eventlog/lang/de/templates/_page.json
diff --git a/modules/eventlog/lang/en/module.json b/modules/eventlog/lang/en/module.json
new file mode 100644
index 00000000..a0f6afa6
--- /dev/null
+++ b/modules/eventlog/lang/en/module.json
@@ -0,0 +1,7 @@
+{
+    "lang_details": "Details",
+    "lang_event": "Event",
+    "lang_eventLog": "Server Log",
+    "lang_when": "When",
+    "module_name": "Client Log"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/eventlog/_page.json b/modules/eventlog/lang/en/templates/_page.json
index 21ec64ea..21ec64ea 100644
--- a/lang/en/modules/eventlog/_page.json
+++ b/modules/eventlog/lang/en/templates/_page.json
diff --git a/modules/eventlog/lang/pt/module.json b/modules/eventlog/lang/pt/module.json
new file mode 100644
index 00000000..4fcf321a
--- /dev/null
+++ b/modules/eventlog/lang/pt/module.json
@@ -0,0 +1,7 @@
+{
+    "lang_details": "Detalhes",
+    "lang_event": "Evento",
+    "lang_eventLog": "Log dos Eventos",
+    "lang_when": "Quando",
+    "module_name": "Log dos Clientes"
+}
+\ No newline at end of file
diff --git a/modules/imgmanagement/lang/pt/module.json b/modules/imgmanagement/lang/pt/module.json
new file mode 100644
index 00000000..83b9751a
--- /dev/null
+++ b/modules/imgmanagement/lang/pt/module.json
@@ -0,0 +1,3 @@
+{
+    "module_name": "Gerenciamento de Imagens"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/internetaccess/_page.json b/modules/internetaccess/lang/de/templates/_page.json
index 61e324a8..61e324a8 100644
--- a/lang/de/templates/internetaccess/_page.json
+++ b/modules/internetaccess/lang/de/templates/_page.json
diff --git a/lang/de/templates/internetaccess/restart.json b/modules/internetaccess/lang/de/templates/restart.json
index 899a1d28..899a1d28 100644
--- a/lang/de/templates/internetaccess/restart.json
+++ b/modules/internetaccess/lang/de/templates/restart.json
diff --git a/modules/internetaccess/lang/en/module.json b/modules/internetaccess/lang/en/module.json
new file mode 100644
index 00000000..f0c2f72f
--- /dev/null
+++ b/modules/internetaccess/lang/en/module.json
@@ -0,0 +1,3 @@
+{
+    "module_name": "Internet Access"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/internetaccess/_page.json b/modules/internetaccess/lang/en/templates/_page.json
index c02ca4f5..c02ca4f5 100644
--- a/lang/en/modules/internetaccess/_page.json
+++ b/modules/internetaccess/lang/en/templates/_page.json
diff --git a/lang/en/modules/internetaccess/restart.json b/modules/internetaccess/lang/en/templates/restart.json
index badad460..badad460 100644
--- a/lang/en/modules/internetaccess/restart.json
+++ b/modules/internetaccess/lang/en/templates/restart.json
diff --git a/lang/de/templates/locations/location-subnets.json b/modules/locations/lang/de/templates/location-subnets.json
index 6caa1991..6caa1991 100644
--- a/lang/de/templates/locations/location-subnets.json
+++ b/modules/locations/lang/de/templates/location-subnets.json
diff --git a/lang/de/templates/locations/locations.json b/modules/locations/lang/de/templates/locations.json
index 3e25ef45..3e25ef45 100644
--- a/lang/de/templates/locations/locations.json
+++ b/modules/locations/lang/de/templates/locations.json
diff --git a/lang/de/templates/locations/subnets.json b/modules/locations/lang/de/templates/subnets.json
index b57f87ce..b57f87ce 100644
--- a/lang/de/templates/locations/subnets.json
+++ b/modules/locations/lang/de/templates/subnets.json
diff --git a/modules/locations/lang/en/module.json b/modules/locations/lang/en/module.json
new file mode 100644
index 00000000..b2a837b6
--- /dev/null
+++ b/modules/locations/lang/en/module.json
@@ -0,0 +1,3 @@
+{
+    "module_name": "Room\/Locations"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/locations/location-subnets.json b/modules/locations/lang/en/templates/location-subnets.json
index 2ba94384..2ba94384 100644
--- a/lang/en/modules/locations/location-subnets.json
+++ b/modules/locations/lang/en/templates/location-subnets.json
diff --git a/lang/en/modules/locations/locations.json b/modules/locations/lang/en/templates/locations.json
index db4fd0a7..db4fd0a7 100644
--- a/lang/en/modules/locations/locations.json
+++ b/modules/locations/lang/en/templates/locations.json
diff --git a/lang/en/modules/locations/subnets.json b/modules/locations/lang/en/templates/subnets.json
index 65da254b..65da254b 100644
--- a/lang/en/modules/locations/subnets.json
+++ b/modules/locations/lang/en/templates/subnets.json
diff --git a/lang/de/templates/dialog-generic.json b/modules/main/lang/de/templates/dialog-generic.json
index ff429fdd..ff429fdd 100644
--- a/lang/de/templates/dialog-generic.json
+++ b/modules/main/lang/de/templates/dialog-generic.json
diff --git a/lang/de/templates/main-menu.json b/modules/main/lang/de/templates/main-menu.json
index 67ae974a..67ae974a 100644
--- a/lang/de/templates/main-menu.json
+++ b/modules/main/lang/de/templates/main-menu.json
diff --git a/lang/de/templates/messagebox-error.json b/modules/main/lang/de/templates/messagebox-error.json
index c44dc44f..c44dc44f 100644
--- a/lang/de/templates/messagebox-error.json
+++ b/modules/main/lang/de/templates/messagebox-error.json
diff --git a/lang/de/templates/messagebox-info.json b/modules/main/lang/de/templates/messagebox-info.json
index 0967ef42..0967ef42 100644
--- a/lang/de/templates/messagebox-info.json
+++ b/modules/main/lang/de/templates/messagebox-info.json
diff --git a/lang/de/templates/messagebox-success.json b/modules/main/lang/de/templates/messagebox-success.json
index 0967ef42..0967ef42 100644
--- a/lang/de/templates/messagebox-success.json
+++ b/modules/main/lang/de/templates/messagebox-success.json
diff --git a/lang/de/templates/messagebox-warning.json b/modules/main/lang/de/templates/messagebox-warning.json
index 0967ef42..0967ef42 100644
--- a/lang/de/templates/messagebox-warning.json
+++ b/modules/main/lang/de/templates/messagebox-warning.json
diff --git a/lang/de/templates/page-main-guest.json b/modules/main/lang/de/templates/page-main-guest.json
index 876fccac..876fccac 100644
--- a/lang/de/templates/page-main-guest.json
+++ b/modules/main/lang/de/templates/page-main-guest.json
diff --git a/lang/de/templates/page-main.json b/modules/main/lang/de/templates/page-main.json
index a927e4ce..a927e4ce 100644
--- a/lang/de/templates/page-main.json
+++ b/modules/main/lang/de/templates/page-main.json
diff --git a/modules/main/lang/en/module.json b/modules/main/lang/en/module.json
new file mode 100644
index 00000000..613213d9
--- /dev/null
+++ b/modules/main/lang/en/module.json
@@ -0,0 +1,13 @@
+{
+    "lang_intro": "Esta \u00e9 a interface de configura\u00e7\u00e3o do OpenSLX.",
+    "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.",
+    "lang_language": "Language",
+    "lang_login": "Login",
+    "lang_logout": "Logout",
+    "lang_needsSetup": "Setup incomplete",
+    "lang_next": "Next",
+    "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.",
+    "lang_register": "Register",
+    "lang_warning": "Warning",
+    "lang_welcome": "Welcome"
+}
+\ No newline at end of file
diff --git a/modules/main/lang/pt/module.json b/modules/main/lang/pt/module.json
new file mode 100644
index 00000000..e4e35acd
--- /dev/null
+++ b/modules/main/lang/pt/module.json
@@ -0,0 +1,14 @@
+{
+    "lang_intro": "Esta \u00e9 a interface de configura\u00e7\u00e3o do OpenSLX.",
+    "lang_introGuest": "Esta \u00e9 a interface de administra\u00e7\u00e3o da instala\u00e7\u00e3o local do bwLehrpool. Por favor, autentique-se para ajustar op\u00e7\u00f5es.",
+    "lang_language": "L\u00edngua",
+    "lang_login": "Entrar",
+    "lang_logout": "Sair",
+    "lang_needsSetup": "Instala\u00e7\u00e3o incompleta",
+    "lang_next": "Pr\u00f3ximo",
+    "lang_noExistingAccount": "Nenhuma conta foi criada ainda. Registre-se para se tornar administrador.",
+    "lang_register": "Registrar",
+    "lang_translations": "Tradu\u00e7\u00f5es",
+    "lang_warning": "Aten\u00e7\u00e3o",
+    "lang_welcome": "Bem-vindo"
+}
diff --git a/modules/main/templates/main-menu.html b/modules/main/templates/main-menu.html
index 556548e9..65085ee6 100644
--- a/modules/main/templates/main-menu.html
+++ b/modules/main/templates/main-menu.html
@@ -29,7 +29,7 @@
 			<ul class="nav navbar-nav">
 				{{#categories}}
 				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="sidebar-visible-inline {{icon}}"></span> {{displayName}}<b class="caret sidebar-hide"></b></a>
+					<a href="#" class="dropdown-toggle slx-nopointer" data-toggle="dropdown"><span class="sidebar-visible-inline {{icon}}"></span> {{displayName}}<b class="caret sidebar-hide"></b></a>
 					<ul class="dropdown-menu sidebar-visible-block" role="menu">
 						{{#modules}}
 						<li class="{{className}}"><a href="?do={{identifier}}">{{displayName}}</a></li>
diff --git a/lang/de/templates/minilinux/download.json b/modules/minilinux/lang/de/templates/download.json
index 0967ef42..0967ef42 100644
--- a/lang/de/templates/minilinux/download.json
+++ b/modules/minilinux/lang/de/templates/download.json
diff --git a/lang/de/templates/minilinux/filelist.json b/modules/minilinux/lang/de/templates/filelist.json
index 214d758a..214d758a 100644
--- a/lang/de/templates/minilinux/filelist.json
+++ b/modules/minilinux/lang/de/templates/filelist.json
diff --git a/lang/de/templates/page-minilinux.json b/modules/minilinux/lang/de/templates/page-minilinux.json
index f30f7b76..f30f7b76 100644
--- a/lang/de/templates/page-minilinux.json
+++ b/modules/minilinux/lang/de/templates/page-minilinux.json
diff --git a/modules/minilinux/lang/en/module.json b/modules/minilinux/lang/en/module.json
new file mode 100644
index 00000000..b9262b5a
--- /dev/null
+++ b/modules/minilinux/lang/en/module.json
@@ -0,0 +1,12 @@
+{
+    "lang_actual": "Actual",
+    "lang_canUpdate1": "At least one component of",
+    "lang_canUpdate2": "can be updated. For a smooth operation, it is recommended to keep all components up to date.",
+    "lang_configurationPackageNotFound": "Configuration package not found!",
+    "lang_errorGetting": "Error while downloading list!",
+    "lang_listObtained": "Downloading list...",
+    "lang_outdated": "Outdated",
+    "lang_systemUpdated": "The system is up to date.",
+    "lang_update": "Update",
+    "module_name": "Minilinux"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/minilinux/download.json b/modules/minilinux/lang/en/templates/download.json
index 2c63c085..2c63c085 100644
--- a/lang/en/modules/minilinux/download.json
+++ b/modules/minilinux/lang/en/templates/download.json
diff --git a/lang/en/modules/minilinux/filelist.json b/modules/minilinux/lang/en/templates/filelist.json
index 89fed42b..89fed42b 100644
--- a/lang/en/modules/minilinux/filelist.json
+++ b/modules/minilinux/lang/en/templates/filelist.json
diff --git a/lang/en/modules/minilinux/page-minilinux.json b/modules/minilinux/lang/en/templates/page-minilinux.json
index 2f59fa57..2f59fa57 100644
--- a/lang/en/modules/minilinux/page-minilinux.json
+++ b/modules/minilinux/lang/en/templates/page-minilinux.json
diff --git a/modules/minilinux/lang/pt/module.json b/modules/minilinux/lang/pt/module.json
new file mode 100644
index 00000000..0ce7629d
--- /dev/null
+++ b/modules/minilinux/lang/pt/module.json
@@ -0,0 +1,12 @@
+{
+    "lang_actual": "Atual",
+    "lang_canUpdate1": "Pelo menos um componente de",
+    "lang_canUpdate2": "pode ser atualizado. Para um bom funcionamento, recomenda-se manter todos os componentes atualizados.",
+    "lang_configurationPackageNotFound": "Pacote de configura\u00e7\u00e3o n\u00e3o encontrado!",
+    "lang_errorGetting": "Erro ao baixar a lista!",
+    "lang_listObtained": "Carregando lista...",
+    "lang_outdated": "Desatualizado",
+    "lang_systemUpdated": "O sistema est\u00e1 atualizado.",
+    "lang_update": "Atualizar",
+    "module_name": "Minilinux"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/page-news.json b/modules/news/lang/de/templates/page-news.json
index 7801584d..7801584d 100644
--- a/lang/de/templates/page-news.json
+++ b/modules/news/lang/de/templates/page-news.json
diff --git a/modules/news/lang/en/module.json b/modules/news/lang/en/module.json
new file mode 100644
index 00000000..5acbe58d
--- /dev/null
+++ b/modules/news/lang/en/module.json
@@ -0,0 +1,12 @@
+{
+    "lang_activeNews": "News",
+    "lang_content": "Content",
+    "lang_date": "Date",
+    "lang_delete": "Delete",
+    "lang_latestUpdate": "Last Update",
+    "lang_newsOld": "Old News",
+    "lang_save": "Save",
+    "lang_show": "Show",
+    "lang_title": "Title",
+    "module_name": "News"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/news/page-news.json b/modules/news/lang/en/templates/page-news.json
index df63658c..df63658c 100644
--- a/lang/en/modules/news/page-news.json
+++ b/modules/news/lang/en/templates/page-news.json
diff --git a/modules/news/lang/pt/module.json b/modules/news/lang/pt/module.json
new file mode 100644
index 00000000..e1997fce
--- /dev/null
+++ b/modules/news/lang/pt/module.json
@@ -0,0 +1,13 @@
+{
+    "lang_activeNews": "Novidades",
+    "lang_content": "Conte\u00fado",
+    "lang_date": "Data",
+    "lang_delete": "Excluir",
+    "lang_latestUpdate": "\u00daltima Atualiza\u00e7\u00e3o",
+    "lang_newsIntro": "Aqui voc\u00ea tem a possibilidade de editar as novidades que s\u00e3o mostradas para os clientes do bwLehrpool.",
+    "lang_newsOld": "Antigas",
+    "lang_save": "Salvar",
+    "lang_show": "Mostrar",
+    "lang_title": "T\u00edtulo",
+    "module_name": "Novidades"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/serversetup/ipaddress.json b/modules/serversetup/lang/de/templates/ipaddress.json
index eb3d34d3..eb3d34d3 100644
--- a/lang/de/templates/serversetup/ipaddress.json
+++ b/modules/serversetup/lang/de/templates/ipaddress.json
diff --git a/lang/de/templates/serversetup/ipxe.json b/modules/serversetup/lang/de/templates/ipxe.json
index edce0b5e..edce0b5e 100644
--- a/lang/de/templates/serversetup/ipxe.json
+++ b/modules/serversetup/lang/de/templates/ipxe.json
diff --git a/lang/de/templates/serversetup/ipxe_update.json b/modules/serversetup/lang/de/templates/ipxe_update.json
index b984de19..b984de19 100644
--- a/lang/de/templates/serversetup/ipxe_update.json
+++ b/modules/serversetup/lang/de/templates/ipxe_update.json
diff --git a/modules/serversetup/lang/en/module.json b/modules/serversetup/lang/en/module.json
new file mode 100644
index 00000000..c7c06098
--- /dev/null
+++ b/modules/serversetup/lang/en/module.json
@@ -0,0 +1,34 @@
+{
+    "lang_active": "Active",
+    "lang_bootAddress": "Boot Address of the Server",
+    "lang_bootBehavior": "Default Boot Behavior",
+    "lang_bootHint": "The Boot menu must be recreated after changing the IP address. Usually this is done automatically, but the process can also be triggered manually in the section of the boot menu.",
+    "lang_bootInfo": "Here adjustments can be made to the appearance of the boot menu.",
+    "lang_bootMenu": "Boot Menu",
+    "lang_bootMenuCreate": "Create Boot Menu",
+    "lang_cancel": "Cancel",
+    "lang_chooseIP": "Please select the IP address that the client server will use to boot.",
+    "lang_close": "Close",
+    "lang_compile": "Compile",
+    "lang_compilingIpxe": "Compiling iPXE",
+    "lang_customScript": "Custom Script",
+    "lang_download": "Download",
+    "lang_example": "Example",
+    "lang_extension": "Extension",
+    "lang_ipxeInfo": "Here it is possible to compile and download iPXE for USB using a custom script.",
+    "lang_ipxeWarning": "If this is your first time compiling, it may take 1 to 4 minutes to finish.",
+    "lang_loading": "Loading",
+    "lang_localHDD": "Local HDD",
+    "lang_menuCustom": "Custom Extra Menu",
+    "lang_menuCustomHint1": "Here you have the opportunity to add your own menu code to the displayed PXE menu, eg to refer to other PXE server. The format corresponds to the syslinux menu format.",
+    "lang_menuCustomHint2": "You can create one or more entries. If you want to create an entry that starts automatically when the user makes a selection, assign as",
+    "lang_menuCustomHint3": "and select as the default boot behavior my-entry as well.",
+    "lang_menuDisplayTime": "Menu Display Time",
+    "lang_mountIpxe": "Mount iPXE",
+    "lang_restoreDefault": "Restore Default",
+    "lang_saveScript": "Save Script",
+    "lang_seconds": "Seconds",
+    "lang_set": "Set",
+    "lang_success": "Successfully create file:",
+    "module_name": "iPXE \/ Boot Menu"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/serversetup/ipaddress.json b/modules/serversetup/lang/en/templates/ipaddress.json
index 699aeacc..699aeacc 100644
--- a/lang/en/modules/serversetup/ipaddress.json
+++ b/modules/serversetup/lang/en/templates/ipaddress.json
diff --git a/lang/en/modules/serversetup/ipxe.json b/modules/serversetup/lang/en/templates/ipxe.json
index 70c17f43..70c17f43 100644
--- a/lang/en/modules/serversetup/ipxe.json
+++ b/modules/serversetup/lang/en/templates/ipxe.json
diff --git a/lang/en/modules/serversetup/ipxe_update.json b/modules/serversetup/lang/en/templates/ipxe_update.json
index b33b12dd..b33b12dd 100644
--- a/lang/en/modules/serversetup/ipxe_update.json
+++ b/modules/serversetup/lang/en/templates/ipxe_update.json
diff --git a/modules/serversetup/lang/pt/module.json b/modules/serversetup/lang/pt/module.json
new file mode 100644
index 00000000..e0e5a2b6
--- /dev/null
+++ b/modules/serversetup/lang/pt/module.json
@@ -0,0 +1,40 @@
+{
+    "lang_active": "Ativo",
+    "lang_bootAddress": "Endere\u00e7o Boot do Servidor",
+    "lang_bootBehavior": "Comportamento Padr\u00e3o de Boot",
+    "lang_bootHint": "O menu de boot deve ser recriado ap\u00f3s alterar o endere\u00e7o IP. Geralmente isso \u00e9 feito automaticamente, mas o processo tamb\u00e9m pode ser acionado manualmente na se\u00e7\u00e3o do menu de boot.",
+    "lang_bootInfo": "Aqui ajustes podem ser feitos na apar\u00eancia do menu de boot.",
+    "lang_bootMenu": "Menu de Boot",
+    "lang_bootMenuCreate": "Criar Menu de Boot",
+    "lang_cancel": "Cancelar",
+    "lang_chooseIP": "Por favor, selecione o endere\u00e7o IP que o servidor do cliente utilizar\u00e1 realizar o boot.",
+    "lang_close": "Fechar",
+    "lang_compile": "Compilar",
+    "lang_compileIso": "Compilar .iso",
+    "lang_compileKkpxe": "Compilar .kkpxe",
+    "lang_compileUsb": "Compilar .usb",
+    "lang_compilingIpxe": "Compilando iPXE",
+    "lang_customScript": "Script Customizado",
+    "lang_download": "Baixar",
+    "lang_example": "Exemplo",
+    "lang_extension": "Extens\u00e3o",
+    "lang_ipxeAdv": "Gerar iPXE no Modo Avan\u00e7ado",
+    "lang_ipxeInfo": "Aqui \u00e9 poss\u00edvel compilar e baixar o iPXE utilizando um script customiz\u00e1vel.",
+    "lang_ipxeSmp": "Gerar iPXE no Modo Simples",
+    "lang_ipxeSmpInfo": "Aqui voc\u00ea pode escolher gerar o iPXE escolhendo apenas uma das extens\u00f5es abaixo",
+    "lang_ipxeWarning": "Se esta for a primeira vez compilando, poder\u00e1 levar entre 1 e 4 minutos para que termine.",
+    "lang_loading": "Carregando",
+    "lang_localHDD": "HDD Local",
+    "lang_menuCustom": "Menu Adicional Customizado",
+    "lang_menuCustomHint1": "Aqui voc\u00ea tem a oportunidade de adicionar seu pr\u00f3prio c\u00f3digo de menu para o menu PXE exibido, por exemplo, para se referir a outro servidor PXE. O formato corresponde ao formato de menu syslinux.",
+    "lang_menuCustomHint2": "Voc\u00ea pode criar uma ou mais entradas. Se voc\u00ea quiser criar uma entrada que \u00e9 iniciada automaticamente quando o usu\u00e1rio faz uma sele\u00e7\u00e3o, atribua como",
+    "lang_menuCustomHint3": "e selecione como o comportamento de boot padr\u00e3o tamb\u00e9m my-entry.",
+    "lang_menuDisplayTime": "Tempo de Exibi\u00e7\u00e3o do Menu",
+    "lang_mountIpxe": "Montar iPXE",
+    "lang_restoreDefault": "Restaurar Padr\u00e3o",
+    "lang_saveScript": "Salvar Script",
+    "lang_seconds": "Segundos",
+    "lang_set": "Definir",
+    "lang_success": "Arquivo criado com sucesso:",
+    "module_name": "iPXE \/ Boot Menu"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/page-login.json b/modules/session/lang/de/templates/page-login.json
index 03576a07..03576a07 100644
--- a/lang/de/templates/page-login.json
+++ b/modules/session/lang/de/templates/page-login.json
diff --git a/modules/session/lang/en/module.json b/modules/session/lang/en/module.json
new file mode 100644
index 00000000..6df26f22
--- /dev/null
+++ b/modules/session/lang/en/module.json
@@ -0,0 +1,8 @@
+{
+    "lang_enter": "Enter",
+    "lang_login": "Login",
+    "lang_password": "Password",
+    "lang_register": "Register",
+    "lang_rememberID": "Remember User",
+    "lang_username": "Username"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/session/page-login.json b/modules/session/lang/en/templates/page-login.json
index 4b192a7a..4b192a7a 100644
--- a/lang/en/modules/session/page-login.json
+++ b/modules/session/lang/en/templates/page-login.json
diff --git a/modules/session/lang/pt/module.json b/modules/session/lang/pt/module.json
new file mode 100644
index 00000000..3d1e19eb
--- /dev/null
+++ b/modules/session/lang/pt/module.json
@@ -0,0 +1,8 @@
+{
+    "lang_enter": "Entrar",
+    "lang_login": "Entrar",
+    "lang_password": "Senha",
+    "lang_register": "Registrar",
+    "lang_rememberID": "Lembrar Usu\u00e1rio",
+    "lang_username": "Nome de Usu\u00e1rio"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/statistics/clientlist.json b/modules/statistics/lang/de/templates/clientlist.json
index a1022e69..a1022e69 100644
--- a/lang/de/templates/statistics/clientlist.json
+++ b/modules/statistics/lang/de/templates/clientlist.json
diff --git a/lang/de/templates/statistics/cpumodels.json b/modules/statistics/lang/de/templates/cpumodels.json
index 85cf517f..85cf517f 100644
--- a/lang/de/templates/statistics/cpumodels.json
+++ b/modules/statistics/lang/de/templates/cpumodels.json
diff --git a/lang/de/templates/statistics/id44.json b/modules/statistics/lang/de/templates/id44.json
index e2660f20..e2660f20 100644
--- a/lang/de/templates/statistics/id44.json
+++ b/modules/statistics/lang/de/templates/id44.json
diff --git a/lang/de/templates/statistics/kvmstate.json b/modules/statistics/lang/de/templates/kvmstate.json
index 3e8f1a96..3e8f1a96 100644
--- a/lang/de/templates/statistics/kvmstate.json
+++ b/modules/statistics/lang/de/templates/kvmstate.json
diff --git a/lang/de/templates/statistics/machine-hdds.json b/modules/statistics/lang/de/templates/machine-hdds.json
index f2f26baf..f2f26baf 100644
--- a/lang/de/templates/statistics/machine-hdds.json
+++ b/modules/statistics/lang/de/templates/machine-hdds.json
diff --git a/lang/de/templates/statistics/machine-main.json b/modules/statistics/lang/de/templates/machine-main.json
index 47c3e266..47c3e266 100644
--- a/lang/de/templates/statistics/machine-main.json
+++ b/modules/statistics/lang/de/templates/machine-main.json
diff --git a/lang/de/templates/statistics/machine-notes.json b/modules/statistics/lang/de/templates/machine-notes.json
index f9df1b92..f9df1b92 100644
--- a/lang/de/templates/statistics/machine-notes.json
+++ b/modules/statistics/lang/de/templates/machine-notes.json
diff --git a/lang/de/templates/statistics/machine-usage.json b/modules/statistics/lang/de/templates/machine-usage.json
index e2c9a979..e2c9a979 100644
--- a/lang/de/templates/statistics/machine-usage.json
+++ b/modules/statistics/lang/de/templates/machine-usage.json
diff --git a/lang/de/templates/statistics/memory.json b/modules/statistics/lang/de/templates/memory.json
index b5fdac89..b5fdac89 100644
--- a/lang/de/templates/statistics/memory.json
+++ b/modules/statistics/lang/de/templates/memory.json
diff --git a/lang/de/templates/statistics/newclients.json b/modules/statistics/lang/de/templates/newclients.json
index f1353389..f1353389 100644
--- a/lang/de/templates/statistics/newclients.json
+++ b/modules/statistics/lang/de/templates/newclients.json
diff --git a/lang/de/templates/statistics/summary.json b/modules/statistics/lang/de/templates/summary.json
index 30189871..30189871 100644
--- a/lang/de/templates/statistics/summary.json
+++ b/modules/statistics/lang/de/templates/summary.json
diff --git a/lang/de/templates/statistics/syslog.json b/modules/statistics/lang/de/templates/syslog.json
index 960de730..960de730 100644
--- a/lang/de/templates/statistics/syslog.json
+++ b/modules/statistics/lang/de/templates/syslog.json
diff --git a/modules/statistics/lang/en/module.json b/modules/statistics/lang/en/module.json
new file mode 100644
index 00000000..b4c6db44
--- /dev/null
+++ b/modules/statistics/lang/en/module.json
@@ -0,0 +1,3 @@
+{
+    "module_name": "Client Statistics"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/statistics/clientlist.json b/modules/statistics/lang/en/templates/clientlist.json
index ae692154..ae692154 100644
--- a/lang/en/modules/statistics/clientlist.json
+++ b/modules/statistics/lang/en/templates/clientlist.json
diff --git a/lang/en/modules/statistics/cpumodels.json b/modules/statistics/lang/en/templates/cpumodels.json
index 864933dd..864933dd 100644
--- a/lang/en/modules/statistics/cpumodels.json
+++ b/modules/statistics/lang/en/templates/cpumodels.json
diff --git a/lang/en/modules/statistics/id44.json b/modules/statistics/lang/en/templates/id44.json
index 0d0081a8..0d0081a8 100644
--- a/lang/en/modules/statistics/id44.json
+++ b/modules/statistics/lang/en/templates/id44.json
diff --git a/lang/en/modules/statistics/kvmstate.json b/modules/statistics/lang/en/templates/kvmstate.json
index b4846473..b4846473 100644
--- a/lang/en/modules/statistics/kvmstate.json
+++ b/modules/statistics/lang/en/templates/kvmstate.json
diff --git a/lang/en/modules/statistics/machine-hdds.json b/modules/statistics/lang/en/templates/machine-hdds.json
index 8ce6801d..8ce6801d 100644
--- a/lang/en/modules/statistics/machine-hdds.json
+++ b/modules/statistics/lang/en/templates/machine-hdds.json
diff --git a/lang/en/modules/statistics/machine-main.json b/modules/statistics/lang/en/templates/machine-main.json
index 1addd437..1addd437 100644
--- a/lang/en/modules/statistics/machine-main.json
+++ b/modules/statistics/lang/en/templates/machine-main.json
diff --git a/lang/en/modules/statistics/machine-notes.json b/modules/statistics/lang/en/templates/machine-notes.json
index 7a13f28a..7a13f28a 100644
--- a/lang/en/modules/statistics/machine-notes.json
+++ b/modules/statistics/lang/en/templates/machine-notes.json
diff --git a/lang/en/modules/statistics/machine-usage.json b/modules/statistics/lang/en/templates/machine-usage.json
index 398996f6..398996f6 100644
--- a/lang/en/modules/statistics/machine-usage.json
+++ b/modules/statistics/lang/en/templates/machine-usage.json
diff --git a/lang/en/modules/statistics/memory.json b/modules/statistics/lang/en/templates/memory.json
index decdd021..decdd021 100644
--- a/lang/en/modules/statistics/memory.json
+++ b/modules/statistics/lang/en/templates/memory.json
diff --git a/lang/en/modules/statistics/newclients.json b/modules/statistics/lang/en/templates/newclients.json
index f7e55f3f..f7e55f3f 100644
--- a/lang/en/modules/statistics/newclients.json
+++ b/modules/statistics/lang/en/templates/newclients.json
diff --git a/lang/en/modules/statistics/summary.json b/modules/statistics/lang/en/templates/summary.json
index b57c290f..b57c290f 100644
--- a/lang/en/modules/statistics/summary.json
+++ b/modules/statistics/lang/en/templates/summary.json
diff --git a/lang/en/modules/statistics/syslog.json b/modules/statistics/lang/en/templates/syslog.json
index 6737ca68..6737ca68 100644
--- a/lang/en/modules/statistics/syslog.json
+++ b/modules/statistics/lang/en/templates/syslog.json
diff --git a/lang/en/modules/messagebox-error.json b/modules/support/lang/en/module.json
index c44dc44f..c44dc44f 100644
--- a/lang/en/modules/messagebox-error.json
+++ b/modules/support/lang/en/module.json
diff --git a/modules/support/lang/pt/module.json b/modules/support/lang/pt/module.json
new file mode 100644
index 00000000..f82f6a04
--- /dev/null
+++ b/modules/support/lang/pt/module.json
@@ -0,0 +1,18 @@
+{
+    "lang_content": "Conte\u00fado",
+    "lang_content#1": "Ao clicar em cada uma pergunta, elas se expandem exibindo as respostas!",
+    "lang_content#2": "As perguntas ser\u00e3o adicionadas conforme as d\u00favidas forem surgindo",
+    "lang_content#3": "Se tiver uma d\u00favida que n\u00e3o est\u00e1 no FAQ, envie um e-mail clicando no bot\u00e3o abaixo ;)",
+    "lang_faq": "FAQ",
+    "lang_faq#1": "Este \u00e9 o FAQ",
+    "lang_faq#2": "Por enquanto n\u00e3o h\u00e1 nada por aqui (\u30c4)_\/\u00af",
+    "lang_faq#3": "Nem todas as perguntas estar\u00e3o aqui",
+    "lang_fileInput": "Arquivo:",
+    "lang_form": "Formul\u00e1rio",
+    "lang_header": "Assunto",
+    "lang_helpInput": "Voc\u00ea pode mandar uma foto\/arquivo que nos auxilie a entender o problema.",
+    "lang_showall": "Clique aqui para mostrar todo o FAQ",
+    "lang_submit": "Enviar",
+    "lang_supIntro": "N\u00e3o encontrou o que queria no FAQ? Mande-nos um e-mail informando o problema",
+    "module_name": "Suporte"
+}
+\ No newline at end of file
diff --git a/modules/sysconfig/config.json b/modules/sysconfig/config.json
index f2abe27c..ee5c83c8 100644
--- a/modules/sysconfig/config.json
+++ b/modules/sysconfig/config.json
@@ -1,4 +1,5 @@
 {
 	"category":"main.settings",
-	"enabled":"true"
+	"enabled":"true",
+	"dependencies": [ "minilinux" ]
 }
diff --git a/lang/de/templates/sysconfig/_page.json b/modules/sysconfig/lang/de/templates/_page.json
index 844a12ef..844a12ef 100644
--- a/lang/de/templates/sysconfig/_page.json
+++ b/modules/sysconfig/lang/de/templates/_page.json
diff --git a/lang/de/templates/sysconfig/ad-finish.json b/modules/sysconfig/lang/de/templates/ad-finish.json
index e91e98dc..e91e98dc 100644
--- a/lang/de/templates/sysconfig/ad-finish.json
+++ b/modules/sysconfig/lang/de/templates/ad-finish.json
diff --git a/lang/de/templates/sysconfig/ad-selfsearch.json b/modules/sysconfig/lang/de/templates/ad-selfsearch.json
index 89a957ee..89a957ee 100644
--- a/lang/de/templates/sysconfig/ad-selfsearch.json
+++ b/modules/sysconfig/lang/de/templates/ad-selfsearch.json
diff --git a/lang/de/templates/sysconfig/ad-start.json b/modules/sysconfig/lang/de/templates/ad-start.json
index a85e133f..a85e133f 100644
--- a/lang/de/templates/sysconfig/ad-start.json
+++ b/modules/sysconfig/lang/de/templates/ad-start.json
diff --git a/lang/de/templates/sysconfig/ad_ldap-checkconnection.json b/modules/sysconfig/lang/de/templates/ad_ldap-checkconnection.json
index 6bf31104..6bf31104 100644
--- a/lang/de/templates/sysconfig/ad_ldap-checkconnection.json
+++ b/modules/sysconfig/lang/de/templates/ad_ldap-checkconnection.json
diff --git a/lang/de/templates/sysconfig/ad_ldap-checkcredentials.json b/modules/sysconfig/lang/de/templates/ad_ldap-checkcredentials.json
index f0ab6e15..f0ab6e15 100644
--- a/lang/de/templates/sysconfig/ad_ldap-checkcredentials.json
+++ b/modules/sysconfig/lang/de/templates/ad_ldap-checkcredentials.json
diff --git a/lang/de/templates/sysconfig/branding-check.json b/modules/sysconfig/lang/de/templates/branding-check.json
index 740cc34f..740cc34f 100644
--- a/lang/de/templates/sysconfig/branding-check.json
+++ b/modules/sysconfig/lang/de/templates/branding-check.json
diff --git a/lang/de/templates/sysconfig/branding-start.json b/modules/sysconfig/lang/de/templates/branding-start.json
index e85a51d0..e85a51d0 100644
--- a/lang/de/templates/sysconfig/branding-start.json
+++ b/modules/sysconfig/lang/de/templates/branding-start.json
diff --git a/lang/de/templates/sysconfig/cfg-finish.json b/modules/sysconfig/lang/de/templates/cfg-finish.json
index 86fb7a15..86fb7a15 100644
--- a/lang/de/templates/sysconfig/cfg-finish.json
+++ b/modules/sysconfig/lang/de/templates/cfg-finish.json
diff --git a/lang/de/templates/sysconfig/cfg-start.json b/modules/sysconfig/lang/de/templates/cfg-start.json
index c22a96c3..c22a96c3 100644
--- a/lang/de/templates/sysconfig/cfg-start.json
+++ b/modules/sysconfig/lang/de/templates/cfg-start.json
diff --git a/lang/de/templates/sysconfig/config-module-list.json b/modules/sysconfig/lang/de/templates/config-module-list.json
index f346a107..f346a107 100644
--- a/lang/de/templates/sysconfig/config-module-list.json
+++ b/modules/sysconfig/lang/de/templates/config-module-list.json
diff --git a/lang/de/templates/sysconfig/custom-filelist.json b/modules/sysconfig/lang/de/templates/custom-filelist.json
index 1a73a858..1a73a858 100644
--- a/lang/de/templates/sysconfig/custom-filelist.json
+++ b/modules/sysconfig/lang/de/templates/custom-filelist.json
diff --git a/lang/de/templates/sysconfig/custom-fileselect.json b/modules/sysconfig/lang/de/templates/custom-fileselect.json
index 94085f65..94085f65 100644
--- a/lang/de/templates/sysconfig/custom-fileselect.json
+++ b/modules/sysconfig/lang/de/templates/custom-fileselect.json
diff --git a/lang/de/templates/sysconfig/custom-upload.json b/modules/sysconfig/lang/de/templates/custom-upload.json
index f9c3a8ae..f9c3a8ae 100644
--- a/lang/de/templates/sysconfig/custom-upload.json
+++ b/modules/sysconfig/lang/de/templates/custom-upload.json
diff --git a/lang/de/templates/sysconfig/ldap-checkconnection.json b/modules/sysconfig/lang/de/templates/ldap-checkconnection.json
index 4f2e619e..4f2e619e 100644
--- a/lang/de/templates/sysconfig/ldap-checkconnection.json
+++ b/modules/sysconfig/lang/de/templates/ldap-checkconnection.json
diff --git a/lang/de/templates/sysconfig/ldap-checkcredentials.json b/modules/sysconfig/lang/de/templates/ldap-checkcredentials.json
index c8dcc9cd..c8dcc9cd 100644
--- a/lang/de/templates/sysconfig/ldap-checkcredentials.json
+++ b/modules/sysconfig/lang/de/templates/ldap-checkcredentials.json
diff --git a/lang/de/templates/sysconfig/ldap-finish.json b/modules/sysconfig/lang/de/templates/ldap-finish.json
index 7387f3a0..7387f3a0 100644
--- a/lang/de/templates/sysconfig/ldap-finish.json
+++ b/modules/sysconfig/lang/de/templates/ldap-finish.json
diff --git a/lang/de/templates/sysconfig/ldap-start.json b/modules/sysconfig/lang/de/templates/ldap-start.json
index df5b1c09..df5b1c09 100644
--- a/lang/de/templates/sysconfig/ldap-start.json
+++ b/modules/sysconfig/lang/de/templates/ldap-start.json
diff --git a/lang/de/templates/sysconfig/sshconfig-start.json b/modules/sysconfig/lang/de/templates/sshconfig-start.json
index ef9286d7..ef9286d7 100644
--- a/lang/de/templates/sysconfig/sshconfig-start.json
+++ b/modules/sysconfig/lang/de/templates/sshconfig-start.json
diff --git a/lang/de/templates/sysconfig/start.json b/modules/sysconfig/lang/de/templates/start.json
index 37992831..37992831 100644
--- a/lang/de/templates/sysconfig/start.json
+++ b/modules/sysconfig/lang/de/templates/start.json
diff --git a/modules/sysconfig/lang/en/module.json b/modules/sysconfig/lang/en/module.json
new file mode 100644
index 00000000..c872d62a
--- /dev/null
+++ b/modules/sysconfig/lang/en/module.json
@@ -0,0 +1,4 @@
+{
+    "lang_delete": "Delete",
+    "module_name": "Modules"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/sysconfig/_page.json b/modules/sysconfig/lang/en/templates/_page.json
index 6f139359..6f139359 100644
--- a/lang/en/modules/sysconfig/_page.json
+++ b/modules/sysconfig/lang/en/templates/_page.json
diff --git a/lang/en/modules/sysconfig/ad-finish.json b/modules/sysconfig/lang/en/templates/ad-finish.json
index 8f89046e..8f89046e 100644
--- a/lang/en/modules/sysconfig/ad-finish.json
+++ b/modules/sysconfig/lang/en/templates/ad-finish.json
diff --git a/lang/en/modules/sysconfig/ad-selfsearch.json b/modules/sysconfig/lang/en/templates/ad-selfsearch.json
index 70db0620..70db0620 100644
--- a/lang/en/modules/sysconfig/ad-selfsearch.json
+++ b/modules/sysconfig/lang/en/templates/ad-selfsearch.json
diff --git a/lang/en/modules/sysconfig/ad-start.json b/modules/sysconfig/lang/en/templates/ad-start.json
index ff35fc03..ff35fc03 100644
--- a/lang/en/modules/sysconfig/ad-start.json
+++ b/modules/sysconfig/lang/en/templates/ad-start.json
diff --git a/lang/en/modules/sysconfig/ad_ldap-checkconnection.json b/modules/sysconfig/lang/en/templates/ad_ldap-checkconnection.json
index 6a924f8b..6a924f8b 100644
--- a/lang/en/modules/sysconfig/ad_ldap-checkconnection.json
+++ b/modules/sysconfig/lang/en/templates/ad_ldap-checkconnection.json
diff --git a/lang/en/modules/sysconfig/ad_ldap-checkcredentials.json b/modules/sysconfig/lang/en/templates/ad_ldap-checkcredentials.json
index 2b83a231..2b83a231 100644
--- a/lang/en/modules/sysconfig/ad_ldap-checkcredentials.json
+++ b/modules/sysconfig/lang/en/templates/ad_ldap-checkcredentials.json
diff --git a/lang/en/modules/sysconfig/ad_ldap-homedir.json b/modules/sysconfig/lang/en/templates/ad_ldap-homedir.json
index 90d4a211..90d4a211 100644
--- a/lang/en/modules/sysconfig/ad_ldap-homedir.json
+++ b/modules/sysconfig/lang/en/templates/ad_ldap-homedir.json
diff --git a/lang/en/modules/sysconfig/branding-check.json b/modules/sysconfig/lang/en/templates/branding-check.json
index 6a481d8b..6a481d8b 100644
--- a/lang/en/modules/sysconfig/branding-check.json
+++ b/modules/sysconfig/lang/en/templates/branding-check.json
diff --git a/lang/en/modules/sysconfig/branding-start.json b/modules/sysconfig/lang/en/templates/branding-start.json
index 4423784d..4423784d 100644
--- a/lang/en/modules/sysconfig/branding-start.json
+++ b/modules/sysconfig/lang/en/templates/branding-start.json
diff --git a/lang/en/modules/sysconfig/cfg-finish.json b/modules/sysconfig/lang/en/templates/cfg-finish.json
index b8729636..b8729636 100644
--- a/lang/en/modules/sysconfig/cfg-finish.json
+++ b/modules/sysconfig/lang/en/templates/cfg-finish.json
diff --git a/lang/en/modules/sysconfig/cfg-start.json b/modules/sysconfig/lang/en/templates/cfg-start.json
index 9afc6ce3..9afc6ce3 100644
--- a/lang/en/modules/sysconfig/cfg-start.json
+++ b/modules/sysconfig/lang/en/templates/cfg-start.json
diff --git a/lang/en/modules/sysconfig/config-module-list.json b/modules/sysconfig/lang/en/templates/config-module-list.json
index ff30c0b4..ff30c0b4 100644
--- a/lang/en/modules/sysconfig/config-module-list.json
+++ b/modules/sysconfig/lang/en/templates/config-module-list.json
diff --git a/lang/en/modules/sysconfig/custom-filelist.json b/modules/sysconfig/lang/en/templates/custom-filelist.json
index 50bec5b5..50bec5b5 100644
--- a/lang/en/modules/sysconfig/custom-filelist.json
+++ b/modules/sysconfig/lang/en/templates/custom-filelist.json
diff --git a/lang/en/modules/sysconfig/custom-fileselect.json b/modules/sysconfig/lang/en/templates/custom-fileselect.json
index 2ae25e16..2ae25e16 100644
--- a/lang/en/modules/sysconfig/custom-fileselect.json
+++ b/modules/sysconfig/lang/en/templates/custom-fileselect.json
diff --git a/lang/en/modules/sysconfig/custom-upload.json b/modules/sysconfig/lang/en/templates/custom-upload.json
index 26b7c186..26b7c186 100644
--- a/lang/en/modules/sysconfig/custom-upload.json
+++ b/modules/sysconfig/lang/en/templates/custom-upload.json
diff --git a/lang/en/modules/sysconfig/ldap-checkconnection.json b/modules/sysconfig/lang/en/templates/ldap-checkconnection.json
index 52fbae9e..52fbae9e 100644
--- a/lang/en/modules/sysconfig/ldap-checkconnection.json
+++ b/modules/sysconfig/lang/en/templates/ldap-checkconnection.json
diff --git a/lang/en/modules/sysconfig/ldap-checkcredentials.json b/modules/sysconfig/lang/en/templates/ldap-checkcredentials.json
index 2a8723c9..2a8723c9 100644
--- a/lang/en/modules/sysconfig/ldap-checkcredentials.json
+++ b/modules/sysconfig/lang/en/templates/ldap-checkcredentials.json
diff --git a/lang/en/modules/sysconfig/ldap-finish.json b/modules/sysconfig/lang/en/templates/ldap-finish.json
index bd15bafc..bd15bafc 100644
--- a/lang/en/modules/sysconfig/ldap-finish.json
+++ b/modules/sysconfig/lang/en/templates/ldap-finish.json
diff --git a/lang/en/modules/sysconfig/ldap-start.json b/modules/sysconfig/lang/en/templates/ldap-start.json
index 45ba19f1..45ba19f1 100644
--- a/lang/en/modules/sysconfig/ldap-start.json
+++ b/modules/sysconfig/lang/en/templates/ldap-start.json
diff --git a/lang/en/modules/sysconfig/sshconfig-start.json b/modules/sysconfig/lang/en/templates/sshconfig-start.json
index 1ce553cd..1ce553cd 100644
--- a/lang/en/modules/sysconfig/sshconfig-start.json
+++ b/modules/sysconfig/lang/en/templates/sshconfig-start.json
diff --git a/lang/en/modules/sysconfig/start.json b/modules/sysconfig/lang/en/templates/start.json
index 4567d649..4567d649 100644
--- a/lang/en/modules/sysconfig/start.json
+++ b/modules/sysconfig/lang/en/templates/start.json
diff --git a/modules/sysconfig/lang/pt/module.json b/modules/sysconfig/lang/pt/module.json
new file mode 100644
index 00000000..b2a9e60c
--- /dev/null
+++ b/modules/sysconfig/lang/pt/module.json
@@ -0,0 +1,38 @@
+{
+    "lang_activate": "Ativar",
+    "lang_active": "Ativo",
+    "lang_adText1": "Para configurar a autentica\u00e7\u00e3o de usu\u00e1rio por meio do Active Directory, um usu\u00e1rio dedicado \u00e9 necess\u00e1rio no AD pr\u00f3ximo ao endere\u00e7o do servidor, que \u00e9 endere\u00e7ado pelo AD.",
+    "lang_adText2": "Este usu\u00e1rio n\u00e3o precisa de direitos especiais, voc\u00ea pode seguir este usu\u00e1rio para escapar da seguran\u00e7a e dos direitos para fazer logon. O usu\u00e1rio s\u00f3 precisa ter permiss\u00f5es suficientes para executar a liga\u00e7\u00e3o LDAP no AD, e procurar por usu\u00e1rios.",
+    "lang_adText3": "A seguir o nome distinto do usu\u00e1rio deve ser especificado. Voc\u00ea pode determinar isso pelo programa de linha de comando dsquery em um controlador de dom\u00ednio como a seguinte chamada:",
+    "lang_adText4": "Depois de inserir todos os dados necess\u00e1rios na pr\u00f3xima etapa, ela verifica se a comunica\u00e7\u00e3o \u00e9 poss\u00edvel com o AD.",
+    "lang_availableModules": "M\u00f3dulos de Configura\u00e7\u00e3o Dispon\u00edveis",
+    "lang_availableSystem": "Configura\u00e7\u00f5es de Sistema Dispon\u00edveis",
+    "lang_back": "Voltar",
+    "lang_bindDN": "Vincular DN",
+    "lang_close": "Fechar",
+    "lang_configurationModuleNotFound": "M\u00f3dulo de configura\u00e7\u00e3o n\u00e3o encontrado!",
+    "lang_delete": "Excluir",
+    "lang_file": "Arquivo",
+    "lang_helpModuleConfiguration": "M\u00f3dulos de configura\u00e7\u00e3o s\u00e3o as pe\u00e7as fundamentais para a cria\u00e7\u00e3o de uma configura\u00e7\u00e3o de sistema. Aqui voc\u00ea pode criar tanto m\u00f3dulos gen\u00e9ricos atrav\u00e9s de nossa interface, tanto quanto criar m\u00f3dulos  completamente customizados (\u00e9 necess\u00e1rio conhecimento de Linux avan\u00e7ado).",
+    "lang_helpSystemConfiguration": "A localiza\u00e7\u00e3o fundamental do sistema bwLehrpool \u00e9 feita atrav\u00e9s de uma configura\u00e7\u00e3o de sistema. Isso inclui aspectos como o m\u00e9todo de autentica\u00e7\u00e3o de usu\u00e1rios (por exemplo, Diret\u00f3rio Ativo, LDAP), configura\u00e7\u00e3o de impressora, diret\u00f3rios home, etc. Uma configura\u00e7\u00e3o de sistema \u00e9 composta por um ou mais m\u00f3dulo de configura\u00e7\u00e3o, que podem ser gerenciados na parte inferior da p\u00e1gina.",
+    "lang_moduleConfiguration": "Configura\u00e7\u00e3o do M\u00f3dulo",
+    "lang_moduleTitle": "T\u00edtulo",
+    "lang_name": "Nome",
+    "lang_new": "Novo",
+    "lang_newConfiguration": "Nova Configura\u00e7\u00e3o",
+    "lang_newModule": "Novo M\u00f3dulo",
+    "lang_next": "Pr\u00f3ximo",
+    "lang_noContent": "Sem conte\u00fado!",
+    "lang_password": "Senha",
+    "lang_save": "Salvar",
+    "lang_searchBase": "Base de Pesquisa",
+    "lang_show": "Mostrar",
+    "lang_systemConfiguration": "Confgura\u00e7\u00e3o do Sistema",
+    "lang_systemConfigurationAlert": "Antes de criar uma configura\u00e7\u00e3o de sistema, voc\u00ea deve criar primeiro um m\u00f3dulo de configura\u00e7\u00e3o.",
+    "lang_systemConfigurationNotFound": "Nenhuma configura\u00e7\u00e3o de sistena encontrada. Crie uma nova configura\u00e7\u00e3o a partir dos m\u00f3dulos de configura\u00e7\u00e3o abaixo.",
+    "lang_userDirectory": "Diret\u00f3rio de Usu\u00e1rio",
+    "lang_userDirectoryInfo1": "Opcional: Se os clientes devem incorporar um diret\u00f3rio separado (diret\u00f3rio home, diret\u00f3rio de usu\u00e1rio) de um servidor para o usu\u00e1rio, digite aqui o formato em nota\u00e7\u00e3o UNC, por exemplo,",
+    "lang_userDirectoryInfo2": "%s \u00e9 um marcador para o nome de login do usu\u00e1rio.",
+    "lang_userDirectoryInfo3": "O diret\u00f3rio \u00e9 carregado com as mesmas credenciais que o usu\u00e1rio especifica quando entra. (Isto \u00e9, n\u00e3o h\u00e1 suporte Kerberos, etc)",
+    "module_name": "M\u00f3dulos"
+}
+\ No newline at end of file
diff --git a/modules/sysconfignew/lang/en/module.json b/modules/sysconfignew/lang/en/module.json
new file mode 100644
index 00000000..3ec89616
--- /dev/null
+++ b/modules/sysconfignew/lang/en/module.json
@@ -0,0 +1,23 @@
+{
+    "lang_back": "Back",
+    "lang_cancel": "Cancel",
+    "lang_cannotOpen": "could no be opened",
+    "lang_changeLink": "Change link",
+    "lang_compilingIpxe": "Compiling iPXE",
+    "lang_configName": "Name",
+    "lang_configsDescription": "Here it is possible to create a system configuration by choosing the desired modules.",
+    "lang_configurations": "Configurations",
+    "lang_create": "Create",
+    "lang_edit": "Edit",
+    "lang_file": "File",
+    "lang_leavingMessage": "You have unsaved changes on your module.",
+    "lang_loading": "Loading",
+    "lang_modules": "Modules",
+    "lang_modulesDescription": "Here it is possible to create a system module through an editor.",
+    "lang_name": "Name",
+    "lang_new": "New",
+    "lang_newConfig": "New Config",
+    "lang_newModule": "New Module",
+    "lang_remove": "Remove",
+    "lang_save": "Save"
+}
+\ No newline at end of file
diff --git a/modules/sysconfignew/lang/pt/module.json b/modules/sysconfignew/lang/pt/module.json
new file mode 100644
index 00000000..af0d7ad7
--- /dev/null
+++ b/modules/sysconfignew/lang/pt/module.json
@@ -0,0 +1,23 @@
+{
+    "lang_back": "Voltar",
+    "lang_cancel": "Cancelar",
+    "lang_cannotOpen": "n\u00e3o p\u00f4de ser aberto",
+    "lang_changeLink": "Mudar link",
+    "lang_compilingIpxe": "Compilando iPXE",
+    "lang_configName": "Nome",
+    "lang_configsDescription": "Aqui \u00e9 poss\u00edvel criar uma configura\u00e7\u00e3o do sistema escolhendo os m\u00f3dulos desejados.",
+    "lang_configurations": "Configura\u00e7\u00f5es",
+    "lang_create": "Criar",
+    "lang_edit": "Editar",
+    "lang_file": "Arquivo",
+    "lang_leavingMessage": "Voc\u00ea possui mudan\u00e7as n\u00e3o salvas no seu m\u00f3dulo.",
+    "lang_loading": "Carregando",
+    "lang_modules": "M\u00f3dulos",
+    "lang_modulesDescription": "Aqui \u00e9 poss\u00edvel criar um m\u00f3dulo do sistema atrav\u00e9s de um editor.",
+    "lang_name": "Nome",
+    "lang_new": "Novo",
+    "lang_newConfig": "Nova Configura\u00e7\u00e3o",
+    "lang_newModule": "Novo M\u00f3dulo",
+    "lang_remove": "Remover",
+    "lang_save": "Salvar"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/page-syslog.json b/modules/syslog/lang/de/templates/page-syslog.json
index 49e94602..49e94602 100644
--- a/lang/de/templates/page-syslog.json
+++ b/modules/syslog/lang/de/templates/page-syslog.json
diff --git a/modules/syslog/lang/en/module.json b/modules/syslog/lang/en/module.json
new file mode 100644
index 00000000..70107d9c
--- /dev/null
+++ b/modules/syslog/lang/en/module.json
@@ -0,0 +1,11 @@
+{
+    "lang_client": "Client",
+    "lang_clientLog": "Client Log",
+    "lang_details": "Details",
+    "lang_event": "Event",
+    "lang_filter": "Filter",
+    "lang_go": "go",
+    "lang_not": "no",
+    "lang_when": "When",
+    "module_name": "Server Log"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/syslog/page-syslog.json b/modules/syslog/lang/en/templates/page-syslog.json
index 71f61693..71f61693 100644
--- a/lang/en/modules/syslog/page-syslog.json
+++ b/modules/syslog/lang/en/templates/page-syslog.json
diff --git a/modules/syslog/lang/pt/module.json b/modules/syslog/lang/pt/module.json
new file mode 100644
index 00000000..0f7c5356
--- /dev/null
+++ b/modules/syslog/lang/pt/module.json
@@ -0,0 +1,11 @@
+{
+    "lang_client": "Cliente",
+    "lang_clientLog": "Log dos Clientes",
+    "lang_details": "Detalhes",
+    "lang_event": "Evento",
+    "lang_filter": "Filtro",
+    "lang_go": "Ir",
+    "lang_not": "n\u00e3o",
+    "lang_when": "Quando",
+    "module_name": "Log do Servidor"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/systemstatus/_page.json b/modules/systemstatus/lang/de/templates/_page.json
index 9c97961a..9c97961a 100644
--- a/lang/de/templates/systemstatus/_page.json
+++ b/modules/systemstatus/lang/de/templates/_page.json
diff --git a/lang/de/templates/systemstatus/addresses.json b/modules/systemstatus/lang/de/templates/addresses.json
index 0967ef42..0967ef42 100644
--- a/lang/de/templates/systemstatus/addresses.json
+++ b/modules/systemstatus/lang/de/templates/addresses.json
diff --git a/lang/de/templates/systemstatus/diskstat.json b/modules/systemstatus/lang/de/templates/diskstat.json
index c44433ea..c44433ea 100644
--- a/lang/de/templates/systemstatus/diskstat.json
+++ b/modules/systemstatus/lang/de/templates/diskstat.json
diff --git a/lang/de/templates/systemstatus/services.json b/modules/systemstatus/lang/de/templates/services.json
index 0967ef42..0967ef42 100644
--- a/lang/de/templates/systemstatus/services.json
+++ b/modules/systemstatus/lang/de/templates/services.json
diff --git a/lang/de/templates/systemstatus/systeminfo.json b/modules/systemstatus/lang/de/templates/systeminfo.json
index cd4027f1..cd4027f1 100644
--- a/lang/de/templates/systemstatus/systeminfo.json
+++ b/modules/systemstatus/lang/de/templates/systeminfo.json
diff --git a/modules/systemstatus/lang/en/module.json b/modules/systemstatus/lang/en/module.json
new file mode 100644
index 00000000..126d6bb8
--- /dev/null
+++ b/modules/systemstatus/lang/en/module.json
@@ -0,0 +1,3 @@
+{
+    "module_name": "Server"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/systemstatus/_page.json b/modules/systemstatus/lang/en/templates/_page.json
index f698521d..f698521d 100644
--- a/lang/en/modules/systemstatus/_page.json
+++ b/modules/systemstatus/lang/en/templates/_page.json
diff --git a/lang/en/modules/systemstatus/addresses.json b/modules/systemstatus/lang/en/templates/addresses.json
index 2c63c085..2c63c085 100644
--- a/lang/en/modules/systemstatus/addresses.json
+++ b/modules/systemstatus/lang/en/templates/addresses.json
diff --git a/lang/en/modules/systemstatus/diskstat.json b/modules/systemstatus/lang/en/templates/diskstat.json
index 6c880ebe..6c880ebe 100644
--- a/lang/en/modules/systemstatus/diskstat.json
+++ b/modules/systemstatus/lang/en/templates/diskstat.json
diff --git a/lang/en/modules/systemstatus/services.json b/modules/systemstatus/lang/en/templates/services.json
index 2c63c085..2c63c085 100644
--- a/lang/en/modules/systemstatus/services.json
+++ b/modules/systemstatus/lang/en/templates/services.json
diff --git a/lang/en/modules/systemstatus/systeminfo.json b/modules/systemstatus/lang/en/templates/systeminfo.json
index 602693f5..602693f5 100644
--- a/lang/en/modules/systemstatus/systeminfo.json
+++ b/modules/systemstatus/lang/en/templates/systeminfo.json
diff --git a/modules/systemstatus/lang/pt/module.json b/modules/systemstatus/lang/pt/module.json
new file mode 100644
index 00000000..c191bcfd
--- /dev/null
+++ b/modules/systemstatus/lang/pt/module.json
@@ -0,0 +1,26 @@
+{
+    "lang_addressConfiguration": "Configura\u00e7\u00e3o do Endere\u00e7o",
+    "lang_attention": "Aten\u00e7\u00e3o!",
+    "lang_average": "M\u00e9dia",
+    "lang_capacity": "Capacidade",
+    "lang_cpuLoad": "Carga da CPU",
+    "lang_free": "Livre",
+    "lang_iAmSure": "Sim, eu tenho certeza",
+    "lang_logicCPUs": "CPUs L\u00f3gicas",
+    "lang_maintenance": "Manuten\u00e7\u00e3o",
+    "lang_notDetermined": "N\u00e3o foi poss\u00edvel determinar",
+    "lang_occupied": "Ocupado",
+    "lang_onlyOS": "Apenas SO",
+    "lang_ramUsage": "Uso da RAM",
+    "lang_services": "Servi\u00e7os",
+    "lang_space": "Espa\u00e7o",
+    "lang_swapUsage": "Uso do swap",
+    "lang_swapWarning": "Swap de mem\u00f3ria est\u00e1 sendo usado. Isso pode ser uma indica\u00e7\u00e3o de que o servidor de sat\u00e9lite n\u00e3o tem mem\u00f3ria f\u00edsica suficiente dispon\u00edvel. No caso de problemas de desempenho ou instabilidade do servidor voc\u00ea deve considerar equipar o servidor com mais mem\u00f3ria RAM.",
+    "lang_system": "Sistema",
+    "lang_systemPartition": "Parti\u00e7\u00e3o do Sistema",
+    "lang_total": "Total",
+    "lang_uptimeOS": "Tempo de Atividade do SO",
+    "lang_vmStore": "Armazenamento da VM",
+    "lang_vmStoreError": "Erro ao determinar o espa\u00e7o em disco dispon\u00edvel no local da VM. Por favor, verifique a configura\u00e7\u00e3o.",
+    "module_name": "Servidor"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/translation/_page.json b/modules/translation/lang/de/templates/_page.json
index 639697de..639697de 100644
--- a/lang/de/templates/translation/_page.json
+++ b/modules/translation/lang/de/templates/_page.json
diff --git a/lang/de/templates/translation/edit.json b/modules/translation/lang/de/templates/edit.json
index 671e51d8..671e51d8 100644
--- a/lang/de/templates/translation/edit.json
+++ b/modules/translation/lang/de/templates/edit.json
diff --git a/lang/de/templates/translation/template-list.json b/modules/translation/lang/de/templates/template-list.json
index 5d6945bc..5d6945bc 100644
--- a/lang/de/templates/translation/template-list.json
+++ b/modules/translation/lang/de/templates/template-list.json
diff --git a/modules/translation/lang/en/module.json b/modules/translation/lang/en/module.json
new file mode 100644
index 00000000..07bdb07e
--- /dev/null
+++ b/modules/translation/lang/en/module.json
@@ -0,0 +1,16 @@
+{
+    "lang_adminInfo": "In this section you can change the JSON tags that contains the translated texts used by the site. To do this, select a template below to modify their respective tags. Alternatively, click the link below to change the messages of the site.",
+    "lang_back": "Back",
+    "lang_deleteTAG": "Delete",
+    "lang_editHardcoded": "Edit hardcoded strings",
+    "lang_editMessages": "Edit Messages",
+    "lang_editModules": "Edit Module Translations",
+    "lang_editSettings": "Edit configuration variables related strings",
+    "lang_langAdministration": "Language Administration",
+    "lang_module": "Module",
+    "lang_save": "Save",
+    "lang_status": "Status",
+    "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.",
+    "module_name": "Translation"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/translation/_page.json b/modules/translation/lang/en/templates/_page.json
index 5a48b696..5a48b696 100644
--- a/lang/en/modules/translation/_page.json
+++ b/modules/translation/lang/en/templates/_page.json
diff --git a/lang/en/modules/translation/edit.json b/modules/translation/lang/en/templates/edit.json
index 05c6697a..05c6697a 100644
--- a/lang/en/modules/translation/edit.json
+++ b/modules/translation/lang/en/templates/edit.json
diff --git a/lang/en/modules/translation/template-list.json b/modules/translation/lang/en/templates/template-list.json
index e3feb70b..e3feb70b 100644
--- a/lang/en/modules/translation/template-list.json
+++ b/modules/translation/lang/en/templates/template-list.json
diff --git a/modules/translation/lang/pt/module.json b/modules/translation/lang/pt/module.json
new file mode 100644
index 00000000..14964c89
--- /dev/null
+++ b/modules/translation/lang/pt/module.json
@@ -0,0 +1,16 @@
+{
+    "lang_adminInfo": "Nesta se\u00e7\u00e3o \u00e9 poss\u00edvel alterar as TAGs de JSON que cont\u00e9m os textos traduzidos utilizados no site. Para fazer isto, selecione um template abaixo para modificar suas respectivas TAGs. Alternativamente, clique no link abaixo para alterar as mensagens do site.",
+    "lang_back": "Voltar",
+    "lang_deleteTAG": "Excluir",
+    "lang_editHardcoded": "Editar Textos Hardcoded",
+    "lang_editMessages": "Editar Mensagens",
+    "lang_editModules": "Editar Tradu\u00e7\u00f5es dos M\u00f3dulos",
+    "lang_editSettings": "Editar Textos das Vari\u00e1veis de Configura\u00e7\u00e3o",
+    "lang_langAdministration": "Administra\u00e7\u00e3o da L\u00edngua",
+    "lang_module": "M\u00f3dulo",
+    "lang_save": "Salvar",
+    "lang_status": "Status",
+    "lang_templateAdminHelp": "Aqui voc\u00ea pode traduzir e editar frases e textos.",
+    "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.",
+    "module_name": "Tradu\u00e7\u00f5es"
+}
+\ No newline at end of file
diff --git a/modules/usermanagement/lang/en/module.json b/modules/usermanagement/lang/en/module.json
new file mode 100644
index 00000000..a8114ffc
--- /dev/null
+++ b/modules/usermanagement/lang/en/module.json
@@ -0,0 +1,19 @@
+{
+    "lang_cancelConfirm": "Do you really want to delete this users?",
+    "lang_close": "Close",
+    "lang_create": "Create",
+    "lang_edit": "Edit",
+    "lang_editUser": "Edit User",
+    "lang_email": "Email",
+    "lang_login": "Login",
+    "lang_operations": "Operation",
+    "lang_password": "Password",
+    "lang_remove": "Remove",
+    "lang_save": "Save",
+    "lang_telephone": "Telephone",
+    "lang_userAdmin": "Administrator",
+    "lang_userInfo": "On this section, you will be able to create website users, besides editing or removing existing users.",
+    "lang_userPage": "Users",
+    "lang_username": "Username",
+    "module_name": "Management"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/usermanagement/user-management.json b/modules/usermanagement/lang/en/templates/user-management.json
index 61225f55..61225f55 100644
--- a/lang/en/modules/usermanagement/user-management.json
+++ b/modules/usermanagement/lang/en/templates/user-management.json
diff --git a/modules/usermanagement/lang/pt/module.json b/modules/usermanagement/lang/pt/module.json
new file mode 100644
index 00000000..d892e5c5
--- /dev/null
+++ b/modules/usermanagement/lang/pt/module.json
@@ -0,0 +1,19 @@
+{
+    "lang_cancelConfirm": "Deseja realmente remover o usu\u00e1rio?",
+    "lang_close": "Fechar",
+    "lang_create": "Criar",
+    "lang_edit": "Editar",
+    "lang_editUser": "Editar Usu\u00e1rio",
+    "lang_email": "Email",
+    "lang_login": "Login",
+    "lang_operations": "Opera\u00e7\u00f5es",
+    "lang_password": "Senha",
+    "lang_remove": "Remover",
+    "lang_save": "Salvar",
+    "lang_telephone": "Telefone",
+    "lang_userAdmin": "Administrador",
+    "lang_userInfo": "Nesta se\u00e7\u00e3o voc\u00ea poder\u00e1 criar usu\u00e1rios para o site, al\u00e9m de editar as informa\u00e7\u00f5es ou remover usu\u00e1rios existentes.",
+    "lang_userPage": "Usu\u00e1rios",
+    "lang_username": "Nome do Usu\u00e1rio",
+    "module_name": "Gerenciamento"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/vmstore/mount.json b/modules/vmstore/lang/de/templates/mount.json
index dbc75281..dbc75281 100644
--- a/lang/de/templates/vmstore/mount.json
+++ b/modules/vmstore/lang/de/templates/mount.json
diff --git a/lang/de/templates/page-vmstore.json b/modules/vmstore/lang/de/templates/page-vmstore.json
index bb2c0634..bb2c0634 100644
--- a/lang/de/templates/page-vmstore.json
+++ b/modules/vmstore/lang/de/templates/page-vmstore.json
diff --git a/modules/vmstore/lang/en/module.json b/modules/vmstore/lang/en/module.json
new file mode 100644
index 00000000..9d11656f
--- /dev/null
+++ b/modules/vmstore/lang/en/module.json
@@ -0,0 +1,21 @@
+{
+    "lang_back": "Back",
+    "lang_close": "Close",
+    "lang_configure": "Configure",
+    "lang_intern": "Intern",
+    "lang_nfsHelp1": "An NFSv3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:",
+    "lang_nfsHelp2": "Alternate configuration using all_squash. The exported directory should be owned (and be writable) by the user with uid 1234.",
+    "lang_noAdditionalInformation": "No additional cofiguration required",
+    "lang_password": "Password",
+    "lang_readOnly": "Read-only Access",
+    "lang_readWrite": "Read\/Write Access",
+    "lang_save": "Save",
+    "lang_username": "Username",
+    "lang_vmLocation": "VM Location",
+    "lang_vmLocationChoose": "Please choose where the images of virtual machines will be stored.",
+    "lang_vmLocationConfiguration": "VM Location is being configured",
+    "lang_vmLocationHelp1": "For test purposes, the VMs can be stored directly on the Satellite server. However, if you operate the delivered satellite vmdk please remember that you have only about 100GB of memory.",
+    "lang_vmLocationHelp2": "In productive operation, it makes sense for this to use a high-performance network storage. This network storage can be integrated via NFS or CIFS \/ SMB. In any case, it must be ensured that the satellite server has write access to this network storage to add a new Virtual Machine . When using NFSv3 this can be set up IP-based, for the use of CIFS \/ SMB, you can access data disclosures that would entitle them to write.",
+    "lang_vmLocationHelp3": "The bwLehrpool clients only need read access to the network storage (and for security reasons, really can only read). In CIFS \/ SMB You can do this most easily by allowing passwordless guest access with read access to the share.",
+    "module_name": "Virtual Machine"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/vmstore/mount.json b/modules/vmstore/lang/en/templates/mount.json
index 29814430..29814430 100644
--- a/lang/en/modules/vmstore/mount.json
+++ b/modules/vmstore/lang/en/templates/mount.json
diff --git a/lang/en/modules/vmstore/page-vmstore.json b/modules/vmstore/lang/en/templates/page-vmstore.json
index 23ddbbd3..23ddbbd3 100644
--- a/lang/en/modules/vmstore/page-vmstore.json
+++ b/modules/vmstore/lang/en/templates/page-vmstore.json
diff --git a/modules/vmstore/lang/pt/module.json b/modules/vmstore/lang/pt/module.json
new file mode 100644
index 00000000..1aa7fdaf
--- /dev/null
+++ b/modules/vmstore/lang/pt/module.json
@@ -0,0 +1,21 @@
+{
+    "lang_back": "Voltar",
+    "lang_close": "Fechar",
+    "lang_configure": "configurar",
+    "lang_intern": "Iterna",
+    "lang_nfsHelp1": "\u00c9 necess\u00e1rio um NFSv3-Share. Ele deve poder ser lido por todas as esta\u00e7\u00f5es de trabalho, e poder ser escrito pelo server. Um exemplo, assumindo que o server possui endere\u00e7o ip 1.2.3.4:",
+    "lang_nfsHelp2": "Configura\u00e7\u00e3o alternativa usando all_squash. O usu\u00e1rio com uid 1234 deve possuir ( e poder escrever em ) o diret\u00f3rio exportado.",
+    "lang_noAdditionalInformation": "Nenhuma configura\u00e7\u00e3o adicional necess\u00e1ria",
+    "lang_password": "Senha",
+    "lang_readOnly": "Acesso Somente Leitura",
+    "lang_readWrite": "Acesso Leitura\/Escrita",
+    "lang_save": "Salvar",
+    "lang_username": "Nome de Usu\u00e1rio",
+    "lang_vmLocation": "Localiza\u00e7\u00e3o da VM",
+    "lang_vmLocationChoose": "Por favor, escolha aonde as imagens das m\u00e1quinas virtuais ser\u00e3o armazenadas.",
+    "lang_vmLocationConfiguration": "Localiza\u00e7\u00e3o da VM \u00e9 configurada",
+    "lang_vmLocationHelp1": "Para fins de teste, as VMs podem ser armazenados diretamente no servidor sat\u00e9lite. No entanto, se voc\u00ea operar o vmdk do sat\u00e9lite entregue por favor lembre-se que voc\u00ea tem apenas cerca de 100 GB de mem\u00f3ria.",
+    "lang_vmLocationHelp2": "Em opera\u00e7\u00e3o, faz sentido para este usar um armazenamento de rede de alto desempenho. Este armazenamento de rede pode ser integrado atrav\u00e9s de NFS ou CIFS \/ SMB. Em qualquer caso, deve-se assegurar de que o servidor de sat\u00e9lite tenha acesso de grava\u00e7\u00e3o para este armazenamento de rede para poder adicionar uma nova m\u00e1quina virtual. Ao utilizar NFSv3 este pode ser configurado com base em IP, para o uso de CIFS \/ SMB, voc\u00ea pode acessar as divulga\u00e7\u00f5es de dados que lhe permitiria escrever.",
+    "lang_vmLocationHelp3": "Os clientes bwLehrpool s\u00f3 precisam ter acesso de leitura ao armazenamento de rede (e por raz\u00f5es de seguran\u00e7a, realmente s\u00f3 pode ler). Em CIFS \/ SMB Voc\u00ea pode fazer isso mais facilmente, permitindo o acesso a visitantes sem senha com acesso de leitura.",
+    "module_name": "M\u00e1quina Virtual"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/webinterface/httpd-restart.json b/modules/webinterface/lang/de/templates/httpd-restart.json
index e995a251..e995a251 100644
--- a/lang/de/templates/webinterface/httpd-restart.json
+++ b/modules/webinterface/lang/de/templates/httpd-restart.json
diff --git a/lang/de/templates/webinterface/https.json b/modules/webinterface/lang/de/templates/https.json
index 621343e3..621343e3 100644
--- a/lang/de/templates/webinterface/https.json
+++ b/modules/webinterface/lang/de/templates/https.json
diff --git a/lang/de/templates/webinterface/passwords.json b/modules/webinterface/lang/de/templates/passwords.json
index 17c156c3..17c156c3 100644
--- a/lang/de/templates/webinterface/passwords.json
+++ b/modules/webinterface/lang/de/templates/passwords.json
diff --git a/modules/webinterface/lang/en/module.json b/modules/webinterface/lang/en/module.json
new file mode 100644
index 00000000..dde5ac86
--- /dev/null
+++ b/modules/webinterface/lang/en/module.json
@@ -0,0 +1,3 @@
+{
+    "module_name": "Web Interface"
+}
+\ No newline at end of file
diff --git a/lang/en/modules/webinterface/httpd-restart.json b/modules/webinterface/lang/en/templates/httpd-restart.json
index 0a7d4aea..0a7d4aea 100644
--- a/lang/en/modules/webinterface/httpd-restart.json
+++ b/modules/webinterface/lang/en/templates/httpd-restart.json
diff --git a/lang/en/modules/webinterface/https.json b/modules/webinterface/lang/en/templates/https.json
index 64631a9a..64631a9a 100644
--- a/lang/en/modules/webinterface/https.json
+++ b/modules/webinterface/lang/en/templates/https.json
diff --git a/lang/en/modules/webinterface/passwords.json b/modules/webinterface/lang/en/templates/passwords.json
index 2db88ae2..2db88ae2 100644
--- a/lang/en/modules/webinterface/passwords.json
+++ b/modules/webinterface/lang/en/templates/passwords.json
diff --git a/style/default.css b/style/default.css
index d845ec36..a29e9df0 100644
--- a/style/default.css
+++ b/style/default.css
@@ -357,7 +357,6 @@ nav.sidebar li {
 	{
 	  background-color: transparent !important;
 	  color: #fff !important;
-	  cursor: default !important;
 	  padding-bottom: 0 !important;
 	  padding-left: 8px !important;
 	  font-size: 115%;
@@ -397,10 +396,6 @@ nav.sidebar li {
 	  color:#CCC;
 	}
 	
-	.navbar-inverse .navbar-nav .dropdown-menu > li.active > a {
-		background-color: #24272D;
-	}
-	
 	.navbar-inverse .navbar-nav li {
 		width: 100%;
 	}
@@ -423,6 +418,14 @@ nav.sidebar li {
 
 	nav.sidebar .navbar-nav .dropdown-menu>li>a:hover, nav.sidebar .navbar-nav .dropdown-menu>li>a:focus {
 		background-color: #2C323D;
+		box-shadow: 0px 0px 16px rgba(255,255,255,.1) inset;
+		color:#DDD;
+	}
+	
+	nav.sidebar .navbar-nav .dropdown-menu>li.active > a {
+		background-color: #24272D;
+		box-shadow: 3px 3px 3px rgba(0,0,0,.2) inset, -3px -3px 6px rgba(255,255,255,.07) inset;
+		color:#DDD;
 	}
 
 }
author	Simon Rettberg	2016-04-29 17:43:58 +0200
committer	Simon Rettberg	2016-04-29 17:43:58 +0200
commit	f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0 (patch)
tree	13c41f05ef5920eb13c76be05f749de9a9a809fa
parent	Implemented new menu, added logic for defining dependencies, move translation... (diff)
download	slx-admin-f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0.tar.gz slx-admin-f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0.tar.xz slx-admin-f8189f4f0bdc79a83e084c56e93e8a2ca073e4c0.zip