Work on translations: templates and messages work

8 files changed, 28 insertions, 42 deletions

diff --git a/modules-available/backup/lang/de/module.json b/modules-available/backup/lang/de/module.json
index a0dbdf27..a08ad617 100644
--- a/modules-available/backup/lang/de/module.json
+++ b/modules-available/backup/lang/de/module.json
@@ -1,4 +1,4 @@
 {
-    "module_name": "Sichern/Wiederherstellen",
+    "module_name": "Sichern\/Wiederherstellen",
     "page_title": "Sichern und wiederherstellen"
-}
+}
\ No newline at end of file
diff --git a/modules-available/backup/lang/de/templates/_page.json b/modules-available/backup/lang/de/template-tags.json
index 5e3efea2..770e34d2 100644
--- a/modules-available/backup/lang/de/templates/_page.json
+++ b/modules-available/backup/lang/de/template-tags.json
@@ -5,10 +5,15 @@
     "lang_browseForFile": "Durchsuchen",
     "lang_download": "Herunterladen",
     "lang_dozmodExplanation": "Die Datenbank des Dozentenmoduls wiederherstellen. Dazu geh\u00f6ren die Metadaten der Virtuellen Maschinen, die Veranstaltungen, etc. Bitte beachten Sie, dass hierzu auf dem konfigurierten VM-Store die passenden VM-Abbilder vorliegen m\u00fcssen, da diese extern gespeichert werden. Wenn sich der Servername oder die -adresse ge\u00e4ndert haben stellen Sie bitte sicher, dass die relativen Pfade innerhalb des Netzlaufwerks gleich geblieben sind. Ansonsten werden die wiederhergestellten VMs nicht verwendbar sein.",
+    "lang_reboot": "Systemneustart",
     "lang_restore": "Hochladen",
+    "lang_restoreConfig": "Konfiguration wiederherstellen",
     "lang_restoreDescription": "Hier k\u00f6nnen Sie ein Backup der Konfiguration wieder einspielen. Bitte beachten Sie, dass der Server dabei neu gestartet wird, daher sollten Sie dies m\u00f6glichst durchf\u00fchren, wenn das System nicht genutzt wird, und keine Dozenten Veranstaltungen oder Virtuelle Labore erstellen oder hoch-\/herunterladen. Bitte beachten Sie, dass dabei auch das urspr\u00fcngliche Passwort der Weboberfl\u00e4che wiederhergestellt wird.",
     "lang_restoreDozmodConfig": "Dozentenmodul-Konfiguration wiederherstellen",
+    "lang_restoreFailed": "Wiederherstellung der Konfiguration fehlgeschlagen.",
     "lang_restoreSystemConfig": "Systemkonfiguration wiederherstellen",
     "lang_selectFile": "Bitte w\u00e4hlen Sie ein Backup-Archiv",
-    "lang_systemExplanation": "Die Grundkonfiguration des Satelliten wiederherstellen: Authentifizierungmethode, Passw\u00f6rter, Proxies, VM-Storage, etc.\r\nACHTUNG: Wenn Sie ein Backup von vor WS15\/16 einspielen (Backup-Format vor Version 10), wird die Systemkonfiguration in jedem Fall wiederhergestellt, auch wenn Sie diesen Haken nicht setzen."
+    "lang_stopping": "Stoppe",
+    "lang_systemExplanation": "Die Grundkonfiguration des Satelliten wiederherstellen: Authentifizierungmethode, Passw\u00f6rter, Proxies, VM-Storage, etc.\r\nACHTUNG: Wenn Sie ein Backup von vor WS15\/16 einspielen (Backup-Format vor Version 10), wird die Systemkonfiguration in jedem Fall wiederhergestellt, auch wenn Sie diesen Haken nicht setzen.",
+    "lang_waitReboot": "Warte auf Reboot."
 }
\ No newline at end of file
diff --git a/modules-available/backup/lang/de/templates/restore.json b/modules-available/backup/lang/de/templates/restore.json
deleted file mode 100644
index 6b3a7cdd..00000000
--- a/modules-available/backup/lang/de/templates/restore.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "lang_backup": "Sichern...",
-    "lang_reboot": "Systemneustart",
-    "lang_restoreConfig": "Konfiguration wiederherstellen",
-    "lang_restoreFailed": "Wiederherstellung der Konfiguration fehlgeschlagen.",
-    "lang_stopping": "Stoppe",
-    "lang_waitReboot": "Warte auf Reboot."
-}
\ No newline at end of file
diff --git a/modules-available/backup/lang/en/module.json b/modules-available/backup/lang/en/module.json
index c9379ffd..cd6c87d0 100644
--- a/modules-available/backup/lang/en/module.json
+++ b/modules-available/backup/lang/en/module.json
@@ -1,14 +1,3 @@
 {
-    "lang_backup": "Backup",
-    "lang_backupDescription": "Here you can backup the complete configuration of this satellite server.",
-    "lang_backupRestore": "Backup and restore",
-    "lang_download": "Download",
-    "lang_file": "File",
-    "lang_reboot": "System reboot",
-    "lang_restore": "Upload",
-    "lang_restoreConfig": "Restore config",
-    "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_restoreFailed": "Restoring configuration failed.",
-    "lang_stopping": "Stopping",
     "module_name": "Backup"
 }
\ No newline at end of file
diff --git a/modules-available/backup/lang/en/templates/_page.json b/modules-available/backup/lang/en/template-tags.json
index 799c6168..713f3d5e 100644
--- a/modules-available/backup/lang/en/templates/_page.json
+++ b/modules-available/backup/lang/en/template-tags.json
@@ -5,10 +5,16 @@
     "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_reboot": "System reboot",
     "lang_restore": "Upload",
+    "lang_restoreConfig": "Restore config",
     "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_restoreFailed": "Restoring configuration failed.",
     "lang_restoreSystemConfig": "Restore system config",
     "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."
+    "lang_stopping": "Stopping",
+    "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.",
+    "lang_waitReboot": "Waiting for reboot."
 }
\ No newline at end of file
diff --git a/modules-available/backup/lang/en/templates/restore.json b/modules-available/backup/lang/en/templates/restore.json
deleted file mode 100644
index 5a5f6f64..00000000
--- a/modules-available/backup/lang/en/templates/restore.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "lang_backup": "Backup...",
-    "lang_reboot": "System reboot",
-    "lang_restoreConfig": "Restore config",
-    "lang_restoreFailed": "Restoring configuration failed.",
-    "lang_stopping": "Stopping",
-    "lang_waitReboot": "Waiting for reboot."
-}
\ No newline at end of file
diff --git a/modules-available/backup/lang/pt/module.json b/modules-available/backup/lang/pt/module.json
index 5077cbfa..cd6c87d0 100644
--- a/modules-available/backup/lang/pt/module.json
+++ b/modules-available/backup/lang/pt/module.json
@@ -1,14 +1,3 @@
 {
-    "lang_backup": "Backup",
-    "lang_backupDescription": "Aqui voc\u00ea pode fazer um backup completo da configura\u00e7\u00e3o deste server.",
-    "lang_backupRestore": "Backup e Recupera\u00e7\u00e3o",
-    "lang_download": "Baixar",
-    "lang_file": "Arquivo",
-    "lang_reboot": "Reinicializar Sistema",
-    "lang_restore": "Carregar",
-    "lang_restoreConfig": "Recuperar Configura\u00e7\u00e3o",
-    "lang_restoreDescription": "Aqui voc\u00ea pode recuperar um backup de configura\u00e7\u00e3o. Por favor note que isso ir\u00e1 reinicializar o servidor, portanto \u00e9 recomendado faz\u00ea-lo quando ningu\u00e9m estiver utilizando o sistema. Por favor note que isso tamb\u00e9m ir\u00e1 recuperar a senha da interface web que estava ativa quando a configura\u00e7\u00e3o de backup foi criada.",
-    "lang_restoreFailed": "Recupera\u00e7\u00e3o da configura\u00e7\u00e3o falhou",
-    "lang_stopping": "Parando",
     "module_name": "Backup"
 }
\ No newline at end of file
diff --git a/modules-available/backup/lang/pt/template-tags.json b/modules-available/backup/lang/pt/template-tags.json
new file mode 100644
index 00000000..79f455a5
--- /dev/null
+++ b/modules-available/backup/lang/pt/template-tags.json
@@ -0,0 +1,13 @@
+{
+    "lang_backup": "Backup",
+    "lang_backupDescription": "Aqui voc\u00ea pode fazer um backup completo da configura\u00e7\u00e3o deste server.",
+    "lang_backupRestore": "Backup e Recupera\u00e7\u00e3o",
+    "lang_download": "Baixar",
+    "lang_file": "Arquivo",
+    "lang_reboot": "Reinicializar Sistema",
+    "lang_restore": "Carregar",
+    "lang_restoreConfig": "Recuperar Configura\u00e7\u00e3o",
+    "lang_restoreDescription": "Aqui voc\u00ea pode recuperar um backup de configura\u00e7\u00e3o. Por favor note que isso ir\u00e1 reinicializar o servidor, portanto \u00e9 recomendado faz\u00ea-lo quando ningu\u00e9m estiver utilizando o sistema. Por favor note que isso tamb\u00e9m ir\u00e1 recuperar a senha da interface web que estava ativa quando a configura\u00e7\u00e3o de backup foi criada.",
+    "lang_restoreFailed": "Recupera\u00e7\u00e3o da configura\u00e7\u00e3o falhou",
+    "lang_stopping": "Parando"
+}
\ No newline at end of file