Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization

Conflicts:
	modules-available/main/templates/main-menu.html

3 files changed, 7 insertions, 9 deletions

diff --git a/modules-available/exams/config.json b/modules-available/exams/config.json
index c0077970..95d8aa3e 100644
--- a/modules-available/exams/config.json
+++ b/modules-available/exams/config.json
@@ -1,5 +1,5 @@
 {
 	"category":"main.content",
-	"dependencies": [ "locations", "visjs", "bootstrap_datepicker", "bootstrap_timepicker", "bootstrap_multiselect"],
+	"dependencies": [ "locations", "js_vis", "bootstrap_datepicker", "bootstrap_timepicker", "bootstrap_multiselect"],
 	"permission": "0"
 }
diff --git a/modules-available/exams/lang/en/module.json b/modules-available/exams/lang/en/module.json
new file mode 100644
index 00000000..a066b3aa
--- /dev/null
+++ b/modules-available/exams/lang/en/module.json
@@ -0,0 +1,6 @@
+{
+    "module_name": "Exam mode",
+    "title_add-exam": "Add exam",
+    "title_edit-exam": "Edit exam",
+    "warning_lecture_is_not_enabled": "Warning: Lecture is not enabled by tutor"
+}
\ No newline at end of file
diff --git a/modules-available/exams/lang/pt/template-tags.json b/modules-available/exams/lang/pt/template-tags.json
deleted file mode 100644
index 524f3dd5..00000000
--- a/modules-available/exams/lang/pt/template-tags.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "lang_confirmation": "Confirmar Senha",
-    "lang_createUser": "Criar Usu\u00e1rio",
-    "lang_fullName": "Nome Completo",
-    "lang_password": "Senha",
-    "lang_telephone": "Telefone",
-    "lang_username": "Nome de Usu\u00e1rio"
-}
\ No newline at end of file