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

Conflicts:
	misc/freeswitch/scripts/dialplan/router.lua

1 files changed, 60 insertions, 0 deletions

diff --git a/config/locales/views/call_routes/en.yml b/config/locales/views/call_routes/en.yml
new file mode 100644
index 0000000..251f76e
--- /dev/null
+++ b/config/locales/views/call_routes/en.yml
@@ -0,0 +1,60 @@
+en:
+  call_routes:
+    name: 'Call route'
+    controller:
+      successfuly_created: 'Successfully created Call route.'
+      successfuly_updated: 'Successfully updated Call route.'
+      successfuly_destroyed: 'Successfully destroyed Call route.'
+    index:
+      page_title: 'Listing Call route'
+      table: 'Table'
+      name: 'Name'
+      endpoint_type: 'Endpoint type'
+      endpoint_id: 'Endpoint'
+      position: 'Position'
+      actions:
+        confirm: 'Are you sure you want to delete this Call route?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Call route for %{resource}'
+    show:
+      page_title: 'Show Call route'
+      table: 'Table'
+      name: 'Name'
+      endpoint_type: 'Endpoint type'
+      endpoint_id: 'Endpoint'
+      position: 'Position'
+      actions:
+        confirm: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Call route'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Call route'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      table:
+        label: 'Table'
+        hint: ''
+      name:
+        label: 'Name'
+        hint: ''
+      endpoint_type:
+        label: 'Endpoint type'
+        hint: ''
+      endpoint_id:
+        label: 'Endpoint'
+        hint: ''
+      position:
+        label: 'Position'
+        hint: ''
+      button: 'Submit'
\ No newline at end of file