summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules-available/main/lang/de/categories.json1
-rw-r--r--modules-available/main/lang/de/messages.json1
-rw-r--r--modules-available/main/lang/en/messages.json1
-rw-r--r--modules-available/minilinux/lang/de/template-tags.json1
-rw-r--r--modules-available/minilinux/lang/en/messages.json4
-rw-r--r--modules-available/minilinux/lang/en/module.json7
-rw-r--r--modules-available/minilinux/lang/en/template-tags.json37
-rw-r--r--modules-available/minilinux/templates/page-minilinux.html2
-rw-r--r--modules-available/rebootcontrol/lang/de/messages.json2
-rw-r--r--modules-available/rebootcontrol/lang/en/messages.json17
-rw-r--r--modules-available/rebootcontrol/lang/en/module.json4
-rw-r--r--modules-available/rebootcontrol/lang/en/permissions.json15
-rw-r--r--modules-available/rebootcontrol/lang/en/template-tags.json74
-rw-r--r--modules-available/roomplanner/lang/en/messages.json2
-rw-r--r--modules-available/roomplanner/lang/en/template-tags.json7
15 files changed, 133 insertions, 42 deletions
diff --git a/modules-available/main/lang/de/categories.json b/modules-available/main/lang/de/categories.json
index 31f5bca0..5e06d259 100644
--- a/modules-available/main/lang/de/categories.json
+++ b/modules-available/main/lang/de/categories.json
@@ -1,5 +1,4 @@
{
- "beta": "Beta",
"content": "Inhalt",
"etc": "Weiteres",
"settings-client": "Einstellungen (Client)",
diff --git a/modules-available/main/lang/de/messages.json b/modules-available/main/lang/de/messages.json
index b6c2a5b3..13f89428 100644
--- a/modules-available/main/lang/de/messages.json
+++ b/modules-available/main/lang/de/messages.json
@@ -12,6 +12,7 @@
"task-error": "Ausf\u00fchrung fehlgeschlagen: {{0}}",
"taskmanager-error": "Verbindung zum Taskmanager fehlgeschlagen",
"taskmanager-format": "Taskmanager hat ung\u00fcltige Daten zur\u00fcckgeliefert",
+ "taskmanager-warning": "Taskmanager: {{0}}",
"token": "Ung\u00fcltiges Token. CSRF Angriff?",
"value-invalid": "Der Wert {{1}} ist ung\u00fcltig f\u00fcr die Option {{0}} und wurde ignoriert"
} \ No newline at end of file
diff --git a/modules-available/main/lang/en/messages.json b/modules-available/main/lang/en/messages.json
index 2a9c9c0d..03e436cb 100644
--- a/modules-available/main/lang/en/messages.json
+++ b/modules-available/main/lang/en/messages.json
@@ -12,6 +12,7 @@
"task-error": "Execution failed: {{0}}",
"taskmanager-error": "Failed to connect to the Task Manager",
"taskmanager-format": "Task Manager has returned invalid data",
+ "taskmanager-warning": "Task Manager: {{0}}",
"token": "Invalid token. CSRF attack?",
"value-invalid": "The value {{1}} is invalid for option {{0}} and has been ignored"
} \ No newline at end of file
diff --git a/modules-available/minilinux/lang/de/template-tags.json b/modules-available/minilinux/lang/de/template-tags.json
index 690ba010..626bb9fe 100644
--- a/modules-available/minilinux/lang/de/template-tags.json
+++ b/modules-available/minilinux/lang/de/template-tags.json
@@ -6,7 +6,6 @@
"lang_download": "Herunterladen",
"lang_id": "ID",
"lang_installed": "Installiert",
- "lang_introText": "Hier gibts MiniLinux.",
"lang_isGlobalDefault": "Ist globaler Standard",
"lang_key": "GPG-Key",
"lang_lastUpdate": "Zuletzt \u00fcberpr\u00fcft",
diff --git a/modules-available/minilinux/lang/en/messages.json b/modules-available/minilinux/lang/en/messages.json
index 6dc736a4..7c0b2c5d 100644
--- a/modules-available/minilinux/lang/en/messages.json
+++ b/modules-available/minilinux/lang/en/messages.json
@@ -1,5 +1,9 @@
{
+ "default-is-invalid": "Currently selected default is invalid",
+ "default-not-installed": "Currently selected default of {{0}} is not locally installed (any more).",
+ "default-update-available": "You selected default system {{0}} can be updated to {{1}}",
"delete-error": "Error deleting version {{0}}: {{1}}",
+ "no-default-set": "No default system selected",
"no-such-version": "No such version: {{0}}",
"please-download-minilinux": "Important files from the mini Linux installation are missing.",
"version-deleted": "Deleted version {{0}}"
diff --git a/modules-available/minilinux/lang/en/module.json b/modules-available/minilinux/lang/en/module.json
index b1526869..0b1c895b 100644
--- a/modules-available/minilinux/lang/en/module.json
+++ b/modules-available/minilinux/lang/en/module.json
@@ -1,9 +1,16 @@
{
+ "default_boot_entry": "(Use global default)",
"file-checksum-bad": "Bad checksum",
"file-missing": "File missing",
"file-not-readable": "File not readable",
"file-ok": "OK",
"file-size-mismatch": "File size mismatch",
+ "ipxe-debug": "Print debug messages instead of showing splash screen",
+ "ipxe-insecure-cpu": "Disable all mitigations for CPU security flaws",
+ "ipxe-kcl-extra": "Modifications to the kernel command line",
+ "menu-sources": "Sources for updates",
+ "menu-versions": "Available versions",
"module_name": "Minilinux",
+ "not_installed_hint": "(not installed)",
"page_title": "Manage Netboot Linux flavors"
} \ No newline at end of file
diff --git a/modules-available/minilinux/lang/en/template-tags.json b/modules-available/minilinux/lang/en/template-tags.json
index 48ba0c15..5c3392df 100644
--- a/modules-available/minilinux/lang/en/template-tags.json
+++ b/modules-available/minilinux/lang/en/template-tags.json
@@ -1,15 +1,26 @@
{
- "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_desiredVersion": "Desired version",
- "lang_errorGetting": "Error while downloading list!",
- "lang_filesInVersion": "Files for version",
- "lang_listObtained": "Downloading list...",
- "lang_outdated": "Outdated",
- "lang_redownload": "Download again",
- "lang_systemUpdated": "The system is up to date.",
- "lang_update": "Update",
- "lang_updateAll": "Update all modules",
- "lang_uptodate": "Up to date"
+ "lang_branchesHeading": "Available branches and versions",
+ "lang_changelog": "Change log",
+ "lang_confirmDeleteVersion": "Do you want to delete this version?",
+ "lang_default": "Default",
+ "lang_download": "Download",
+ "lang_id": "ID",
+ "lang_installed": "Installed",
+ "lang_isGlobalDefault": "Global default",
+ "lang_key": "GPG key",
+ "lang_lastUpdate": "Last updated",
+ "lang_minilinuxHeading": "Manage netboot base system",
+ "lang_orphanedVersion": "Orphaned",
+ "lang_orphanedVersionToolTip": "This version is not offered by the update server any more",
+ "lang_releaseDate": "Release date",
+ "lang_selectedDefaultIs": "Current default is",
+ "lang_setGlobalDefault": "Set as global default",
+ "lang_sources": "Sources",
+ "lang_sourcesIntro": "List of update sources that will be checked for available branches and versions.",
+ "lang_title": "Title",
+ "lang_updateSourcesButton": "Check for new updates",
+ "lang_url": "URL",
+ "lang_verify": "Check file integrity",
+ "lang_verifyToolTip": "Check all files against known checksums",
+ "lang_version": "Version"
} \ No newline at end of file
diff --git a/modules-available/minilinux/templates/page-minilinux.html b/modules-available/minilinux/templates/page-minilinux.html
index 3059e827..161fa02f 100644
--- a/modules-available/minilinux/templates/page-minilinux.html
+++ b/modules-available/minilinux/templates/page-minilinux.html
@@ -1,5 +1,3 @@
<h1>{{lang_minilinuxHeading}}</h1>
-<p>{{lang_introText}}</p>
-
{{lang_selectedDefaultIs}}: <b>{{default}}</b> \ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/de/messages.json b/modules-available/rebootcontrol/lang/de/messages.json
index 33a3fbde..7914f37d 100644
--- a/modules-available/rebootcontrol/lang/de/messages.json
+++ b/modules-available/rebootcontrol/lang/de/messages.json
@@ -12,7 +12,7 @@
"subnet-already-exists": "Subnetz existiert bereits",
"subnet-created": "Subnetz angelegt",
"subnet-updated": "Subnetz aktualisiert",
- "unknown-exec-job": "Unbekannte Job-ID",
+ "unknown-exec-job": "Unbekannte Job-ID: {{0}}",
"unknown-task-type": "Unbekannter Task-Typ",
"woldiscover-disabled": "Automatische WOL-Ermittlung deaktiviert",
"woldiscover-enabled": "Automatische WOL-Ermittlung aktiviert"
diff --git a/modules-available/rebootcontrol/lang/en/messages.json b/modules-available/rebootcontrol/lang/en/messages.json
index 50bdd7fe..5b482fab 100644
--- a/modules-available/rebootcontrol/lang/en/messages.json
+++ b/modules-available/rebootcontrol/lang/en/messages.json
@@ -1,4 +1,19 @@
{
+ "invalid-cidr": "Invalid CIDR notion: {{0}}",
+ "invalid-port": "Invalid port: {{0}}",
+ "invalid-subnet": "Invalid subnet: {{0}}",
+ "jumphost-deleted": "Delete jump host {{0}}",
+ "jumphost-saved": "Saved jump host {{0}}",
"no-clients-selected": "No clients selected",
- "some-machine-not-found": "Some machines from your POST request don't exist"
+ "no-current-tasks": "No recent tasks",
+ "no-such-jumphost": "No such jump host {{0}}",
+ "no-such-task": "No such task: {{0}}",
+ "some-machine-not-found": "Some machines from your POST request don't exist",
+ "subnet-already-exists": "Subnet already exists",
+ "subnet-created": "Created subnet",
+ "subnet-updated": "Updated subnet",
+ "unknown-exec-job": "Invalid job ID: {{0}}",
+ "unknown-task-type": "Invalid task type",
+ "woldiscover-disabled": "Automatic WOL-detection disabled",
+ "woldiscover-enabled": "Automatic WOL-detection enabled"
} \ 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 47d91e98..bf902fe7 100644
--- a/modules-available/rebootcontrol/lang/en/module.json
+++ b/modules-available/rebootcontrol/lang/en/module.json
@@ -1,4 +1,6 @@
{
+ "jumphosts": "Jump hosts",
"module_name": "WakeOnLAN",
- "page_title": "WakeOnLAN"
+ "page_title": "WakeOnLAN",
+ "subnets": "Subnets"
} \ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/en/permissions.json b/modules-available/rebootcontrol/lang/en/permissions.json
index 7fe89cff..f5144d18 100644
--- a/modules-available/rebootcontrol/lang/en/permissions.json
+++ b/modules-available/rebootcontrol/lang/en/permissions.json
@@ -1,5 +1,14 @@
{
- "action.shutdown": "Shutdown Client.",
- "action.reboot": "Reboot Client.",
- "newkeypair": "Generate new Key pair."
+ "action.exec": "Execute commands on clients (as root).",
+ "action.reboot": "Reboot Client.",
+ "action.shutdown": "Shutdown Client.",
+ "action.wol": "Send WOL packet to client.",
+ "jumphost.assign-subnet": "Assign subnet to jump host.",
+ "jumphost.edit": "Edit jump host.",
+ "jumphost.view": "See list of jump hosts.",
+ "newkeypair": "Generate new Key pair.",
+ "subnet.edit": "Add\/remove subnets.",
+ "subnet.flag": "Edit subnet properties.",
+ "subnet.view": "See list of subnets.",
+ "woldiscover": "Toggle automatic determination of WOL-reachability."
} \ No newline at end of file
diff --git a/modules-available/rebootcontrol/lang/en/template-tags.json b/modules-available/rebootcontrol/lang/en/template-tags.json
index 721b9971..c8922d2c 100644
--- a/modules-available/rebootcontrol/lang/en/template-tags.json
+++ b/modules-available/rebootcontrol/lang/en/template-tags.json
@@ -1,41 +1,77 @@
{
+ "lang_aWolJob": "WakeOnLAN job",
"lang_activeTasks": "Active tasks",
+ "lang_add": "Add",
+ "lang_addNewSubnet": "Manually add new subnet",
+ "lang_assignedJumpHosts": "Assigned jump hosts",
+ "lang_assignedSubnets": "Assigned subnets",
"lang_authFail": "Authentication failed",
+ "lang_check": "Check",
+ "lang_checkOutputLabel": "Output",
+ "lang_checkingJumpHost": "Check jump host",
"lang_client": "Client",
"lang_clientCount": "# clients",
- "lang_confirmNewKeypair": "Really create new key pair?",
"lang_connecting": "Connecting...",
+ "lang_editJumpHost": "Edit jump host",
+ "lang_editSubnet": "Edit subnet",
+ "lang_enterCommand": "Command(s) to execute",
"lang_error": "Not available",
+ "lang_execRemoteCommand": "Execute command on clients",
+ "lang_executingRemotely": "Executing on selected clients...",
+ "lang_exitCode": "Exit code",
+ "lang_fixSubnetDesc": "If enabled, reachability of this subnet will not be determined automatically any more. You can then set manually whether the subnet is reachable from this server. Additionally, the subnet will not be purged from the database anymore if there was no client activity for six months.",
+ "lang_fixSubnetSettings": "Manually configure this subnet",
"lang_genNew": "Generate new key pair",
+ "lang_help": "Help",
+ "lang_host": "Host",
+ "lang_hostDeleteConfirm": "Delete this jump host",
+ "lang_hostNonZeroExit": "The assigned script exited with a return code other than 0",
+ "lang_hostNotReachable": "Host not reachable",
+ "lang_hostReachable": "Host reachable",
"lang_ip": "IP",
- "lang_kexecRebootCheck": "Quick reboot straight to bwLehrpool (kexec)",
+ "lang_isDirect": "Directly reachable",
+ "lang_isDirectHelp": "This subnet can directly receive WOL packets from the server. No jump host etc. required.",
+ "lang_isFixed": "Manually configured",
+ "lang_isFixedHelp": "Reachability from the satellite server is not determined automatically, but set in the web UI.",
+ "lang_jumpHost": "Jump host",
+ "lang_jumpHosts": "Jump hosts",
"lang_keypairConfirmCheck": "I'm sure",
+ "lang_lastseen": "Last seen",
"lang_location": "Location",
- "lang_minutes": " Minutes",
- "lang_mode": "Mode",
"lang_moduleHeading": "WakeOnLAN",
+ "lang_new": "New",
"lang_newKeypairExplanation": "You can create a new key pair, which will replace the old one. Please note that after doing so, you cannot poweroff or reboot clients that are already running, since they still use the old key. They have to be rebooted manually first.",
- "lang_off": "Off",
- "lang_on": "On",
+ "lang_noTasksForJob": "No tasks for this job",
+ "lang_numAssignedSubnets": "# Subnets",
"lang_online": "Online",
+ "lang_port": "Port",
+ "lang_privkey": "Private key",
"lang_pubKey": "SSH Public Key:",
- "lang_reboot": "Reboot",
+ "lang_reachable": "Reachable",
+ "lang_reachableFrom": "Reachable via",
+ "lang_reachableFromServer": "Reachable from server",
+ "lang_reachableFromServerDesc": "If checked it will be assumed that the server can send WOL packets to clients in this subnet. This requires the router of the destination subnet to forward directed broadcasts.",
"lang_rebootAt": "Reboot at:",
- "lang_rebootButton": "Reboot",
- "lang_rebootCheck": "Do you really want to reboot the selected clients?",
- "lang_rebootControl": "Reboot Control",
- "lang_rebootIn": "Reboot in:",
"lang_rebooting": "Rebooting...",
- "lang_selectall": "Select all",
- "lang_selected": "Selected",
- "lang_session": "Session",
+ "lang_remoteExec": "Execute",
+ "lang_scriptOrCommand": "Command \/ Script",
"lang_settings": "Settings",
"lang_shutdown": "Shut Down",
"lang_shutdownAt": "Shutdown at: ",
- "lang_shutdownButton": "Shutdown",
- "lang_shutdownCheck": "Do you really want to shut down the selected clients?",
- "lang_shutdownIn": "Shutdown in: ",
"lang_status": "Status",
- "lang_time": "Time",
- "lang_unselectall": "Unselect all"
+ "lang_stderr": "Standard error",
+ "lang_stdout": "Standard output",
+ "lang_subnet": "Subnet",
+ "lang_subnets": "Subnets",
+ "lang_subnetsDescription": "These are subnets known to the server. For WOL to work across subnets the server needs to know which subnets are reachable via directed broadcasts. This list will be populated automatically as new clients boot up. For subnets that are not reachable via directed broadcasts, you can set up \"jump hosts\", which is any kind of host that can reach the desired destination subnet. Also, the satellite server will automatically use other bwLehrpool-Clients to reach selected machines, if applicable. If you don't want this to be detected automatically, you can disable this feature in the Settings above.",
+ "lang_task": "Task",
+ "lang_taskListIntro": "This is a list of running or recently finished tasks (WOL, Shutdown, Reboot, ...).",
+ "lang_wakeScriptHelp": "This script will be executed on the jump host to wake up the selected machines. If will be executed using the default shell of the host. There are two special placeholders which will be replaced before executing the script on the host: %MACS% will be a space separated list of mac addresses to wake up. %IP% is either the directed broadcast address of the destination subnet, or simply 255.255.255.255, if the destination subnet is the same as the jump host's address.",
+ "lang_wakeupScript": "Wake script",
+ "lang_wolAutoDiscoverCheck": "Automatically determine WOL-reachability of subnets",
+ "lang_wolDiscoverDescription": "If checked, the server will periodically check, which subnets can be reached by WOL packets.",
+ "lang_wolDiscoverHeading": "Automatic WOL detection",
+ "lang_wolMachineSupportText": "If the technical requirements for reaching a destination host with WOL packets are met, it is still required to enable wake on LAN on the client computer. This usually happens in the BIOS, where sometimes it is also possible to set a different boot order for when the machine was powered on via WOL. After enabling WOL in the BIOS, it is still possible to disable WOL in the driver after booting up an Operating System. In Windows, this can be configured in the device manager, which would be relevant if bwLehrpool is being used in a dual-boot environment. On Linux you can change this setting with the ethtool utility. bwLehrpool (re-)enables WOL on every boot.",
+ "lang_wolReachability": "Reachability",
+ "lang_wolReachabilityHelp": "The first figure is the number of jump hosts that are configured for this subnet. The second figure is the number of client subnets that can reach this subnet."
} \ No newline at end of file
diff --git a/modules-available/roomplanner/lang/en/messages.json b/modules-available/roomplanner/lang/en/messages.json
index b43fc951..0b90ec1d 100644
--- a/modules-available/roomplanner/lang/en/messages.json
+++ b/modules-available/roomplanner/lang/en/messages.json
@@ -1,5 +1,7 @@
{
+ "db-error": "Database error",
"invalid-tutor-uuid": "Invalid ID for tutor",
"json-data-invalid": "Submitted data is no valid JSON",
+ "leaf-mode-mismatch": "Wrong room type: Trying to save composed room as normal room, or vice versa!",
"need-locationid": "No locationid given"
} \ No newline at end of file
diff --git a/modules-available/roomplanner/lang/en/template-tags.json b/modules-available/roomplanner/lang/en/template-tags.json
index dd055d0a..6e5bdfee 100644
--- a/modules-available/roomplanner/lang/en/template-tags.json
+++ b/modules-available/roomplanner/lang/en/template-tags.json
@@ -17,16 +17,22 @@
"lang_classroomdeskchair": "classroom desk with chair",
"lang_classroomtable": "classroom table",
"lang_coatrack": "coatrack",
+ "lang_composedLayout": "Composed layout",
"lang_conferencetable": "conference table",
"lang_confirmDiscardChanges": "Do you want to discard all changes?",
+ "lang_controlRoomDesc": "The selected room will be the one where the PVS manager will be picked from. The other room's PVS manager will *not* be usable in the composed setup.",
+ "lang_controllingRoom": "Comtrolling room",
"lang_couch": "couch",
"lang_dedicatedManager": "Dedicated",
"lang_descriptionBySearch": "Select a computer from a list of all known computers here.",
"lang_descriptionBySubnet": "Select a computer from a related subnet.",
"lang_deskLamp": "desk lamp",
"lang_door": "door",
+ "lang_editComposedRoom": "Edit composed room",
+ "lang_exposeAsComposedRoom": "Expose as composed room (in PVS manger's list of rooms)",
"lang_flatscreen": "flatscreen",
"lang_greenchair": "green chair",
+ "lang_horizontal": "Horizontally",
"lang_labelBySearch": "all computers",
"lang_labelBySubnet": "computers in subnet",
"lang_lecturetheaterrow": "lecture theater row",
@@ -53,5 +59,6 @@
"lang_titleAddMachine": "Add Machine",
"lang_titleBySearch": "Search",
"lang_titleBySubnet": "Subnet",
+ "lang_vertical": "Vertically",
"lang_wastecan": "waste can"
} \ No newline at end of file