Merge branch 'develop'5.1-beta2

2 files changed, 6 insertions, 6 deletions

diff --git a/config/locales/views/automatic_call_distributors/de.yml b/config/locales/views/automatic_call_distributors/de.yml
index 8618325..fa4c549 100644
--- a/config/locales/views/automatic_call_distributors/de.yml
+++ b/config/locales/views/automatic_call_distributors/de.yml
@@ -24,7 +24,7 @@ de:
       goodbye: 'Abschied'
       music: 'Musik'
       actions:
-        confirm: 'Sind Sie sicher, dass Sie diese Warteschleife löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass Sie diese Warteschleife löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
@@ -47,7 +47,7 @@ de:
       goodbye: 'Abschied'
       music: 'Musik'
       actions:
-        confirm: 'Sind Sie sicher, dass Sie diese Warteschleife löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass Sie diese Warteschleife löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
@@ -110,7 +110,7 @@ de:
       music: 
         label: 'Musik'
         hint: '' 
-      button: 'Absenden'
+      submit: 'Absenden'
     strategies:
       round_robin: 'Ringverteilung'
       ring_all: 'Alle'
diff --git a/config/locales/views/automatic_call_distributors/en.yml b/config/locales/views/automatic_call_distributors/en.yml
index d481406..5006a77 100644
--- a/config/locales/views/automatic_call_distributors/en.yml
+++ b/config/locales/views/automatic_call_distributors/en.yml
@@ -26,7 +26,7 @@ en:
       goodbye: 'Goodbye'
       music: 'Music'
       actions:
-        confirm: 'Are you sure you want to delete this ACD?'
+        confirm_destroy: 'Are you sure you want to delete this ACD?'
         destroy: 'Delete'
         edit: 'Edit'
         show: 'View'
@@ -51,7 +51,7 @@ en:
       goodbye: 'Goodbye'
       music: 'Music'
       actions:
-        confirm: 'Are you sure you want to delete this element?'
+        confirm_destroy: 'Are you sure you want to delete this element?'
         destroy: 'Delete'
         edit: 'Edit'
         view_all: 'View All'
@@ -114,7 +114,7 @@ en:
       music: 
         label: 'Music'
         hint: '' 
-      button: 'Submit'
+      submit: 'Submit'
     strategies:
       round_robin: 'Round robin'
       ring_all: 'Ring all'