diff options
| author | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
| commit | 5393703f6e1485ddff94a50f63bcdd216ab629f4 (patch) | |
| tree | ce2db7130302bd4fb78b170e1fbd75496a1b4510 /modules-available/statistics/lang | |
| parent | Merge remote-tracking branch 'origin/permission-manager' into permission-manager (diff) | |
| parent | [roomplanner] Sort already placed machines to the bottom (diff) | |
| download | slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.gz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.xz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'modules-available/statistics/lang')
4 files changed, 12 insertions, 6 deletions
diff --git a/modules-available/statistics/lang/de/messages.json b/modules-available/statistics/lang/de/messages.json index 8bdf9cfc..e3dff61c 100644 --- a/modules-available/statistics/lang/de/messages.json +++ b/modules-available/statistics/lang/de/messages.json @@ -1,6 +1,6 @@ { - "invalid-filter": "Ung\u00fcltiger Filter", "invalid-filter-argument": "Das Argument {{1}} ist nicht g\u00fcltig f\u00fcr den Filter {{0}}", "invalid-filter-key": "{{0}} ist kein g\u00fcltiges Filterkriterium", - "notes-saved": "Anmerkungen gespeichert" + "notes-saved": "Anmerkungen gespeichert", + "unknown-machine": "Unbekannte Rechner-ID {{0}}" }
\ No newline at end of file diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json index 474d952a..56cf55d7 100644 --- a/modules-available/statistics/lang/de/template-tags.json +++ b/modules-available/statistics/lang/de/template-tags.json @@ -37,6 +37,7 @@ "lang_machineOccupied": "Der Rechner ist eingeschaltet und wird benutzt", "lang_machineOccupiedBy": "In Verwendung durch", "lang_machineOff": "Der Rechner ist ausgeschaltet, oder hat kein bwLehrpool gebootet", + "lang_machineStandby": "Im Standby", "lang_machineSummary": "Zusammenfassung", "lang_maximumAbbrev": "Max.", "lang_memoryStats": "Arbeitsspeicher", @@ -65,6 +66,8 @@ "lang_ramSlots": "Speicher-Slots", "lang_realCores": "Kerne", "lang_reallocatedSectors": "Defekte Sektoren", + "lang_runMode": "Betriebsmodus", + "lang_runmodeMachines": "Mit besonderem Betriebsmodus", "lang_screens": "Bildschirme", "lang_serialNo": "Serien-Nr", "lang_showList": "Liste", @@ -83,4 +86,4 @@ "lang_virtualCores": "Virtuelle Kerne", "lang_when": "Wann", "lang_withBadSectors": "Clients mit potentiell defekten Festplatten (mehr als 10 defekte Sektoren)" -} +}
\ No newline at end of file diff --git a/modules-available/statistics/lang/en/messages.json b/modules-available/statistics/lang/en/messages.json index 40eac8c9..ae6c47af 100644 --- a/modules-available/statistics/lang/en/messages.json +++ b/modules-available/statistics/lang/en/messages.json @@ -1,6 +1,6 @@ { - "invalid-filter": "Invalid filter", "invalid-filter-argument": "{{1}} is not a vald argument for filter {{0}}", "invalid-filter-key": "{{0}} is not a valid filter", - "notes-saved": "Notes have been saved" + "notes-saved": "Notes have been saved", + "unknown-machine": "Unknown machine uuid {{0}}" }
\ No newline at end of file diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json index f514b894..ab7a7d0a 100644 --- a/modules-available/statistics/lang/en/template-tags.json +++ b/modules-available/statistics/lang/en/template-tags.json @@ -37,6 +37,7 @@ "lang_machineOccupied": "Machine is powered on and in use", "lang_machineOccupiedBy": "In use by", "lang_machineOff": "Machine is powered down, or is not running bwLehrpool", + "lang_machineStandby": "In standby mode", "lang_machineSummary": "Summary", "lang_maximumAbbrev": "max.", "lang_memoryStats": "Memory", @@ -65,6 +66,8 @@ "lang_ramSlots": "Memory slots", "lang_realCores": "Cores", "lang_reallocatedSectors": "Bad sectors", + "lang_runMode": "Mode of operation", + "lang_runmodeMachines": "With special mode of operation", "lang_screens": "Screens", "lang_serialNo": "Serial no", "lang_showList": "List", @@ -83,4 +86,4 @@ "lang_virtualCores": "Virtual cores", "lang_when": "When", "lang_withBadSectors": "Clients with potentially bad HDDs (more than 10 reallocated sectors)" -} +}
\ No newline at end of file |