summaryrefslogtreecommitdiffstats
path: root/lang/en
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-30 11:52:58 +0200
committerSimon Rettberg2015-09-30 11:52:58 +0200
commit555452c4d8e3559964ae24342f36729b82ecc0dd (patch)
tree13568807bbad01f9a65b696a0f6777070ae76cc3 /lang/en
parent[Webinterface/HTTPS] Only show "disable https" if it is enabled (diff)
downloadslx-admin-555452c4d8e3559964ae24342f36729b82ecc0dd.tar.gz
slx-admin-555452c4d8e3559964ae24342f36729b82ecc0dd.tar.xz
slx-admin-555452c4d8e3559964ae24342f36729b82ecc0dd.zip
Update translations
Diffstat (limited to 'lang/en')
-rw-r--r--lang/en/templates/backup/_page.json7
-rw-r--r--lang/en/templates/sysconfig/branding-start.json2
-rw-r--r--lang/en/templates/sysconfig/custom-upload.json3
-rw-r--r--lang/en/templates/webinterface/https.json3
4 files changed, 10 insertions, 5 deletions
diff --git a/lang/en/templates/backup/_page.json b/lang/en/templates/backup/_page.json
index 5b61e0d4..799c6168 100644
--- a/lang/en/templates/backup/_page.json
+++ b/lang/en/templates/backup/_page.json
@@ -1,13 +1,14 @@
{
"lang_backup": "Backup",
- "lang_backupDescription": "Here you can backup the complete configuration of this satellite server.",
+ "lang_backupDescription": "Here you can backup the complete configuration of this satellite server. This includes lecture and virtual machine meta data. The HDD images of the virtual machines on the vm store are not included in this backup, because of their size. If desired, the store needs to be backed up manually.",
"lang_backupRestore": "Backup and restore",
+ "lang_browseForFile": "Browse",
"lang_download": "Download",
"lang_dozmodExplanation": "This restores all the virtual machine and lecture meta data created using the \"Dozentenmodul\". Please make sure the VM-storage configured still contains all the VM-Images associated with the virtual machines. If the location of the storage changed, make sure the relative pathes on the share are still the same, otherwise the virtual machines won't be usable.",
- "lang_file": "File",
"lang_restore": "Upload",
"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_restoreDozmodConfig": "Restore Dozentenmodul config",
"lang_restoreSystemConfig": "Restore system config",
- "lang_systemExplanation": "Restore basic configuration like authentication method, passwords, vm storage location, proxy config, etc."
+ "lang_selectFile": "Please select a backup archive",
+ "lang_systemExplanation": "Restore basic configuration like authentication method, passwords, vm storage location, proxy config, etc. WARNING: If you restore a configuration backup that was made before WS15\/16 (backup format version <10), the system configuration will be restored regardless of this check mark."
} \ No newline at end of file
diff --git a/lang/en/templates/sysconfig/branding-start.json b/lang/en/templates/sysconfig/branding-start.json
index f419f5a4..4423784d 100644
--- a/lang/en/templates/sysconfig/branding-start.json
+++ b/lang/en/templates/sysconfig/branding-start.json
@@ -1,7 +1,9 @@
{
"lang_branding": "For best results, you should upload the logo in SVG format. SVG is a vector graphics format, which is advantageous for scaling. A good source for SVG logos of universities and colleges is their respective Wikipedia article.",
+ "lang_browseForFile": "Browse",
"lang_computerLoad": "Load image from local computer",
"lang_or": "or",
+ "lang_selectFile": "Please select a file",
"lang_upload": "Upload",
"lang_urlLoad": "Load image from URL"
} \ No newline at end of file
diff --git a/lang/en/templates/sysconfig/custom-upload.json b/lang/en/templates/sysconfig/custom-upload.json
index a568be7c..26b7c186 100644
--- a/lang/en/templates/sysconfig/custom-upload.json
+++ b/lang/en/templates/sysconfig/custom-upload.json
@@ -1,7 +1,8 @@
{
+ "lang_browseForFile": "Browse",
"lang_customModuleInfo1": "About a custom module, it is possible to add arbitrary files to a Linux system that is booted clients. For this purpose, an archive can be uploaded using a file system structure that is extracted in this form 1:1 in the booted Linux.",
"lang_customModuleInfo2": "Example: If the uploaded archive is the file etc\/example.conf, this file will be located as \/etc\/example.conf to a booted client.",
- "lang_file": "File",
+ "lang_selectFile": "Please select an archive",
"lang_supportedFiles": "Supported File Formats",
"lang_upload": "Upload"
} \ No newline at end of file
diff --git a/lang/en/templates/webinterface/https.json b/lang/en/templates/webinterface/https.json
index 90bdfdd4..64631a9a 100644
--- a/lang/en/templates/webinterface/https.json
+++ b/lang/en/templates/webinterface/https.json
@@ -1,10 +1,11 @@
{
+ "lang_HttpsIsDisabled": "HTTPS is currently disabled",
"lang_caChain": "Here you can paste an optional certificate chain. It should only be required if you have a certificate that was not directly signed by a certificate authority known by the browsers. It should contain one or more certificate blocks, looking just like the certificate above.",
"lang_certificate": "Please paste your certificate below. It has to be in base64 encoded x509 format (sometimes called pem). It should look something like this:",
"lang_customCert": "Supply own certificate",
"lang_description": "Here you can set whether the web interface should be accessible via https. You can chose if you want to use a random self signed certificate, or supply your own.",
"lang_httpsSettings": "HTTPS settings",
- "lang_noHttps": "Disable HTTPS",
+ "lang_noHttps": "Disable HTTPS, delete current certificate",
"lang_privateKey": "Please paste the private key belonging to the certificate here. It has to be in \"pem\" format too, which should look like this:",
"lang_randomCert": "Genenrate new self-signed certificate",
"lang_save": "Save"