Merge branch 'develop'

44 files changed, 1007 insertions, 171 deletions

diff --git a/config/hirb.yml b/config/hirb.yml
index da7c083..da760df 100644
--- a/config/hirb.yml
+++ b/config/hirb.yml
@@ -8,12 +8,11 @@
     :options:
       :fields:
       - id
-      - phone_number
+      - call_forwardable 
       - call_forward_case
       - timeout
       - destination
       - source
-      - depth
       - active
   PhoneNumberRange:
     :options:
diff --git a/config/locales/navigation.de.yml b/config/locales/navigation.de.yml
index 779248c..23c3aff 100644
--- a/config/locales/navigation.de.yml
+++ b/config/locales/navigation.de.yml
@@ -1,3 +1,5 @@
 de:
   navigation:
-    admin_docu: 'Admin-Doku'
\ No newline at end of file
+    admin_docu: 'Admin-Doku'
+    search_placeholder: 'Suchen ...'
+
diff --git a/config/locales/navigation.en.yml b/config/locales/navigation.en.yml
index 015b783..df399f9 100644
--- a/config/locales/navigation.en.yml
+++ b/config/locales/navigation.en.yml
@@ -1,3 +1,5 @@
 en:
   navigation:
     admin_docu: 'Admin-Doc'
+    search_placeholder: 'Search ...'
+
diff --git a/config/locales/views/call_forwards/de.yml b/config/locales/views/call_forwards/de.yml
index 4f6ee86..f4e7090 100644
--- a/config/locales/views/call_forwards/de.yml
+++ b/config/locales/views/call_forwards/de.yml
@@ -54,11 +54,18 @@ de:
         label: 'Zeitüberschreitung in Sekunden'
         hint: 'Nur für "nicht antworten" benötigt.'
       destination:
-        label: 'Ziel Telefonnummer'
+        label: 'Ziel'
         hint: 'Format: +49-30-2270 für eine normale Telefonnummer. 42 für eine interne Durchwahl.'
+        hint: 'Abhängig vom gewählten Zielart oben: z.B. Telefonnummer (+49301234567 oder 42), Mailboxansage (greeting_12345)'
+      destination_phone_number:
+        label: 'Telefonnummer'
+        hint: 'Telefonnummer (z.B. +49301234567 oder 42)'
+      destination_greeting:
+        label: 'Mailboxansage'
+        hint: 'Mailboxansage'
       call_forwarding_destination:
         label: 'Zielauswahl'
-        hint: 'Ziel auswählen oder Rufnummer unten eingeben.'
+        hint: 'Ziel auswählen und zusätzliche Informationen unten eingeben.'
       hunt_group: 
         label: 'Rufgruppen-Verknüpfung'
         hint: 'Die hier ausgewählt Rufgruppe schaltet automatisch diese Weiterleitung an und aus.'
@@ -66,8 +73,8 @@ de:
         label: 'Weiterleitung zum Anrufbeantworter'
         hint: 'Kann nicht zusammen mit einer Ziel Telefonnummer aktiert werden.'
       source:
-        label: 'Quelle'
-        hint: "Für welche Anrufer Telefonnummern soll diese Rufumleitung aktiv sein? Wenn kein Eintrag, dann für alle."
+        label: 'Beschränkung'
+        hint: "Rufnummern (z.B. +49301234567,100,42) oder key-value Paare (z.B. date=[1-5]$, time!=080000-163000)"
       depth:
         label: 'Weiterleitungs-Sprünge'
         hint: "Die maximale Anzahl von Rufumleitungssprüngen. 1 bedeutet, das der Anruf nur bis zum nächsten Ziel weitergeleitet wird."
diff --git a/config/locales/views/call_forwards/en.yml b/config/locales/views/call_forwards/en.yml
index 65ae6b0..eb68979 100644
--- a/config/locales/views/call_forwards/en.yml
+++ b/config/locales/views/call_forwards/en.yml
@@ -54,11 +54,17 @@ en:
         label: 'Timeout in seconds'
         hint: 'Just needed for the "noanswer" case.'
       destination:
-        label: 'Destination phone number'
-        hint: 'Format: +49-30-2270 for a normal phone number or 42 for an internal extension.'
+        label: 'Destination'
+        hint: 'Depends on type specified above: e.g. phone number (+15551234567 or 42), voicemail greeting (greeting_12345)'
+      destination_phone_number:
+        label: 'Phone Number'
+        hint: 'Phone number (e.g. +15551234567 or 42)'
+      destination_greeting:
+        label: 'Greeting'
+        hint: 'Voicemail greeting'
       call_forwarding_destination:
         label: 'Destination Type'
-        hint: 'Select destination or enter phone number below'        
+        hint: 'Select destination and enter additinal information (e.g. phone number) below'        
       hunt_group:
         label: 'Hunt group connection'
         hint: 'This hunt group auto activates this call forward.'
@@ -66,8 +72,8 @@ en:
         label: 'Forward to voicemail'
         hint: 'Can not be activated together with a destination number.'
       source:
-        label: 'Source'
-        hint: "The caller's ID for which this call forward should be valid. Leave empty for calls from any number."
+        label: 'Constraint'
+        hint: "Comma separated list of caller IDs (e.g. +15551234567,100,42) or key-value pairs (e.g. date=[1-5]$, time!=080000-163000)"
       depth:
         label: 'Hops'
         hint: "The maximum number of hops you want to permit. 1 means calls won't be forwarded beyond the next destination."
diff --git a/config/locales/views/call_histories/de.yml b/config/locales/views/call_histories/de.yml
index 807fa3e..6234e4c 100644
--- a/config/locales/views/call_histories/de.yml
+++ b/config/locales/views/call_histories/de.yml
@@ -20,6 +20,10 @@ de:
       date_format: '%d.%m.%Y %H:%M'
       date_today_format: '%H:%M'
       forwarded_by: 'via'
+      date: 'Datum'
+      called_party: 'Teilnehmer'
+      duration: 'Zeit'
+      status: 'Status'
       navigation:
         missed: 'Verpasst: %{calls}'
         dialed: 'Gewählt: %{calls}'
diff --git a/config/locales/views/call_histories/en.yml b/config/locales/views/call_histories/en.yml
index aec50ec..060d587 100644
--- a/config/locales/views/call_histories/en.yml
+++ b/config/locales/views/call_histories/en.yml
@@ -20,6 +20,10 @@ en:
       date_format: '%m/%d/%Y %H:%M'
       date_today_format: '%H:%M'
       forwarded_by: 'via'
+      date: 'Date'
+      called_party: 'Called party'
+      duration: 'Time'
+      status: 'Status'
       navigation:
         missed: 'Missed:%{calls}'
         dialed: 'Placed:%{calls}'
diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml
index c9df1c2..d47c730 100644
--- a/config/locales/views/call_routes/de.yml
+++ b/config/locales/views/call_routes/de.yml
@@ -52,4 +52,8 @@ de:
       position:
         label: 'Position'
         hint: ''
+      xml:
+        separator: 'oder als XML definieren'
+        label: 'XML'
+        hint: 'Route als XML eingeben'
       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 c37773d..6194c9a 100644
--- a/config/locales/views/call_routes/en.yml
+++ b/config/locales/views/call_routes/en.yml
@@ -52,4 +52,8 @@ en:
       position:
         label: 'Position'
         hint: ''
+      xml:
+        separator: 'or define as XML'
+        label: 'XML'
+        hint: 'Enter XML route'
       submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/config_snom/de.yml b/config/locales/views/config_snom/de.yml
new file mode 100644
index 0000000..82742a9
--- /dev/null
+++ b/config/locales/views/config_snom/de.yml
@@ -0,0 +1,37 @@
+en:
+  config_snom:
+    main_menu:
+      phone_book: 'Telefonbuch'
+      call_history: 'Anrufliste'
+      voicemail: 'Voicemail'
+      sip_account: 'SIP Account'
+      log_in: 'Log in'
+      log_out: 'Log out'
+      preferences: 'Einstellungen'
+      maintenance: 'Wartung'
+    call_history:
+      title: 'Anrufe'
+      missed: 'Verpasst'
+      received: 'Empfangen'
+      dialed: 'Gewählt'
+      forwarded: 'Weitergeleitet'
+    voicemail:
+      title: 'Voicemail'
+      unread_count: 'Ungelesen: %{count}'
+      read_count: 'Gelesen: %{count}'
+      settings: 'Einstellungen'
+    preferences:
+      contrast: 'Kontrast'
+      use_backlight: 'Hintergrundbeleuchtung'
+      backlight_active: 'Hintergrundbeleuchtung aktiv'
+      backlight_idle: 'Hintergrundbeleuchtung inaktiv'
+      equalizer: 'Equalizer'
+    maintenance:
+      system_info: 'System Information'
+      reboot: 'Neustart'
+      reset_settings: 'Werkseinstellungen'
+      software_update: 'Software Update'
+    phone_book:
+      title: 'Telefonbuch'
+    voicemail_settings:
+      title: 'Voicemail Einstellungen'
diff --git a/config/locales/views/config_snom/en.yml b/config/locales/views/config_snom/en.yml
new file mode 100644
index 0000000..7a3d3d1
--- /dev/null
+++ b/config/locales/views/config_snom/en.yml
@@ -0,0 +1,37 @@
+en:
+  config_snom:
+    main_menu:
+      phone_book: 'Phone Book'
+      call_history: 'Call History'
+      voicemail: 'Voicemail'
+      sip_account: 'SIP Account'
+      log_in: 'Log in'
+      log_out: 'Log out'
+      preferences: 'Preferences'
+      maintenance: 'Maintenance'
+    call_history:
+      title: 'Call History'
+      missed: 'Missed'
+      received: 'Received'
+      dialed: 'Placed'
+      forwarded: 'Forwarded'
+    voicemail:
+      title: 'Voicemail'
+      unread_count: 'Unread messages: %{count}'
+      read_count: 'Read messages: %{count}'
+      settings: 'Settings'
+    preferences:
+      contrast: 'Contrast'
+      use_backlight: 'Backlight'
+      backlight_active: 'Backlight active'
+      backlight_idle: 'Backlight idle'
+      equalizer: 'Equalizer'
+    maintenance:
+      system_info: 'System info'
+      reboot: 'Reboot'
+      reset_settings: 'Reset settings'
+      software_update: 'Software update'
+    phone_book:
+      title: 'Phone Book'
+    voicemail_settings:
+      title: 'Voicemail Settings'
diff --git a/config/locales/views/gateway_parameters/de.yml b/config/locales/views/gateway_parameters/de.yml
index 944c1fb..5642518 100644
--- a/config/locales/views/gateway_parameters/de.yml
+++ b/config/locales/views/gateway_parameters/de.yml
@@ -6,7 +6,7 @@ de:
       successfuly_updated: 'Gatewayparameter wurde aktualisiert.'
       successfuly_destroyed: 'Gatewayparameter wurde gelöscht.'
     index:
-      page_title: 'Übersicht von Gatewayparameter'
+      page_title: 'Parameter'
       gateway_id: 'Gateway'
       name: 'Name'
       value: 'Value'
@@ -21,7 +21,7 @@ de:
         create_for: 'Gatewayparameter neu anlegen für %{resource}'
     show:
       page_title: 'Gatewayparameter bearbeiten'
-      gateway_id: 'Gateway'
+      gateway: 'Gateway'
       name: 'Name'
       value: 'Value'
       class_type: 'Class type'
diff --git a/config/locales/views/gateway_parameters/en.yml b/config/locales/views/gateway_parameters/en.yml
index d784c12..0ec6a08 100644
--- a/config/locales/views/gateway_parameters/en.yml
+++ b/config/locales/views/gateway_parameters/en.yml
@@ -1,27 +1,27 @@
 en:
   gateway_parameters:
-    name: 'Gatewayparameter'
+    name: 'Parameter'
     controller:
-      successfuly_created: 'Successfully created Gatewayparameter.'
-      successfuly_updated: 'Successfully updated Gatewayparameter.'
-      successfuly_destroyed: 'Successfully destroyed Gatewayparameter.'
+      successfuly_created: 'Successfully created Parameter.'
+      successfuly_updated: 'Successfully updated Parameter.'
+      successfuly_destroyed: 'Successfully destroyed Parameter.'
     index:
-      page_title: 'Listing Gatewayparameter'
+      page_title: 'Parameters'
       gateway_id: 'Gateway'
       name: 'Name'
       value: 'Value'
       class_type: 'Class type'
       description: 'Description'
       actions:
-        confirm_destroy: 'Are you sure you want to delete this Gatewayparameter?'
+        confirm_destroy: 'Are you sure you want to delete this Parameter?'
         destroy: 'Delete'
         edit: 'Edit'
         show: 'View'
         create: 'New'
-        create_for: 'New Gatewayparameter for %{resource}'
+        create_for: 'New Parameter for %{resource}'
     show:
-      page_title: 'Show Gatewayparameter'
-      gateway_id: 'Gateway'
+      page_title: 'Show Parameter'
+      gateway: 'Gateway'
       name: 'Name'
       value: 'Value'
       class_type: 'Class type'
@@ -32,11 +32,11 @@ en:
         edit: 'Edit'
         view_all: 'View All'
     new:
-      page_title: 'New Gatewayparameter'
+      page_title: 'New Parameter'
       actions:
         back_to_list: 'Back to Index'
     edit:
-      page_title: 'Editing Gatewayparameter'
+      page_title: 'Editing Parameter'
       actions:
         back_to_list: 'Back to Index'
         edit: 'Edit'
diff --git a/config/locales/views/gateway_settings/de.yml b/config/locales/views/gateway_settings/de.yml
index b159bf2..210bf07 100644
--- a/config/locales/views/gateway_settings/de.yml
+++ b/config/locales/views/gateway_settings/de.yml
@@ -1,27 +1,27 @@
 de:
   gateway_settings:
-    name: 'Gateway Einstellungen'
+    name: 'Einstellungen'
     controller:
-      successfuly_created: 'Gateway Einstellung wurde angelegt.'
-      successfuly_updated: 'Gateway Einstellung wurde aktualisiert.'
-      successfuly_destroyed: 'Gateway Einstellung wurde gelöscht.'
+      successfuly_created: 'Einstellung wurde angelegt.'
+      successfuly_updated: 'Einstellung wurde aktualisiert.'
+      successfuly_destroyed: 'Einstellung wurde gelöscht.'
     index:
-      page_title: 'Gateway Einstellungen'
+      page_title: 'Einstellungen'
       gateway_id: 'Gateway'
       name: 'Name'
       value: 'Value'
       class_type: 'Class type'
       description: 'Beschreibung'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gateway Einstellungen'
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Einstellungen'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
         create: 'Neu anlegen'
-        create_for: 'Gateway Einstellungen neu anlegen für %{resource}'
+        create_for: 'Einstellungen neu anlegen für %{resource}'
     show:
-      page_title: 'Gateway Einstellungen bearbeiten'
-      gateway_id: 'Gateway'
+      page_title: 'Einstellungen bearbeiten'
+      gateway: 'Gateway'
       name: 'Name'
       value: 'Value'
       class_type: 'Class type'
@@ -32,11 +32,11 @@ de:
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
     new:
-      page_title: 'Gateway Einstellungen neu anlegen'
+      page_title: 'Einstellungen neu anlegen'
       actions:
         back_to_list: 'Zurück zur Übersicht'
     edit:
-      page_title: 'Gateway Einstellungen bearbeiten'
+      page_title: 'Einstellungen bearbeiten'
       actions:
         back_to_list: 'Zurück zur Übersicht'
         edit: 'Bearbeiten'
@@ -57,4 +57,79 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      submit: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
+    settings:
+      sip:
+        domain:
+          label: 'Domain'
+          hint: 'IP Addresse oder domain name of gateway'
+        username:
+          label: 'Username'
+          hint: 'Username to register/authenticate with gateway'
+        password:
+          label: 'Password'
+          hint: 'Password to register/authenticate with gateway'
+        register:
+          label: 'Register'
+          hint: 'Register with gateway (true/false)'
+        auth_source:
+          label: 'Authentication source'
+          hint: 'Variable used for inbound authentication'
+        auth_pattern:
+          label: 'Authentication pattern'
+          hint: 'Pattern used for inbound authentication'
+        inbound_username:
+          label: 'Inbound username'
+          hint: 'Username used for inbound registration/authentication'
+        inbound_password:
+          label: 'Inbound password'
+          hint: 'Password used for inbound registration/authentication'
+        number_source:
+          label: 'Number source'
+          hint: 'Variable in which the DID number is stored on inbound calls'
+        contact:
+          label: 'Contact'
+          hint: 'Contact string'
+        dial_string:
+          label: 'Dial string'
+          hint: 'Gateway dial string'
+        profile:
+          label: 'Profile'
+          hint: 'Name of SIP profile'
+        from:
+          label: 'From header'
+          hint: '"From" header to be sent to gateway'
+        from_clir:
+          label: 'From on CLIR'
+          hint: '"From" header with supressed caller ID'
+        asserted_identity:
+          label: 'Asserted identity'
+          hint: '"P-Asserted-Identity" header to be sent to gateway'
+        asserted_identity_clir:
+          label: 'Asserted identity CLIR'
+          hint: '"P-Asserted-Identity" header with supressed caller ID'
+      xmpp:
+        server:
+          label: 'Server'
+          hint: 'Server IP address or domain'
+        login:
+          label: 'Login'
+          hint: 'Username to register/authenticate with gateway'
+        password:
+          label: 'Password'
+          hint: 'Password to register/authenticate with gateway'
+        inbound_number:
+          label: 'Inbound number'
+          hint: 'DID number to be used on inbound calls'
+        auth_source:
+          label: 'Authentication source'
+          hint: 'Variable used for inbound authentication'
+        auth_pattern:
+          label: 'Authentication pattern'
+          hint: 'Pattern used for inbound authentication'
+        number_source:
+          label: 'Number source'
+          hint: 'Variable in which the DID number is stored on inbound calls'
+        destination_domain:
+          label: 'Destination domain'
+          hint: ''
diff --git a/config/locales/views/gateway_settings/en.yml b/config/locales/views/gateway_settings/en.yml
index e506133..1699a9d 100644
--- a/config/locales/views/gateway_settings/en.yml
+++ b/config/locales/views/gateway_settings/en.yml
@@ -1,12 +1,12 @@
 en:
   gateway_settings:
-    name: 'Gatewaysetting'
+    name: 'Setting'
     controller:
       successfuly_created: 'Successfully created entry.'
       successfuly_updated: 'Successfully updated entry.'
       successfuly_destroyed: 'Successfully destroyed entry.'
     index:
-      page_title: 'Gateway settings'
+      page_title: 'Settings'
       gateway_id: 'Gateway'
       name: 'Name'
       value: 'Value'
@@ -20,8 +20,8 @@ en:
         create: 'New'
         create_for: 'New settings entry for %{resource}'
     show:
-      page_title: 'Show Gatewaysetting'
-      gateway_id: 'Gateway'
+      page_title: 'Show Setting'
+      gateway: 'Gateway'
       name: 'Name'
       value: 'Value'
       class_type: 'Class type'
@@ -57,4 +57,79 @@ en:
       description:
         label: 'Description'
         hint: ''
-      submit: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
+    settings:
+      sip:
+        domain:
+          label: 'Domain'
+          hint: 'IP address or domain name of gateway'
+        username:
+          label: 'Username'
+          hint: 'Username to register/authenticate with gateway'
+        password:
+          label: 'Password'
+          hint: 'Password to register/authenticate with gateway'
+        register:
+          label: 'Register'
+          hint: 'Register with gateway (true/false)'
+        auth_source:
+          label: 'Authentication source'
+          hint: 'Variable used for inbound authentication'
+        auth_pattern:
+          label: 'Authentication pattern'
+          hint: 'Pattern used for inbound authentication'
+        inbound_username:
+          label: 'Inbound username'
+          hint: 'Username used for inbound registration/authentication'
+        inbound_password:
+          label: 'Inbound password'
+          hint: 'Password used for inbound registration/authentication'
+        number_source:
+          label: 'Number source'
+          hint: 'Variable in which the DID number is stored on inbound calls'
+        contact:
+          label: 'Contact'
+          hint: 'Contact string'
+        dial_string:
+          label: 'Dial string'
+          hint: 'Gateway dial string'
+        profile:
+          label: 'Profile'
+          hint: 'Name of SIP profile'
+        from:
+          label: 'From header'
+          hint: '"From" header to be sent to gateway'
+        from_clir:
+          label: 'From on CLIR'
+          hint: '"From" header with supressed caller ID'
+        asserted_identity:
+          label: 'Asserted identity'
+          hint: '"P-Asserted-Identity" header to be sent to gateway'
+        asserted_identity_clir:
+          label: 'Asserted identity CLIR'
+          hint: '"P-Asserted-Identity" header with supressed caller ID'
+      xmpp:
+        server:
+          label: 'Server'
+          hint: 'Server IP address or domain'
+        login:
+          label: 'Login'
+          hint: 'Username to register/authenticate with gateway'
+        password:
+          label: 'Password'
+          hint: 'Password to register/authenticate with gateway'
+        inbound_number:
+          label: 'Inbound number'
+          hint: 'DID number to be used on inbound calls'
+        auth_source:
+          label: 'Authentication source'
+          hint: 'Variable used for inbound authentication'
+        auth_pattern:
+          label: 'Authentication pattern'
+          hint: 'Pattern used for inbound authentication'
+        number_source:
+          label: 'Number source'
+          hint: 'Variable in which the DID number is stored on inbound calls'
+        destination_domain:
+          label: 'Destination domain'
+          hint: ''
diff --git a/config/locales/views/gateways/de.yml b/config/locales/views/gateways/de.yml
index 5365685..726f28e 100644
--- a/config/locales/views/gateways/de.yml
+++ b/config/locales/views/gateways/de.yml
@@ -6,7 +6,7 @@ de:
       successfuly_updated: 'Gateway wurde aktualisiert.'
       successfuly_destroyed: 'Gateway wurde gelöscht.'
     index:
-      page_title: 'Liste aller Gateways'
+      page_title: 'Gateways'
       name: 'Name'
       technology: 'Technologie'
       inbound: 'Inbound'
diff --git a/config/locales/views/gateways/en.yml b/config/locales/views/gateways/en.yml
index db2357f..6573878 100644
--- a/config/locales/views/gateways/en.yml
+++ b/config/locales/views/gateways/en.yml
@@ -6,7 +6,7 @@ en:
       successfuly_updated: 'Successfully updated Gateway.'
       successfuly_destroyed: 'Successfully destroyed Gateway.'
     index:
-      page_title: 'Listing Gateway'
+      page_title: 'Gateways'
       name: 'Name'
       technology: 'Technology'
       inbound: 'Inbound'
diff --git a/config/locales/views/gemeinschaft_setups/de.yml b/config/locales/views/gemeinschaft_setups/de.yml
index c035c96..ed17418 100644
--- a/config/locales/views/gemeinschaft_setups/de.yml
+++ b/config/locales/views/gemeinschaft_setups/de.yml
@@ -36,5 +36,11 @@ de:
         hint: 'z.B. Firmenname'
       default_system_email:
         label: 'System E-Mail Adresse'
-        hint: 'Für den E-Mail Versand von Faxen und Voicemails.'   
+        hint: 'Für den E-Mail Versand von Faxen und Voicemails.'
+      detect_attacks:
+        label: 'Angriffserkennung'
+        hint: 'Perimeter Angriffserkennung starten'
+      report_attacks:
+        label: 'Angriffe melden'
+        hint: 'Angriffe an Cloud Dienst melden' 
       submit: 'Anlage einrichten'
\ No newline at end of file
diff --git a/config/locales/views/gemeinschaft_setups/en.yml b/config/locales/views/gemeinschaft_setups/en.yml
index 15edca5..0e1bdbe 100644
--- a/config/locales/views/gemeinschaft_setups/en.yml
+++ b/config/locales/views/gemeinschaft_setups/en.yml
@@ -36,5 +36,11 @@ en:
         hint: 'e.g. name of the company'
       default_system_email:
         label: 'System e-mail address'
-        hint: 'From field for voicemail or fax e-mails.'        
+        hint: 'From field for voicemail or fax e-mails.'
+      detect_attacks:
+        label: 'Detect attacks'
+        hint: 'Run Perimeter intrusion detection at startup'
+      report_attacks:
+        label: 'Report attacks'
+        hint: 'Report attacks to the cloud.'
       submit: 'Create this PBX'
\ No newline at end of file
diff --git a/config/locales/views/generic_files/de.yml b/config/locales/views/generic_files/de.yml
new file mode 100644
index 0000000..2f3743a
--- /dev/null
+++ b/config/locales/views/generic_files/de.yml
@@ -0,0 +1,66 @@
+de:
+  generic_files:
+    name: 'Datei'
+    controller:
+      successfuly_created: 'Datei wurde angelegt.'
+      successfuly_updated: 'Datei wurde aktualisiert.'
+      successfuly_destroyed: 'Datei wurde gelöscht.'
+    index:
+      page_title: 'Datei'
+      name: 'Name'
+      file: 'Datei'
+      file_type: 'Type'
+      category: 'Kategorie'
+      owner_id: 'Besitzer'
+      owner_type: 'Besitzer typ'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie diese Datei löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        download: 'Herunterladen'
+        create: 'Neu anlegen'
+        create_for: 'Datei neu anlegen für %{resource}'
+    show:
+      page_title: 'Datei bearbeiten'
+      name: 'Name'
+      file: 'Datei'
+      file_type: 'Typ'
+      category: 'Kategorie'
+      owner_id: 'Besitzer'
+      owner_type: 'Besitzer typ'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die diese Datei löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Datei neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Datei bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      file:
+        label: 'Datei'
+        hint: ''
+      file_type:
+        label: 'Typ'
+        hint: ''
+      category:
+        label: 'Kategorie'
+        hint: ''
+      owner_id:
+        label: 'Besitzer'
+        hint: ''
+      owner_type:
+        label: 'Besitzer typ'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/generic_files/en.yml b/config/locales/views/generic_files/en.yml
new file mode 100644
index 0000000..3456fea
--- /dev/null
+++ b/config/locales/views/generic_files/en.yml
@@ -0,0 +1,66 @@
+en:
+  generic_files:
+    name: 'File'
+    controller:
+      successfuly_created: 'Successfully created File.'
+      successfuly_updated: 'Successfully updated File.'
+      successfuly_destroyed: 'Successfully destroyed File.'
+    index:
+      page_title: 'Files'
+      name: 'Name'
+      file: 'File'
+      file_type: 'Type'
+      category: 'Category'
+      owner_id: 'Owner'
+      owner_type: 'Owner type'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this File?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        download: 'Download'
+        create: 'New'
+        create_for: 'New File for %{resource}'
+    show:
+      page_title: 'Show File'
+      name: 'Name'
+      file: 'File'
+      file_type: 'Type'
+      category: 'Category'
+      owner_id: 'Owner'
+      owner_type: 'Owner type'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this File?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New File'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing File'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      file:
+        label: 'File'
+        hint: ''
+      file_type:
+        label: 'Type'
+        hint: ''
+      category:
+        label: 'Category'
+        hint: ''
+      owner_id:
+        label: 'Owner'
+        hint: ''
+      owner_type:
+        label: 'Owner type'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/group_permissions/de.yml b/config/locales/views/group_permissions/de.yml
index c075830..90419fc 100644
--- a/config/locales/views/group_permissions/de.yml
+++ b/config/locales/views/group_permissions/de.yml
@@ -1,50 +1,50 @@
 de:
   group_permissions:
-    name: 'Grouppermission'
+    name: 'Berechtigung'
     controller:
-      successfuly_created: 'Grouppermission wurde angelegt.'
-      successfuly_updated: 'Grouppermission wurde aktualisiert.'
-      successfuly_destroyed: 'Grouppermission wurde gelöscht.'
+      successfuly_created: 'Berechtigung wurde angelegt.'
+      successfuly_updated: 'Berechtigung wurde aktualisiert.'
+      successfuly_destroyed: 'Berechtigung wurde gelöscht.'
     index:
-      page_title: 'Übersicht von Grouppermission'
-      group_id: 'Group'
-      permission: 'Permission'
-      target_group_id: 'Target group'
+      page_title: 'Berechtigungen'
+      group_id: 'Gruppe'
+      permission: 'Berechtigung'
+      target_group_id: 'Zielgruppe'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Grouppermission'
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Berechtigung'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
         create: 'Neu anlegen'
-        create_for: 'Grouppermission neu anlegen für %{resource}'
+        create_for: 'Berechtigung neu anlegen für %{resource}'
     show:
-      page_title: 'Grouppermission bearbeiten'
-      group_id: 'Group'
-      permission: 'Permission'
-      target_group_id: 'Target group'
+      page_title: 'Berechtigung bearbeiten'
+      group_id: 'Gruppe'
+      permission: 'Berechtigung'
+      target_group: 'Zielgruppe'
       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: 'Grouppermission neu anlegen'
+      page_title: 'Berechtigung neu anlegen'
       actions:
         back_to_list: 'Zurück zur Übersicht'
     edit:
-      page_title: 'Grouppermission bearbeiten'
+      page_title: 'Berechtigung bearbeiten'
       actions:
         back_to_list: 'Zurück zur Übersicht'
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
     form:
       group_id:
-        label: 'Group'
+        label: 'Gruppe'
         hint: ''
       permission:
-        label: 'Permission'
+        label: 'Berechtigung'
         hint: ''
       target_group_id:
-        label: 'Target group'
+        label: 'Zielgruppe'
         hint: ''
       submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/group_permissions/en.yml b/config/locales/views/group_permissions/en.yml
index 2a5f48e..cb96ecc 100644
--- a/config/locales/views/group_permissions/en.yml
+++ b/config/locales/views/group_permissions/en.yml
@@ -1,38 +1,38 @@
 en:
   group_permissions:
-    name: 'Grouppermission'
+    name: 'Permission'
     controller:
-      successfuly_created: 'Successfully created Grouppermission.'
-      successfuly_updated: 'Successfully updated Grouppermission.'
-      successfuly_destroyed: 'Successfully destroyed Grouppermission.'
+      successfuly_created: 'Successfully created Permission.'
+      successfuly_updated: 'Successfully updated Permission.'
+      successfuly_destroyed: 'Successfully destroyed Permission.'
     index:
-      page_title: 'Listing Grouppermission'
+      page_title: 'Permissions'
       group_id: 'Group'
       permission: 'Permission'
       target_group_id: 'Target group'
       actions:
-        confirm_destroy: 'Are you sure you want to delete this Grouppermission?'
+        confirm_destroy: 'Are you sure you want to delete this Permission?'
         destroy: 'Delete'
         edit: 'Edit'
         show: 'View'
         create: 'New'
-        create_for: 'New Grouppermission for %{resource}'
+        create_for: 'New Permission for %{resource}'
     show:
-      page_title: 'Show Grouppermission'
+      page_title: 'Show Permission'
       group_id: 'Group'
       permission: 'Permission'
-      target_group_id: 'Target group'
+      target_group: 'Target group'
       actions:
         confirm_destroy: 'Are you sure you want to delete this element?'
         destroy: 'Delete'
         edit: 'Edit'
         view_all: 'View All'
     new:
-      page_title: 'New Grouppermission'
+      page_title: 'New Permission'
       actions:
         back_to_list: 'Back to Index'
     edit:
-      page_title: 'Editing Grouppermission'
+      page_title: 'Editing Permission'
       actions:
         back_to_list: 'Back to Index'
         edit: 'Edit'
diff --git a/config/locales/views/groups/de.yml b/config/locales/views/groups/de.yml
index fc60a72..9169c5b 100644
--- a/config/locales/views/groups/de.yml
+++ b/config/locales/views/groups/de.yml
@@ -1,24 +1,24 @@
 de:
   groups:
-    name: 'Group'
+    name: 'Gruppe'
     controller:
-      successfuly_created: 'Group wurde angelegt.'
-      successfuly_updated: 'Group wurde aktualisiert.'
-      successfuly_destroyed: 'Group wurde gelöscht.'
+      successfuly_created: 'Gruppe wurde angelegt.'
+      successfuly_updated: 'Gruppe wurde aktualisiert.'
+      successfuly_destroyed: 'Gruppe wurde gelöscht.'
     index:
-      page_title: 'Übersicht von Group'
+      page_title: 'Gruppen'
       name: 'Name'
       active: 'Active'
       comment: 'Comment'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Group'
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gruppe'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
         create: 'Neu anlegen'
-        create_for: 'Group neu anlegen für %{resource}'
+        create_for: 'Gruppe neu anlegen für %{resource}'
     show:
-      page_title: 'Group bearbeiten'
+      page_title: 'Gruppe bearbeiten'
       name: 'Name'
       active: 'Active'
       comment: 'Comment'
@@ -28,11 +28,11 @@ de:
         edit: 'Bearbeiten'
         view_all: 'Alle anzeigen'
     new:
-      page_title: 'Group neu anlegen'
+      page_title: 'Gruppe neu anlegen'
       actions:
         back_to_list: 'Zurück zur Übersicht'
     edit:
-      page_title: 'Group bearbeiten'
+      page_title: 'Gruppe bearbeiten'
       actions:
         back_to_list: 'Zurück zur Übersicht'
         edit: 'Bearbeiten'
diff --git a/config/locales/views/groups/en.yml b/config/locales/views/groups/en.yml
index a7fb666..0088771 100644
--- a/config/locales/views/groups/en.yml
+++ b/config/locales/views/groups/en.yml
@@ -6,7 +6,7 @@ en:
       successfuly_updated: 'Successfully updated Group.'
       successfuly_destroyed: 'Successfully destroyed Group.'
     index:
-      page_title: 'Listing Group'
+      page_title: 'Groups'
       name: 'Name'
       active: 'Active'
       comment: 'Comment'
diff --git a/config/locales/views/intruders/de.yml b/config/locales/views/intruders/de.yml
index 5b67afe..a9581ce 100644
--- a/config/locales/views/intruders/de.yml
+++ b/config/locales/views/intruders/de.yml
@@ -22,6 +22,7 @@ de:
       user_agent: 'User agent'
       to_user: 'To'
       comment: 'Comment'
+      country: 'Land'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Intruder'
         destroy: 'Löschen'
@@ -46,6 +47,7 @@ de:
       user_agent: 'User agent'
       to_user: 'To user'
       comment: 'Comment'
+      country: 'Land'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
         destroy: 'Löschen'
diff --git a/config/locales/views/intruders/en.yml b/config/locales/views/intruders/en.yml
index b9d65f4..903e321 100644
--- a/config/locales/views/intruders/en.yml
+++ b/config/locales/views/intruders/en.yml
@@ -22,6 +22,7 @@ en:
       user_agent: 'User agent'
       to_user: 'To'
       comment: 'Comment'
+      country: 'Country'
       actions:
         confirm_destroy: 'Are you sure you want to delete this Intruder?'
         destroy: 'Delete'
@@ -46,6 +47,7 @@ en:
       user_agent: 'User agent'
       to_user: 'To user'
       comment: 'Comment'
+      country: 'Country'
       actions:
         confirm_destroy: 'Are you sure you want to delete this element?'
         destroy: 'Delete'
diff --git a/config/locales/views/pager_group_destinations/de.yml b/config/locales/views/pager_group_destinations/de.yml
new file mode 100644
index 0000000..7f0d56a
--- /dev/null
+++ b/config/locales/views/pager_group_destinations/de.yml
@@ -0,0 +1,45 @@
+de:
+  pager_group_destinations:
+    name: 'Pagergroupdestination'
+    controller:
+      successfuly_created: 'Pagergroupdestination wurde angelegt.'
+      successfuly_updated: 'Pagergroupdestination wurde aktualisiert.'
+      successfuly_destroyed: 'Pagergroupdestination wurde gelöscht.'
+    index:
+      page_title: 'Übersicht von Pagergroupdestination'
+      pager_group_id: 'Pager group'
+      sip_account_id: 'Sip account'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Pagergroupdestination'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Pagergroupdestination neu anlegen für %{resource}'
+    show:
+      page_title: 'Pagergroupdestination bearbeiten'
+      pager_group_id: 'Pager group'
+      sip_account_id: 'Sip account'
+      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: 'Pagergroupdestination neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Pagergroupdestination bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      pager_group_id:
+        label: 'Pager group'
+        hint: ''
+      sip_account_id:
+        label: 'Sip account'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/pager_group_destinations/en.yml b/config/locales/views/pager_group_destinations/en.yml
new file mode 100644
index 0000000..9bf459d
--- /dev/null
+++ b/config/locales/views/pager_group_destinations/en.yml
@@ -0,0 +1,45 @@
+en:
+  pager_group_destinations:
+    name: 'Pagergroupdestination'
+    controller:
+      successfuly_created: 'Successfully created Pagergroupdestination.'
+      successfuly_updated: 'Successfully updated Pagergroupdestination.'
+      successfuly_destroyed: 'Successfully destroyed Pagergroupdestination.'
+    index:
+      page_title: 'Listing Pagergroupdestination'
+      pager_group_id: 'Pager group'
+      sip_account_id: 'Sip account'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Pagergroupdestination?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Pagergroupdestination for %{resource}'
+    show:
+      page_title: 'Show Pagergroupdestination'
+      pager_group_id: 'Pager group'
+      sip_account_id: 'Sip account'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Pagergroupdestination'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Pagergroupdestination'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      pager_group_id:
+        label: 'Pager group'
+        hint: ''
+      sip_account_id:
+        label: 'Sip account'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/pager_groups/de.yml b/config/locales/views/pager_groups/de.yml
new file mode 100644
index 0000000..9865958
--- /dev/null
+++ b/config/locales/views/pager_groups/de.yml
@@ -0,0 +1,45 @@
+de:
+  pager_groups:
+    name: 'Pagergroup'
+    controller:
+      successfuly_created: 'Pagergroup wurde angelegt.'
+      successfuly_updated: 'Pagergroup wurde aktualisiert.'
+      successfuly_destroyed: 'Pagergroup wurde gelöscht.'
+    index:
+      page_title: 'Übersicht von Pagergroup'
+      sip_account_id: 'Sip account'
+      callback_url: 'Callback url'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Pagergroup'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Pagergroup neu anlegen für %{resource}'
+    show:
+      page_title: 'Pagergroup bearbeiten'
+      sip_account_id: 'Sip account'
+      callback_url: 'Callback url'
+      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: 'Pagergroup neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Pagergroup bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      sip_account_id:
+        label: 'Sip account'
+        hint: ''
+      callback_url:
+        label: 'Callback url'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/pager_groups/en.yml b/config/locales/views/pager_groups/en.yml
new file mode 100644
index 0000000..f7ce727
--- /dev/null
+++ b/config/locales/views/pager_groups/en.yml
@@ -0,0 +1,45 @@
+en:
+  pager_groups:
+    name: 'Pagergroup'
+    controller:
+      successfuly_created: 'Successfully created Pagergroup.'
+      successfuly_updated: 'Successfully updated Pagergroup.'
+      successfuly_destroyed: 'Successfully destroyed Pagergroup.'
+    index:
+      page_title: 'Listing Pagergroup'
+      sip_account_id: 'Sip account'
+      callback_url: 'Callback url'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Pagergroup?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Pagergroup for %{resource}'
+    show:
+      page_title: 'Show Pagergroup'
+      sip_account_id: 'Sip account'
+      callback_url: 'Callback url'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Pagergroup'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Pagergroup'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      sip_account_id:
+        label: 'Sip account'
+        hint: ''
+      callback_url:
+        label: 'Callback url'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml
index 02875c4..a9e6ed0 100644
--- a/config/locales/views/phones/de.yml
+++ b/config/locales/views/phones/de.yml
@@ -16,6 +16,7 @@ de:
       http_password: 'Phone WebGUI Passwort'
       nightly_reboot: 'Nachts automatischer Reboot'
       provisioning_key_active: 'Provisioning Schlüssel aktiv'
+      phoneable: 'Besitzer'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie diese Telefon aus Gemeinschaft entfernen möchten?'
         destroy: 'Löschen'
diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml
index 87a6160..3f1ecc7 100644
--- a/config/locales/views/phones/en.yml
+++ b/config/locales/views/phones/en.yml
@@ -15,6 +15,7 @@ en:
       http_user: 'Phone WebGUI username'
       http_password: 'Phone WebGUI password'
       nightly_reboot: 'Nightly reboot'
+      phoneable: 'Owner'
       actions:
         confirm_destroy: 'Are you sure you want to delete this phone?'
         destroy: 'Delete'
diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml
index 6accbdb..b80e2a5 100644
--- a/config/locales/views/sip_accounts/de.yml
+++ b/config/locales/views/sip_accounts/de.yml
@@ -19,6 +19,7 @@ de:
       clip_no_screening: 'Spezifische Rufnummernanzeige (CLIP -no screening-)'
       callforward_rules_act_per_sip_account: 'Rufweiterleitungen gelten für das gesamte SIP-Account'
       online: 'Online'
+      sip_accountable: 'Besitzer'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Account löschen möchten?'
         destroy: 'Löschen'
@@ -87,4 +88,7 @@ de:
       language_code: 
         label: 'Sprache'
         hint: ''
+      voicemail_account_id: 
+        label: 'Default voicemail account'
+        hint: ''
       submit: 'Absenden'
diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml
index f160c7d..2c66962 100644
--- a/config/locales/views/sip_accounts/en.yml
+++ b/config/locales/views/sip_accounts/en.yml
@@ -19,6 +19,7 @@ en:
       clip_no_screening: 'CLIP -no screening-'
       callforward_rules_act_per_sip_account: 'Callforwards work for the whole sip account'
       online: 'Online'
+      sip_accountable: 'Owner'
       actions:
         confirm_destroy: 'Are you sure you want to delete this SIP account?'
         destroy: 'Delete'
@@ -87,4 +88,7 @@ en:
       language_code: 
         label: 'Language'
         hint: ''
+      voicemail_account_id: 
+        label: 'Default voicemail account'
+        hint: ''
       submit: 'Submit'
diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml
index 97a47b8..1f66b9f 100644
--- a/config/locales/views/switchboards/de.yml
+++ b/config/locales/views/switchboards/de.yml
@@ -9,6 +9,10 @@ de:
       page_title: 'Switchboards'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'
+      amount_of_displayed_phone_numbers: 'Anzahl der angezeigten Telefonnummern'     
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Switchboard'
         destroy: 'Löschen'
@@ -20,6 +24,10 @@ de:
       page_title: 'Switchboard bearbeiten'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'
+      amount_of_displayed_phone_numbers: 'Anzahl der angezeigten Telefonnummern'     
       actions:
         confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
         destroy: 'Löschen'
@@ -42,4 +50,16 @@ de:
       user_id:
         label: 'User'
         hint: ''
+      reload_interval:
+        label: 'Reload Interval'
+        hint: 'Millisekunden. nil = kein reload'
+      show_avatars:
+        label: 'Avatare anzeigen'
+        hint: ''
+      entry_width:
+        label: 'Weite eines Eintrages'
+        hint: '1 - 4'
+      amount_of_displayed_phone_numbers:
+        label: 'Anzahl Telefonnummern'
+        hint: 'Wie viel Telefonnummern werden in einem Eintrag angezeigt.'        
       submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/switchboards/en.yml b/config/locales/views/switchboards/en.yml
index a860763..fd160b5 100644
--- a/config/locales/views/switchboards/en.yml
+++ b/config/locales/views/switchboards/en.yml
@@ -9,6 +9,10 @@ en:
       page_title: 'Switchboards'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'
+      amount_of_displayed_phone_numbers: 'Amount of displayed phone numbers'     
       actions:
         confirm_destroy: 'Are you sure you want to delete this Switchboard?'
         destroy: 'Delete'
@@ -20,6 +24,10 @@ en:
       page_title: 'Show Switchboard'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'
+      amount_of_displayed_phone_numbers: 'Amount of displayed phone numbers'     
       actions:
         confirm_destroy: 'Are you sure you want to delete this element?'
         destroy: 'Delete'
@@ -42,4 +50,16 @@ en:
       user_id:
         label: 'User'
         hint: ''
+      reload_interval:
+        label: 'Reload Interval'
+        hint: 'Milliseconds. nil = no reload'
+      show_avatars:
+        label: 'Show avatars'
+        hint: ''
+      entry_width:
+        label: 'Entry width'
+        hint: ''
+      amount_of_displayed_phone_numbers:
+        label: 'Amount of phone numbers'
+        hint: 'How many phone numbers should be displayed for a single entry.'
       submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/voicemail_accounts/de.yml b/config/locales/views/voicemail_accounts/de.yml
new file mode 100644
index 0000000..99145f6
--- /dev/null
+++ b/config/locales/views/voicemail_accounts/de.yml
@@ -0,0 +1,65 @@
+de:
+  voicemail_accounts:
+    name: 'Voicemail Konto'
+    controller:
+      successfuly_created: 'Voicemail Konto wurde angelegt.'
+      successfuly_updated: 'Voicemail Konto wurde aktualisiert.'
+      successfuly_destroyed: 'Voicemail Konto wurde gelöscht.'
+    index:
+      page_title: 'Voicemail Konten'
+      uuid: 'Uuid'
+      name: 'Name'
+      active: 'Active'
+      gs_node_id: 'Gs node'
+      voicemail_accountable_type: 'Voicemail accountable type'
+      voicemail_accountable_id: 'Voicemail accountable'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Voicemail Konto'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Voicemail Konto neu anlegen für %{resource}'
+    show:
+      page_title: 'Voicemail Konto bearbeiten'
+      uuid: 'Uuid'
+      name: 'Name'
+      active: 'Active'
+      gs_node_id: 'Gs node'
+      voicemail_accountable_type: 'Voicemail accountable type'
+      voicemail_accountable_id: 'Voicemail accountable'
+      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: 'Voicemail Konto neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Voicemail Konto bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      uuid:
+        label: 'Uuid'
+        hint: ''
+      name:
+        label: 'Name'
+        hint: ''
+      active:
+        label: 'Active'
+        hint: ''
+      gs_node_id:
+        label: 'Gs node'
+        hint: ''
+      voicemail_accountable_type:
+        label: 'Voicemail accountable type'
+        hint: ''
+      voicemail_accountable_id:
+        label: 'Voicemail accountable'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/voicemail_accounts/en.yml b/config/locales/views/voicemail_accounts/en.yml
new file mode 100644
index 0000000..bf097a5
--- /dev/null
+++ b/config/locales/views/voicemail_accounts/en.yml
@@ -0,0 +1,65 @@
+en:
+  voicemail_accounts:
+    name: 'Voicemail Account'
+    controller:
+      successfuly_created: 'Successfully created Voicemail Account.'
+      successfuly_updated: 'Successfully updated Voicemail Account.'
+      successfuly_destroyed: 'Successfully destroyed Voicemail Account.'
+    index:
+      page_title: 'Voicemail Accounts'
+      uuid: 'Uuid'
+      name: 'Name'
+      active: 'Active'
+      gs_node_id: 'Gs node'
+      voicemail_accountable_type: 'Voicemail accountable type'
+      voicemail_accountable_id: 'Voicemail accountable'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Voicemail Account?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Voicemail Account for %{resource}'
+    show:
+      page_title: 'Show Voicemail Account'
+      uuid: 'Uuid'
+      name: 'Name'
+      active: 'Active'
+      gs_node_id: 'Gs node'
+      voicemail_accountable_type: 'Voicemail accountable type'
+      voicemail_accountable_id: 'Voicemail accountable'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Voicemail Account'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Voicemail Account'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      uuid:
+        label: 'Uuid'
+        hint: ''
+      name:
+        label: 'Name'
+        hint: ''
+      active:
+        label: 'Active'
+        hint: ''
+      gs_node_id:
+        label: 'Gs node'
+        hint: ''
+      voicemail_accountable_type:
+        label: 'Voicemail accountable type'
+        hint: ''
+      voicemail_accountable_id:
+        label: 'Voicemail accountable'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/voicemail_messages/de.yml b/config/locales/views/voicemail_messages/de.yml
index addf8b1..862bd1b 100644
--- a/config/locales/views/voicemail_messages/de.yml
+++ b/config/locales/views/voicemail_messages/de.yml
@@ -9,6 +9,11 @@ de:
       page_title_unread: 'Ungelesene Nachrichten'
       date_format: '%d.%m.%Y %H:%M'
       date_today_format: '%H:%M'
+      date: 'Empfangen'
+      calling_party: 'Teilnehmer'
+      duration: 'Zeit'
+      message_flags: 'Flags'
+      unread: 'Ungelesen'
       navigation:
         read: 'Gelesen: %{count}'
         unread: 'Ungelesen: %{count}'
@@ -21,6 +26,7 @@ de:
         call: 'Anrufen'
         mark_read: 'gelesen'
         mark_unread: 'ungelesen'
+        download: 'Download'
       mailbox:
         inbox: 'Eingang'
       flags:
diff --git a/config/locales/views/voicemail_messages/en.yml b/config/locales/views/voicemail_messages/en.yml
index 5f0a610..cfddbee 100644
--- a/config/locales/views/voicemail_messages/en.yml
+++ b/config/locales/views/voicemail_messages/en.yml
@@ -9,6 +9,11 @@ en:
       page_title_unread: 'Unread Messages'
       date_format: '%m/%d/%Y %H:%M'
       date_today_format: '%H:%M'
+      date: 'Received'
+      calling_party: 'Calling party'
+      duration: 'Time'
+      message_flags: 'Flags'
+      unread: 'Unread'
       navigation:
         read: 'Read: %{count}'
         unread: 'Unread: %{count}'
@@ -21,6 +26,7 @@ en:
         call: 'Call'
         mark_read: 'Mark read'
         mark_unread: 'Mark unread'
+        download: 'Download'
       mailbox:
         inbox: 'Inbox'
       flags:
diff --git a/config/locales/views/voicemail_settings/de.yml b/config/locales/views/voicemail_settings/de.yml
index 52edd4b..ae2287c 100644
--- a/config/locales/views/voicemail_settings/de.yml
+++ b/config/locales/views/voicemail_settings/de.yml
@@ -1,52 +1,69 @@
 de:
   voicemail_settings:
-    name: 'Anrufbeantworter Einstellungen'
+    name: 'Voicemail Einstellungen'
+    settings:
+      pin: 'PIN'
+      notify: 'Notify'
+      attachment: 'Attachment'
+      mark_read: 'Mark read'
+      purge: 'Purge'
+      record_length_max: 'Record max.'
+      record_length_min: 'Record min.'
+      records_max: 'Records max.'
     controller:
-      successfuly_destroyed: 'Einstellungen wurden gelöscht.'
-      successfuly_created: 'Einstellungen wurden erstellt.'
-      successfuly_updated: 'Einstellungen wurden aktuallisiert.'
+      successfuly_created: 'Voicemail Einstellung wurde angelegt.'
+      successfuly_updated: 'Voicemail Einstellung wurde aktualisiert.'
+      successfuly_destroyed: 'Voicemail Einstellung wurde gelöscht.'
     index:
-      page_title: 'Anrufbeantworter Einstellungen'
+      page_title: 'Voicemail Einstellungen'
+      voicemail_account_id: 'Voicemail'
+      name: 'Name'
+      value: 'Value'
+      class_type: 'Class type'
+      description: 'Beschreibung'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie die Einstellungen löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Voicemail Einstellungen'
         destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Voicemail Einstellungen neu anlegen für %{resource}'
     show:
-      page_title: 'Anrufbeantworter Einstellungen'
-      greeting_path: 'Begrüßung'
-      name_path: 'Name'
-      flags: 'Flags'
-      notify: 'Benachrichtigung'
-      attachment: 'Datei anfügen'
-      mark_read: 'Als gelesen markieren'
-      purge: 'Löschen'
+      page_title: 'Voicemail Einstellungen bearbeiten'
+      voicemail_account_id: 'Voicemail'
+      name: 'Name'
+      value: 'Value'
+      class_type: 'Class type'
+      description: 'Beschreibung'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie die Einstellungen 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'
     new:
-      page_title: 'Anrufbeantworter Einstellungen'
+      page_title: 'Voicemail Einstellungen neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
     edit:
-      page_title: 'Anrufbeantworter Einstellungen'
+      page_title: 'Voicemail Einstellungen bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
     form:
-      greeting:
-        label: 'Begrüßung'
+      voicemail_account_id:
+        label: 'Voicemail'
         hint: ''
       name:
         label: 'Name'
         hint: ''
-      pin:
-        label: 'Anrufbeantworter PIN'
+      value:
+        label: 'Value'
+        hint: ''
+      class_type:
+        label: 'Class type'
+        hint: ''
+      description:
+        label: 'Beschreibung'
         hint: ''
-      notify:
-        label: 'Benachrichtigung'
-        hint: 'Benachrichtigung per E-Mail'
-      attachment:
-        label: 'Datei anfügen'
-        hint: 'Datei an E-Mail anfügen'
-      mark_read:
-        label: 'Als gelesen markieren'
-        hint: 'Markieren als gelesen'
-      purge:
-        label: 'Löschen'
-        hint: 'Nachricht löschen'
       submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/voicemail_settings/en.yml b/config/locales/views/voicemail_settings/en.yml
index 5995544..4696f79 100644
--- a/config/locales/views/voicemail_settings/en.yml
+++ b/config/locales/views/voicemail_settings/en.yml
@@ -1,52 +1,69 @@
 en:
   voicemail_settings:
-    name: 'Voicemail Settings'
+    name: 'Voicemailsetting'
+    settings:
+      pin: 'PIN'
+      notify: 'Notify'
+      attachment: 'Attachment'
+      mark_read: 'Mark read'
+      purge: 'Purge'
+      record_length_max: 'Record max.'
+      record_length_min: 'Record min.'
+      records_max: 'Records max.'
     controller:
-      successfuly_destroyed: 'Successfully destroyed voicemail settings.'
-      successfuly_created: 'Successfully created voicemail settings.'
-      successfuly_updated: 'Successfully updated voicemail settings.'
+      successfuly_created: 'Successfully created entry.'
+      successfuly_updated: 'Successfully updated entry.'
+      successfuly_destroyed: 'Successfully destroyed entry.'
     index:
-      page_title: 'Voicemail Settings'
+      page_title: 'Voicemail settings'
+      voicemail_account_id: 'Voicemail'
+      name: 'Name'
+      value: 'Value'
+      class_type: 'Class type'
+      description: 'Description'
       actions:
-        confirm_destroy: 'Are you sure you want to delete voicemail settings?'
+        confirm_destroy: 'Are you sure you want to delete this entry?'
         destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New settings entry for %{resource}'
     show:
-      page_title: 'Voicemail Settings'
-      greeting_path: 'Greeting'
-      name_path: 'Name'
-      flags: 'Flags'
-      notify: 'Notify by email'
-      attachment: 'Attach file'
-      mark_read: 'Mark read'
-      purge: 'Delete'
+      page_title: 'Show Voicemailsetting'
+      voicemail_account_id: 'Voicemail'
+      name: 'Name'
+      value: 'Value'
+      class_type: 'Class type'
+      description: 'Description'
       actions:
-        confirm_destroy: 'Are you sure you want to delete voicemail settings?'
+        confirm_destroy: 'Are you sure you want to delete this element?'
         destroy: 'Delete'
         edit: 'Edit'
+        view_all: 'View All'
     new:
-      page_title: 'Voicemail Settings'
+      page_title: 'New Voicemail settings entry'
+      actions:
+        back_to_list: 'Back to Index'
     edit:
-      page_title: 'Voicemail Settings'
+      page_title: 'Editing Voicemail settings'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
     form:
-      greeting:
-        label: 'Greeting'
-        hint: 'Voicemail greeting'
+      voicemail_account_id:
+        label: 'Voicemail'
+        hint: ''
       name:
         label: 'Name'
-        hint: 'Voicemail name'
-      pin:
-        label: 'Voicemail PIN'
-        hint: 'Voicemail PIN'
-      notify:
-        label: 'Notify by email'
-        hint: 'Notify user by email'
-      attachment:
-        label: 'Attach file'
-        hint: 'Attach file to notification email'
-      mark_read:
-        label: 'Mark read'
-        hint: 'Mark message read after notification is sent'
-      purge:
-        label: 'Delete'
-        hint: 'Delete message after notification is sent'
-      submit: 'Submit'
+        hint: ''
+      value:
+        label: 'Value'
+        hint: ''
+      class_type:
+        label: 'Class type'
+        hint: ''
+      description:
+        label: 'Description'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 69caf95..46562eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,37 @@
 Gemeinschaft42c::Application.routes.draw do
 
+  # To-Do: Delete these two entries and remap path on the views.
+  resources :pager_group_destinations
+  resources :pager_groups
+
+  namespace :api, defaults: {format: 'json'} do
+    namespace :v1 do
+      resources :switchboards, :only => [:show, :index]
+      resources :switchboard_entries, :only => [:show, :index]
+      resources :sip_accounts, :only => [:show, :index]
+      resources :pager_groups
+      resources :phone_numbers, :only => [:show, :index]
+    end
+
+    resources :rows 
+  end
+
+  resources :generic_files
+
+  resources :voicemail_accounts do
+    resources :voicemail_settings
+    resources :voicemail_messages do
+      collection do
+        delete 'destroy_multiple'
+      end
+      member do
+        put 'call'
+        put 'mark_read'
+        put 'mark_unread'
+      end
+    end
+  end
+
   resources :switchboards do
     resources :switchboard_entries do
       collection { post :sort }
@@ -58,9 +90,6 @@ Gemeinschaft42c::Application.routes.draw do
 
   resources :gui_functions
 
-  namespace :api do 
-    resources :rows 
-  end
 
   resources :phone_numbers, :only => [:sort] do
     collection { post :sort }
@@ -145,6 +174,7 @@ Gemeinschaft42c::Application.routes.draw do
   get "config_snom/:phone/:sip_account/phone_book"         => "config_snom#phone_book"
   get "config_snom/:phone/:sip_account/call_history"       => "config_snom#call_history"
   get "config_snom/:phone/:sip_account/call_history_:type" => "config_snom#call_history"
+  get "config_snom/:phone/:sip_account/voicemail"          => "config_snom#voicemail"
   get "config_snom/:phone/:sip_account/call_forwarding"    => "config_snom#call_forwarding"
   get "config_snom/exit"                                   => "config_snom#exit"
   get "config_snom/:phone/exit"                            => "config_snom#exit"
@@ -226,6 +256,8 @@ Gemeinschaft42c::Application.routes.draw do
     resources :switchboards do
       get :display
     end
+    resources :voicemail_accounts
+    resources :generic_files
   end
   
   resources :user_groups do
@@ -254,6 +286,9 @@ Gemeinschaft42c::Application.routes.draw do
     resources :hunt_groups
     resources :automatic_call_distributors
     resources :parking_stalls
+    resources :voicemail_accounts
+    resources :fax_accounts
+    resources :generic_files
   end
 
   resources :callthroughs, :only => [] do
@@ -284,17 +319,8 @@ Gemeinschaft42c::Application.routes.draw do
         put 'call'
       end
     end
-    resources :voicemail_messages do
-      collection do
-        delete 'destroy_multiple'
-      end
-      member do
-        put 'call'
-        put 'mark_read'
-        put 'mark_unread'
-      end
-    end
-    resources :voicemail_settings
+    resources :voicemail_accounts
+    resources :pager_groups
   end
 
   resources :phones, :only => [] do