Merge branch 'develop' of github.com:amooma/GS5 into develop

4 files changed, 36 insertions, 110 deletions

diff --git a/config/locales/views/backup_jobs/de.yml b/config/locales/views/backup_jobs/de.yml
index b81b532..8e23feb 100644
--- a/config/locales/views/backup_jobs/de.yml
+++ b/config/locales/views/backup_jobs/de.yml
@@ -1,60 +1,61 @@
 de:
   backup_jobs:
-    name: 'Backup job'
+    name: 'Backup-Auftrag'
     controller:
-      successfuly_created: 'Backup job wurde angelegt.'
-      successfuly_updated: 'Backup job wurde aktualisiert.'
-      successfuly_destroyed: 'Backup job wurde gelöscht.'
+      successfuly_created: 'Backup-Auftrag wurde angelegt.'
+      successfuly_updated: 'Backup-Auftrag wurde aktualisiert.'
+      successfuly_destroyed: 'Backup-Auftrag wurde gelöscht.'
     index:
-      page_title: 'Übersicht von Backup job'
-      started_at: 'Started at'
-      finished_at: 'Finished at'
-      state: 'State'
-      directory: 'Directory'
-      size_of_the_backup: 'Size of the backup'
+      page_title: 'Liste aller Backup-Aufträge'
+      page_title_with_limit: 'Liste der letzten %{limit} Backup-Aufträge'
+      started_at: 'Start'
+      finished_at: 'Ende'
+      state: 'Status'
+      directory: 'Verzeichnis'
+      size_of_the_backup: 'Größe'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Backup job'
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Backup-Auftrag'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
         create: 'Neu anlegen'
-        create_for: 'Backup job neu anlegen für %{resource}'
+        create_for: 'Backup-Auftrag neu anlegen für %{resource}'
     show:
-      page_title: 'Backup job bearbeiten'
-      started_at: 'Started at'
-      finished_at: 'Finished at'
-      state: 'State'
-      directory: 'Directory'
-      size_of_the_backup: 'Size of the backup'
+      page_title: 'Backup-Auftrag bearbeiten'
+      started_at: 'Start'
+      finished_at: 'Ende'
+      state: 'Status'
+      directory: 'Verzeichnis'
+      size_of_the_backup: 'Größe'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
     new:
-      page_title: 'Backup job neu anlegen'
+      page_title: 'Backup-Auftrag neu anlegen'
       actions:
         back_to_list: 'Zurück zur Übersicht'
     edit:
-      page_title: 'Backup job bearbeiten'
+      page_title: 'Backup-Auftrag bearbeiten'
       actions:
         back_to_list: 'Zurück zur Übersicht'
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
     form:
       started_at:
-        label: 'Started at'
+        label: 'Start'
         hint: ''
       finished_at:
-        label: 'Finished at'
+        label: 'Ende'
         hint: ''
       state:
-        label: 'State'
+        label: 'Status'
         hint: ''
       directory:
-        label: 'Directory'
+        label: 'Verzeichnis'
         hint: ''
       size_of_the_backup:
-        label: 'Size of the backup'
+        label: 'Größe'
         hint: ''
       submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/backup_jobs/en.yml b/config/locales/views/backup_jobs/en.yml
index 83f4388..74d14c2 100644
--- a/config/locales/views/backup_jobs/en.yml
+++ b/config/locales/views/backup_jobs/en.yml
@@ -2,25 +2,26 @@ en:
   backup_jobs:
     name: 'Backup job'
     controller:
-      successfuly_created: 'Successfully created Backup job.'
-      successfuly_updated: 'Successfully updated Backup job.'
-      successfuly_destroyed: 'Successfully destroyed Backup job.'
+      successfuly_created: 'Successfully created backup job.'
+      successfuly_updated: 'Successfully updated backup job.'
+      successfuly_destroyed: 'Successfully destroyed backup job.'
     index:
-      page_title: 'Listing Backup job'
+      page_title: 'Listing backup jobs'
+      page_title_with_limit: 'Listing of the last %{limit} backup jobs'
       started_at: 'Started at'
       finished_at: 'Finished at'
       state: 'State'
       directory: 'Directory'
       size_of_the_backup: 'Size of the backup'
       actions:
-        confirm_destroy: 'Are you sure you want to delete this Backup job?'
+        confirm_destroy: 'Are you sure you want to delete this backup job?'
         destroy: 'Delete'
         edit: 'Edit'
         show: 'View'
         create: 'New'
-        create_for: 'New Backup job for %{resource}'
+        create_for: 'New backup job for %{resource}'
     show:
-      page_title: 'Show Backup job'
+      page_title: 'Show backup job'
       started_at: 'Started at'
       finished_at: 'Finished at'
       state: 'State'
@@ -32,11 +33,11 @@ en:
         edit: 'Edit'
         view_all: 'View All'
     new:
-      page_title: 'New Backup job'
+      page_title: 'New backup job'
       actions:
         back_to_list: 'Back to Index'
     edit:
-      page_title: 'Editing Backup job'
+      page_title: 'Editing backup job'
       actions:
         back_to_list: 'Back to Index'
         edit: 'Edit'
diff --git a/config/locales/views/system_messages/de.yml b/config/locales/views/system_messages/de.yml
deleted file mode 100644
index d841d0b..0000000
--- a/config/locales/views/system_messages/de.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-de:
-  system_messages:
-    name: 'Systemnachricht'
-    controller:
-      successfuly_created: 'Eine Systemnachricht wurde erstellt.'
-      successfuly_updated: 'Eine Systemnachricht wurde aktualisiert.'
-      successfuly_destroyed: 'Eine Systemnachricht wurde gelöscht.'
-    index:
-      page_title: 'Systemnachrichten'
-      user_id: 'Benutzer'
-      content: 'Nachricht'
-      actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie diese Systemnachricht löschen möchten?'
-        destroy: 'Löschen'
-        edit: 'Bearbeiten'
-        show: 'Anzeigen'
-        create: 'Neu anlegen'
-    show:
-      page_title: 'Systemnachricht anzeigen'
-      user_id: 'Benutzer'
-      content: 'Nachricht'
-      actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie diese Systemnachricht löschen möchten?'
-        destroy: 'Löschen'
-        edit: 'Bearbeiten'
-        view_all: 'Alle anzeigen'
-    new:
-      page_title: 'Neue Systemnachricht'
-    edit:
-      page_title: 'Systemnachricht bezüglich %{resource} bearbeiten'
-    form:
-      user_id:
-        label: 'Benutzer'
-        hint: ''
-      content:
-        label: 'Nachricht'
-        hint: ''
-      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/system_messages/en.yml b/config/locales/views/system_messages/en.yml
deleted file mode 100644
index a039b10..0000000
--- a/config/locales/views/system_messages/en.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-en:
-  system_messages:
-    name: 'System message'
-    controller:
-      successfuly_created: 'Successfully created System message.'
-      successfuly_updated: 'Successfully updated System message.'
-      successfuly_destroyed: 'Successfully destroyed System message.'
-    index:
-      page_title: 'System messages'
-      user_id: 'User'
-      content: 'Content'
-      actions:
-        confirm_destroy: 'Are you sure you want to delete this element?'
-        destroy: 'Delete'
-        edit: 'Edit'
-        show: 'View'
-        create: 'New'
-    show:
-      page_title: 'Editing System message'
-      user_id: 'User'
-      content: 'Content'
-      actions:
-        confirm_destroy: 'Are you sure you want to delete this element?'
-        destroy: 'Delete'
-        edit: 'Edit'
-        view_all: 'View All'
-    new:
-      page_title: 'New System message'
-    edit:
-      page_title: 'Editing System message %{resource}'
-    form:
-      user_id:
-        label: 'User'
-        hint: ''
-      content:
-        label: 'Content'
-        hint: ''
-      submit: 'Submit'
\ No newline at end of file