Update translations

11 files changed, 19 insertions, 18 deletions

diff --git a/config.php.example b/config.php.example
index 455840ff..df361ff9 100644
--- a/config.php.example
+++ b/config.php.example
@@ -47,12 +47,12 @@ $MENU_CAT_OVERRIDE = array(
 		'sysconfig', 'baseconfig', 'minilinux'
 	),
 	'main.settings-server' => array(
-		'serversetup', 'vmstore', 'webinterface', 'backup', 'dnbd3'
+		'serversetup', 'vmstore', 'webinterface', 'backup', 'dnbd3', 'rebootcontrol'
 	),
 	'main.status' => array(
 		'systemstatus', 'eventlog', 'syslog', 'statistics', 'statistics_reporting'
 	),
 	'main.etc' => array(
-		'rebootcontrol', 'runmode', 'translation'
+		'runmode', 'translation'
 	)
 );
\ No newline at end of file
diff --git a/modules-available/backup/lang/de/module.json b/modules-available/backup/lang/de/module.json
index 8b32a289..0e38aee2 100644
--- a/modules-available/backup/lang/de/module.json
+++ b/modules-available/backup/lang/de/module.json
@@ -1,4 +1,4 @@
 {
-    "module_name": "Sichern\/Wiederherstellen",
+    "module_name": "Sichern \/ Wiederherstellen",
     "page_title": "Sichern und Wiederherstellen"
 }
\ No newline at end of file
diff --git a/modules-available/backup/lang/en/module.json b/modules-available/backup/lang/en/module.json
index cd6c87d0..e6e093b6 100644
--- a/modules-available/backup/lang/en/module.json
+++ b/modules-available/backup/lang/en/module.json
@@ -1,3 +1,3 @@
 {
-    "module_name": "Backup"
+    "module_name": "Backup \/ Restore"
 }
\ No newline at end of file
diff --git a/modules-available/locations/lang/de/module.json b/modules-available/locations/lang/de/module.json
index b38fa89c..5156590c 100644
--- a/modules-available/locations/lang/de/module.json
+++ b/modules-available/locations/lang/de/module.json
@@ -1,4 +1,4 @@
 {
-    "module_name": "R\u00e4ume\/Orte",
+    "module_name": "R\u00e4ume \/ Orte",
     "page_title": "R\u00e4ume und Orte verwalten"
 }
\ No newline at end of file
diff --git a/modules-available/locations/lang/en/module.json b/modules-available/locations/lang/en/module.json
index b2a837b6..bcd13f25 100644
--- a/modules-available/locations/lang/en/module.json
+++ b/modules-available/locations/lang/en/module.json
@@ -1,3 +1,3 @@
 {
-    "module_name": "Room\/Locations"
+    "module_name": "Rooms \/ Locations"
 }
\ No newline at end of file
diff --git a/modules-available/locations/lang/en/template-tags.json b/modules-available/locations/lang/en/template-tags.json
index e1de2a88..3a79494c 100644
--- a/modules-available/locations/lang/en/template-tags.json
+++ b/modules-available/locations/lang/en/template-tags.json
@@ -33,7 +33,6 @@
     "lang_moveable": "Moveable",
     "lang_name": "Name",
     "lang_numMachinesWithOverrides": "Number of clients where at least one variable is overridden",
-    "lang_overrideCount": "Overridden",
     "lang_overridenVarsForLocation": "Number of variables that get overridden for this location",
     "lang_parentLocation": "Parent location",
     "lang_referencingLectures": "Assigned Lectures",
diff --git a/modules-available/minilinux/lang/en/module.json b/modules-available/minilinux/lang/en/module.json
index 0b1c895b..4667ceda 100644
--- a/modules-available/minilinux/lang/en/module.json
+++ b/modules-available/minilinux/lang/en/module.json
@@ -10,7 +10,7 @@
     "ipxe-kcl-extra": "Modifications to the kernel command line",
     "menu-sources": "Sources for updates",
     "menu-versions": "Available versions",
-    "module_name": "Minilinux",
+    "module_name": "Net-boot OS",
     "not_installed_hint": "(not installed)",
     "page_title": "Manage Netboot Linux flavors"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/de/module.json b/modules-available/rebootcontrol/lang/de/module.json
index 24dae3f1..2488fc81 100644
--- a/modules-available/rebootcontrol/lang/de/module.json
+++ b/modules-available/rebootcontrol/lang/de/module.json
@@ -1,6 +1,6 @@
 {
     "jumphosts": "Sprung-Hosts",
-    "module_name": "WakeOnLAN",
+    "module_name": "Fernsteuerung \/ WakeOnLAN",
     "page_title": "WakeOnLAN",
     "subnets": "Subnetze"
 }
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/en/module.json b/modules-available/rebootcontrol/lang/en/module.json
index bf902fe7..1308976b 100644
--- a/modules-available/rebootcontrol/lang/en/module.json
+++ b/modules-available/rebootcontrol/lang/en/module.json
@@ -1,6 +1,6 @@
 {
     "jumphosts": "Jump hosts",
-    "module_name": "WakeOnLAN",
+    "module_name": "Remote \/ WakeOnLAN",
     "page_title": "WakeOnLAN",
     "subnets": "Subnets"
 }
\ No newline at end of file
diff --git a/modules-available/systemstatus/lang/en/template-tags.json b/modules-available/systemstatus/lang/en/template-tags.json
index 90e0576a..de210864 100644
--- a/modules-available/systemstatus/lang/en/template-tags.json
+++ b/modules-available/systemstatus/lang/en/template-tags.json
@@ -11,14 +11,14 @@
     "lang_foundStore": "Found:",
     "lang_free": "Free",
     "lang_goToStoreConf": "Go to VM store configuration",
-    "lang_logicCPUs": "Logic CPUs",
+    "lang_logicCPUs": "Logical CPUs",
     "lang_maintenance": "Maintenance",
     "lang_moduleHeading": "System Status",
     "lang_notDetermined": "Could not be determined",
-    "lang_occupied": "Occupied",
-    "lang_onlyOS": "OS Only",
+    "lang_occupied": "In use",
+    "lang_onlyOS": "OS only",
     "lang_overview": "Overview",
-    "lang_ramUsage": "RAM Usage",
+    "lang_ramUsage": "RAM usage",
     "lang_runningDownloads": "Running downloads",
     "lang_runningUploads": "Running uploads",
     "lang_serverReboot": "Reboot Server",
@@ -26,15 +26,15 @@
     "lang_space": "Space",
     "lang_storeMissingExpected": "VM store not mounted. Expected:",
     "lang_storeNotConfigured": "No VM store configured!",
-    "lang_swapUsage": "swap Usage",
+    "lang_swapUsage": "swap usage",
     "lang_swapWarning": "Memory swap is being used. This may be an indication that the satellite server does not have enough physical memory available. In the case of performance problems or server instability you should consider equipping the server with more RAM.",
     "lang_system": "System",
-    "lang_systemPartition": "System Partition",
+    "lang_systemPartition": "System partition",
     "lang_systemStoreError": "Error querying available system storage",
     "lang_total": "Total",
     "lang_unknownState": "Unknown status",
     "lang_updatedPackages": "Pending updates",
-    "lang_uptimeOS": "OS Uptime",
-    "lang_vmStore": "VM Store",
+    "lang_uptimeOS": "OS uptime",
+    "lang_vmStore": "VM store",
     "lang_vmStoreError": "Error determining available space of the VM storage. Please check the configuration."
 }
\ No newline at end of file
diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php
index 6876d0b5..dc35f257 100644
--- a/modules-available/systemstatus/page.inc.php
+++ b/modules-available/systemstatus/page.inc.php
@@ -29,6 +29,8 @@ class Page_SystemStatus extends Page
 		}
 		$tabs = array('DmsdLog', 'Netstat', 'PsList', 'LdadpLog', 'LighttpdLog');
 		$data['tabs'] = array();
+		// Dictionary::translate('tab_DmsdLog') Dictionary::translate('tab_LdadpLog') Dictionary::translate('tab_Netstat')
+		// Dictionary::translate('tab_LighttpdLog') Dictionary::translate('tab_PsList')
 		foreach ($tabs as $tab) {
 			$data['tabs'][] = array(
 				'type' => $tab,