summaryrefslogtreecommitdiffstats
path: root/lang/en
diff options
context:
space:
mode:
authorSimon Rettberg2015-05-21 17:18:29 +0200
committerSimon Rettberg2015-05-21 17:18:29 +0200
commit3559db6c5e8e45a4e2f6fa0687c27f4162dc3b29 (patch)
tree89f27f84dace6d0ea3b0bb5fdef90db1f899226a /lang/en
parent[branding] Show error message if given URL does not contain an SVG image (diff)
downloadslx-admin-3559db6c5e8e45a4e2f6fa0687c27f4162dc3b29.tar.gz
slx-admin-3559db6c5e8e45a4e2f6fa0687c27f4162dc3b29.tar.xz
slx-admin-3559db6c5e8e45a4e2f6fa0687c27f4162dc3b29.zip
Update translations
Diffstat (limited to 'lang/en')
-rw-r--r--lang/en/messages.json1
-rw-r--r--lang/en/templates/sysconfig/ad-checkconnection.json4
-rw-r--r--lang/en/templates/sysconfig/ad-checkcredentials.json5
-rw-r--r--lang/en/templates/sysconfig/ad-start.json2
-rw-r--r--lang/en/templates/systemstatus/_page.json2
-rw-r--r--lang/en/templates/systemstatus/diskstat.json1
6 files changed, 13 insertions, 2 deletions
diff --git a/lang/en/messages.json b/lang/en/messages.json
index 91dda3af..10314625 100644
--- a/lang/en/messages.json
+++ b/lang/en/messages.json
@@ -36,6 +36,7 @@
"news-del-success": "News deleted",
"news-empty": "There was no news found in the database",
"news-save-success": "News updated successfully",
+ "no-image": "Could not find an SVG-image at the given URL",
"no-permission": "No sufficient privileges to access this page",
"password-mismatch": "Password and password confirmation do not match",
"reboot-unconfirmed": "Confirmation prompt to reboot not confirmed",
diff --git a/lang/en/templates/sysconfig/ad-checkconnection.json b/lang/en/templates/sysconfig/ad-checkconnection.json
index 5ae50d59..c986668d 100644
--- a/lang/en/templates/sysconfig/ad-checkconnection.json
+++ b/lang/en/templates/sysconfig/ad-checkconnection.json
@@ -1,5 +1,5 @@
{
"lang_back": "Back",
- "lang_connectionWait": "The connection to the specified AD server is now checked. Please wait a moment.",
- "lang_skip": "Skip"
+ "lang_connectionWait": "Checking connection...",
+ "lang_next": "Next"
} \ No newline at end of file
diff --git a/lang/en/templates/sysconfig/ad-checkcredentials.json b/lang/en/templates/sysconfig/ad-checkcredentials.json
new file mode 100644
index 00000000..5ae50d59
--- /dev/null
+++ b/lang/en/templates/sysconfig/ad-checkcredentials.json
@@ -0,0 +1,5 @@
+{
+ "lang_back": "Back",
+ "lang_connectionWait": "The connection to the specified AD server is now checked. Please wait a moment.",
+ "lang_skip": "Skip"
+} \ No newline at end of file
diff --git a/lang/en/templates/sysconfig/ad-start.json b/lang/en/templates/sysconfig/ad-start.json
index 5cb33e05..9bd5ac42 100644
--- a/lang/en/templates/sysconfig/ad-start.json
+++ b/lang/en/templates/sysconfig/ad-start.json
@@ -9,6 +9,8 @@
"lang_next": "Next",
"lang_password": "Password",
"lang_searchBase": "Search Base",
+ "lang_ssl": "SSL",
+ "lang_sslDescription": "Use SSL encryption to talk to AD server",
"lang_userDirectory": "User Directory",
"lang_userDirectoryInfo1": "Optional: If the clients should embed a separate directory (home directory, user directory) from a server for the user, please enter here the format in UNC notation, eg",
"lang_userDirectoryInfo2": "%s is a placeholder for the user's login name.",
diff --git a/lang/en/templates/systemstatus/_page.json b/lang/en/templates/systemstatus/_page.json
index df976df4..34d09966 100644
--- a/lang/en/templates/systemstatus/_page.json
+++ b/lang/en/templates/systemstatus/_page.json
@@ -1,5 +1,7 @@
{
"lang_addressConfiguration": "Address Configuration",
+ "lang_advanced": "Advanced \/ Debug",
+ "lang_dmsdLog": "dmsd log",
"lang_iAmSure": "Yes, I am sure",
"lang_maintenance": "Maintenance",
"lang_services": "Services",
diff --git a/lang/en/templates/systemstatus/diskstat.json b/lang/en/templates/systemstatus/diskstat.json
index 50dfc383..fafb9187 100644
--- a/lang/en/templates/systemstatus/diskstat.json
+++ b/lang/en/templates/systemstatus/diskstat.json
@@ -1,5 +1,6 @@
{
"lang_capacity": "Capacity",
+ "lang_free": "Free",
"lang_systemPartition": "System Partition",
"lang_vmStore": "VM Store",
"lang_vmStoreError": "Error when determining the available disk space on the VM location. Please check the configuration."