summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-07-14 11:20:09 +0200
committerSimon Rettberg2016-07-14 11:20:09 +0200
commitc9f6088cb96d9f104434aebdd78d61e1c9d2096c (patch)
tree2042aa8d4527c988ae1af2e60cd21d4c37822d4d
parent[statistics] Add location to filter dropdown list (diff)
downloadslx-admin-c9f6088cb96d9f104434aebdd78d61e1c9d2096c.tar.gz
slx-admin-c9f6088cb96d9f104434aebdd78d61e1c9d2096c.tar.xz
slx-admin-c9f6088cb96d9f104434aebdd78d61e1c9d2096c.zip
Update translations
-rw-r--r--modules-available/statistics/lang/de/messages.json6
-rw-r--r--modules-available/statistics/lang/de/template-tags.json3
-rw-r--r--modules-available/statistics/lang/en/messages.json6
-rw-r--r--modules-available/statistics/lang/en/template-tags.json3
-rw-r--r--modules-available/sysconfig/lang/de/module.json6
-rw-r--r--modules-available/sysconfig/lang/de/template-tags.json2
-rw-r--r--modules-available/sysconfig/lang/en/module.json6
-rw-r--r--modules-available/sysconfig/lang/en/template-tags.json2
8 files changed, 29 insertions, 5 deletions
diff --git a/modules-available/statistics/lang/de/messages.json b/modules-available/statistics/lang/de/messages.json
index 0a1be6d0..8bdf9cfc 100644
--- a/modules-available/statistics/lang/de/messages.json
+++ b/modules-available/statistics/lang/de/messages.json
@@ -1,4 +1,6 @@
{
- "notes-saved": "Anmerkungen gespeichert",
- "invalid-filter": "Ung\u00fcltiger Filter"
+ "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"
} \ 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 d4d34fb7..7f4d13e9 100644
--- a/modules-available/statistics/lang/de/template-tags.json
+++ b/modules-available/statistics/lang/de/template-tags.json
@@ -21,8 +21,11 @@
"lang_kvmState": "Status",
"lang_kvmStats": "64\u2009Bit Gast-Support",
"lang_kvmSupport": "64\u2009Bit G\u00e4ste",
+ "lang_labelFilter": "Aktive Filter (UND-Logik)",
"lang_lastBoot": "Letzter Boot",
+ "lang_lastLogin": "Letzer Login",
"lang_lastSeen": "Zuletzt gesehen",
+ "lang_location": "Ort",
"lang_logHeadline": "Logging",
"lang_macAddr": "MAC-Adresse",
"lang_machine": "Rechner",
diff --git a/modules-available/statistics/lang/en/messages.json b/modules-available/statistics/lang/en/messages.json
index 15457015..40eac8c9 100644
--- a/modules-available/statistics/lang/en/messages.json
+++ b/modules-available/statistics/lang/en/messages.json
@@ -1,4 +1,6 @@
{
- "notes-saved": "Notes have been saved",
- "invalid-filter": "Invalid filter"
+ "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"
} \ 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 286d1a32..3e26ae03 100644
--- a/modules-available/statistics/lang/en/template-tags.json
+++ b/modules-available/statistics/lang/en/template-tags.json
@@ -21,8 +21,11 @@
"lang_kvmState": "State",
"lang_kvmStats": "64\u2009Bit guest support",
"lang_kvmSupport": "64\u2009Bit guests",
+ "lang_labelFilter": "Active filters (AND logic)",
"lang_lastBoot": "Last boot",
+ "lang_lastLogin": "Last login",
"lang_lastSeen": "Last seen",
+ "lang_location": "Location",
"lang_logHeadline": "Logging",
"lang_macAddr": "MAC address",
"lang_machine": "Machine",
diff --git a/modules-available/sysconfig/lang/de/module.json b/modules-available/sysconfig/lang/de/module.json
index dfd47099..056cd158 100644
--- a/modules-available/sysconfig/lang/de/module.json
+++ b/modules-available/sysconfig/lang/de/module.json
@@ -1,4 +1,10 @@
{
+ "lang_clientSshConfig": "SSH-Konfiguration",
+ "lang_configurationCompilation": "Konfiguration zusammenstellen",
+ "lang_contentOf": "Inhalt von",
+ "lang_moduleAdd": "Modul hinzuf\u00fcgen",
+ "lang_noModuleFromThisGroup": "(Kein Modul dieser Gruppe)",
+ "lang_unknwonTaskManager": "Unbekannter Taskmanager-Fehler",
"module_name": "Lokalisierung + Integration",
"page_title": "Lokalisierung + Integration"
} \ No newline at end of file
diff --git a/modules-available/sysconfig/lang/de/template-tags.json b/modules-available/sysconfig/lang/de/template-tags.json
index c69abc93..cfd3b333 100644
--- a/modules-available/sysconfig/lang/de/template-tags.json
+++ b/modules-available/sysconfig/lang/de/template-tags.json
@@ -34,7 +34,7 @@
"lang_download": "Herunterladen",
"lang_downloadLong": "Dieses Modul \"so wie es ist\" herunterladen.",
"lang_editLong": "Modul oder Konfiguration bearbeiten.",
- "lang_editingLocationInfo": "Sie bearbeiten die Konfiguration eines bestimmten Raums\/Orts, nicht die globale Konfiguration",
+ "lang_editingLocationInfo": "Sie setzen die Konfiguration eines bestimmten Raums\/Orts, nicht die globale Konfiguration",
"lang_folderRedirection": "Folder Redirection",
"lang_generateModule": "Modul erzeugen",
"lang_handlingNotes": "Hier k\u00f6nnen Sie festlegen, wie Netzwerk-Shares (inkl. des Home-Verzeichnisses) an Virtuelle Maschinen durchgereicht werden. In \u00e4lteren Versionen von bwLehrpool wurden die VMware Shared Folders genutzt, was mit bestimmten file servern Probleme verursachen konnte. Der neue native Modus funktioniert deutlich besser, ist aber bei Windows-G\u00e4sten darauf angewiesen, dass (1) der file server smb\/cifs spricht (z.B. Windows Server, Samba unter Linux) und (2) die openslx.exe im Autostart eingebunden ist (bei den bwLehrpool Vorlagen bereits der Fall). Der native Modus mit Fallback auf VMware ist experimentell und kann dazu f\u00fchren, dass die VM in regelm\u00e4\u00dfigen Abst\u00e4nden H\u00e4nger hat. WICHTIG: Bitte w\u00e4hlen Sie einen Laufwerksbuchstaben, der in den eingesetzten VMs verf\u00fcgbar ist, da ansonsten auf einen anderen Buchstaben ausgewichen werden muss.",
diff --git a/modules-available/sysconfig/lang/en/module.json b/modules-available/sysconfig/lang/en/module.json
index 9125fb13..fe4f346e 100644
--- a/modules-available/sysconfig/lang/en/module.json
+++ b/modules-available/sysconfig/lang/en/module.json
@@ -1,4 +1,10 @@
{
+ "lang_clientSshConfig": "SSH configuration",
+ "lang_configurationCompilation": "Compile configuration",
+ "lang_contentOf": "Content of \"",
+ "lang_moduleAdd": "Add Module",
+ "lang_noModuleFromThisGroup": "(No module from this group)",
+ "lang_unknwonTaskManager": "Unknown Task Manager error",
"module_name": "Localization",
"page_title": "Localize and integrate"
} \ No newline at end of file
diff --git a/modules-available/sysconfig/lang/en/template-tags.json b/modules-available/sysconfig/lang/en/template-tags.json
index c333f6af..c71c0bfb 100644
--- a/modules-available/sysconfig/lang/en/template-tags.json
+++ b/modules-available/sysconfig/lang/en/template-tags.json
@@ -18,6 +18,7 @@
"lang_browseForFile": "Browse",
"lang_checkFileContent": "Here you have the possibility to check the contents of the archive again.",
"lang_computerLoad": "Load image from local computer",
+ "lang_configLocationLong": "This configuration is directly assigned to one or more location. This counter will not include sub-location that might inherit this configuration.",
"lang_configuration": "Configuration",
"lang_configurationActive": "Enable configuration",
"lang_configurationChoose": "Please select which modules will be used for this configuration.",
@@ -33,6 +34,7 @@
"lang_download": "Download",
"lang_downloadLong": "Download module \"as is\".",
"lang_editLong": "Edit module or configuration.",
+ "lang_editingLocationInfo": "You're setting the configuration for a specific location, not the global one",
"lang_folderRedirection": "Folder Redirection",
"lang_generateModule": "Generating module",
"lang_handlingNotes": "Here you can configure how network shares (like the user's home directory) are mapped inside the VM. Old Versions of bwLehrpool used the VMware Shared Folder technique, which could cause problems with certain file servers. The new \"native mode\" works much better, but on Windows guests, it requires that you (1) use an smb\/cifs file server (Windows Server, Linux with Samba) and (2) have openslx.exe setup to autorun in the VM (this is already configured for bwLehrpool templates). Native mode with fallback is experimental and known to cause temporary freezes with some VMs. Use with care. IMPORTANT: Pick a drive letter for the home directory that will be free in the Virtual Machines. Otherwise, a random letter will be assigned.",