Merge branch 'develop'5.1-beta6

2 files changed, 14 insertions, 14 deletions

diff --git a/config/locales/views/call_forwards/de.yml b/config/locales/views/call_forwards/de.yml
index 3930938..4f6ee86 100644
--- a/config/locales/views/call_forwards/de.yml
+++ b/config/locales/views/call_forwards/de.yml
@@ -7,8 +7,8 @@ de:
       successfuly_destroyed: 'Die Rufumleitung wurde gelöscht.'
     index:
       page_title: 'Rufumleitungen'
-      phone_number_id: 'Telefonnummer'
-      call_forward_case_id: 'Art der Rufumleitung'
+      call_forwardable: 'Umleitendes Objekt'
+      call_forward_case: 'Art der Rufumleitung'
       timeout: 'Zeitüberschreitung'
       destination: 'Ziel'
       hunt_group: 'Rufgruppen-Verknüpfung'
@@ -25,8 +25,8 @@ de:
         create_for: 'Neue Rufumleitung für die %{resource} anlegen'
     show:
       page_title: 'Rufumleitung anzeigen'
-      phone_number_id: 'Telefonnummer'
-      call_forward_case_id: 'Art der Rufumleitung'
+      call_forwardable: 'Umleitendes Objekt'
+      call_forward_case: 'Art der Rufumleitung'
       timeout: 'Zeitüberschreitung'
       destination: 'Ziel'
       hunt_group: 'Rufgruppen-Verknüpfung'
@@ -44,10 +44,10 @@ de:
     edit:
       page_title: 'Rufumleitung bearbeiten'
     form:
-      phone_number_id:
-        label: 'Telefonnummer'
+      call_forwardable:
+        label: 'Umleitendes Objekt'
         hint: ''
-      call_forward_case_id:
+      call_forward_case:
         label: 'Art der Rufumleitung'
         hint: ''
       timeout:
diff --git a/config/locales/views/call_forwards/en.yml b/config/locales/views/call_forwards/en.yml
index 20fb834..65ae6b0 100644
--- a/config/locales/views/call_forwards/en.yml
+++ b/config/locales/views/call_forwards/en.yml
@@ -7,8 +7,8 @@ en:
       successfuly_destroyed: 'Successfully destroyed call forward.'
     index:
       page_title: 'Call forwards'
-      phone_number_id: 'Phone number'
-      call_forward_case_id: 'Call forward case'
+      call_forwardable: 'Forwarding entity'
+      call_forward_case: 'Call forward case'
       timeout: 'Timeout'
       destination: 'Destination'
       to_voicemail: 'Voicemail'
@@ -25,8 +25,8 @@ en:
         create_for: 'New call forward for phone number %{resource}'
     show:
       page_title: 'Show call forward'
-      phone_number_id: 'Phone number'
-      call_forward_case_id: 'Call forward case'
+      call_forwardable: 'Forwarding entity'
+      call_forward_case: 'Call forward case'
       timeout: 'Timeout'
       destination: 'Destination'
       hunt_group: 'Hunt group connection'
@@ -44,10 +44,10 @@ en:
     edit:
       page_title: 'Editing call forward'
     form:
-      phone_number_id:
-        label: 'Phone number'
+      call_forwardable:
+        label: 'Forwarding entity'
         hint: ''
-      call_forward_case_id:
+      call_forward_case:
         label: 'Call forward case'
         hint: ''
       timeout: