Merge branch 'develop'5.1-beta2

2 files changed, 10 insertions, 14 deletions

diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml
index 71ad51a..a8d6f4b 100644
--- a/config/locales/views/call_routes/de.yml
+++ b/config/locales/views/call_routes/de.yml
@@ -9,11 +9,10 @@ de:
       page_title: 'Liste aller Call Routen'
       routing_table: 'Routing Table'
       name: 'Name'
-      endpoint_type: 'Endpoint type'
-      endpoint_id: 'Endpoint'
+      endpoint: 'Endpoint'
       position: 'Position'
       actions:
-        confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call Route'
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call Route'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
@@ -23,11 +22,10 @@ de:
       page_title: 'Call Route bearbeiten'
       routing_table: 'Routing Table'
       name: 'Name'
-      endpoint_type: 'Endpoint type'
-      endpoint_id: 'Endpoint'
+      endpoint: 'Endpoint'
       position: 'Position'
       actions:
-        confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
@@ -57,4 +55,4 @@ de:
       position:
         label: 'Position'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/call_routes/en.yml b/config/locales/views/call_routes/en.yml
index 251f76e..8596474 100644
--- a/config/locales/views/call_routes/en.yml
+++ b/config/locales/views/call_routes/en.yml
@@ -9,11 +9,10 @@ en:
       page_title: 'Listing Call route'
       table: 'Table'
       name: 'Name'
-      endpoint_type: 'Endpoint type'
-      endpoint_id: 'Endpoint'
+      endpoint: 'Endpoint'
       position: 'Position'
       actions:
-        confirm: 'Are you sure you want to delete this Call route?'
+        confirm_destroy: 'Are you sure you want to delete this Call route?'
         destroy: 'Delete'
         edit: 'Edit'
         show: 'View'
@@ -23,11 +22,10 @@ en:
       page_title: 'Show Call route'
       table: 'Table'
       name: 'Name'
-      endpoint_type: 'Endpoint type'
-      endpoint_id: 'Endpoint'
+      endpoint: 'Endpoint'
       position: 'Position'
       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'
@@ -57,4 +55,4 @@ en:
       position:
         label: 'Position'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file