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

86 files changed, 117 insertions, 105 deletions

diff --git a/config/locales/views/access_authorizations/de.yml b/config/locales/views/access_authorizations/de.yml
index 3df5774..06be591 100644
--- a/config/locales/views/access_authorizations/de.yml
+++ b/config/locales/views/access_authorizations/de.yml
@@ -42,4 +42,4 @@ de:
       pin:
         label: 'PIN'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/access_authorizations/en.yml b/config/locales/views/access_authorizations/en.yml
index 712bf01..562ab05 100644
--- a/config/locales/views/access_authorizations/en.yml
+++ b/config/locales/views/access_authorizations/en.yml
@@ -45,4 +45,4 @@ en:
       pin:
         label: 'PIN'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/acd_agents/de.yml b/config/locales/views/acd_agents/de.yml
index b625d09..e79c81b 100644
--- a/config/locales/views/acd_agents/de.yml
+++ b/config/locales/views/acd_agents/de.yml
@@ -73,4 +73,4 @@ de:
       destination_id:
         label: 'Ziel ID'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/acd_agents/en.yml b/config/locales/views/acd_agents/en.yml
index a048214..546e5c5 100644
--- a/config/locales/views/acd_agents/en.yml
+++ b/config/locales/views/acd_agents/en.yml
@@ -73,4 +73,4 @@ en:
       destination_id:
         label: 'Destination'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/acd_callers/de.yml b/config/locales/views/acd_callers/de.yml
index 2fa78f7..1ef5040 100644
--- a/config/locales/views/acd_callers/de.yml
+++ b/config/locales/views/acd_callers/de.yml
@@ -67,4 +67,4 @@ de:
       callback_attempts:
         label: 'Vermittllungsversuche'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/acd_callers/en.yml b/config/locales/views/acd_callers/en.yml
index 18a46e9..241fed0 100644
--- a/config/locales/views/acd_callers/en.yml
+++ b/config/locales/views/acd_callers/en.yml
@@ -67,4 +67,4 @@ en:
       callback_attempts:
         label: 'Callback attempts'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/addresses/de.yml b/config/locales/views/addresses/de.yml
index 7a20557..29dac3c 100644
--- a/config/locales/views/addresses/de.yml
+++ b/config/locales/views/addresses/de.yml
@@ -69,4 +69,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/addresses/en.yml b/config/locales/views/addresses/en.yml
index 66ffc23..21286b3 100644
--- a/config/locales/views/addresses/en.yml
+++ b/config/locales/views/addresses/en.yml
@@ -69,4 +69,4 @@ en:
       position:
         label: 'Position'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/automatic_call_distributors/de.yml b/config/locales/views/automatic_call_distributors/de.yml
index 52497f9..fa4c549 100644
--- a/config/locales/views/automatic_call_distributors/de.yml
+++ b/config/locales/views/automatic_call_distributors/de.yml
@@ -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 2c7fb9c..5006a77 100644
--- a/config/locales/views/automatic_call_distributors/en.yml
+++ b/config/locales/views/automatic_call_distributors/en.yml
@@ -114,7 +114,7 @@ en:
       music: 
         label: 'Music'
         hint: '' 
-      button: 'Submit'
+      submit: 'Submit'
     strategies:
       round_robin: 'Round robin'
       ring_all: 'Ring all'
diff --git a/config/locales/views/call_forwards/de.yml b/config/locales/views/call_forwards/de.yml
index 2d3940e..3930938 100644
--- a/config/locales/views/call_forwards/de.yml
+++ b/config/locales/views/call_forwards/de.yml
@@ -74,4 +74,4 @@ de:
       active:
         label: 'Aktiv'
         hint: ''       
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/call_forwards/en.yml b/config/locales/views/call_forwards/en.yml
index 4c2cf3c..20fb834 100644
--- a/config/locales/views/call_forwards/en.yml
+++ b/config/locales/views/call_forwards/en.yml
@@ -74,4 +74,4 @@ en:
       active:
         label: 'Active'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/call_histories/de.yml b/config/locales/views/call_histories/de.yml
index 3b05415..807fa3e 100644
--- a/config/locales/views/call_histories/de.yml
+++ b/config/locales/views/call_histories/de.yml
@@ -56,7 +56,7 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      button: 'Absenden'
+      submit: 'Absenden'
     call_results:
       UNSPECIFIED: ''
       ORIGINATOR_CANCEL: 'Abgebrochen'
diff --git a/config/locales/views/call_histories/en.yml b/config/locales/views/call_histories/en.yml
index 2ae62e1..aec50ec 100644
--- a/config/locales/views/call_histories/en.yml
+++ b/config/locales/views/call_histories/en.yml
@@ -56,7 +56,7 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
+      submit: 'Submit'
     call_results:
       UNSPECIFIED: ''
       ORIGINATOR_CANCEL: 'Cancelled'
diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml
index 47fdc54..260b869 100644
--- a/config/locales/views/call_routes/de.yml
+++ b/config/locales/views/call_routes/de.yml
@@ -57,4 +57,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 a637a08..25e4c51 100644
--- a/config/locales/views/call_routes/en.yml
+++ b/config/locales/views/call_routes/en.yml
@@ -57,4 +57,4 @@ en:
       position:
         label: 'Position'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/callthroughs/de.yml b/config/locales/views/callthroughs/de.yml
index 634767a..dea612e 100644
--- a/config/locales/views/callthroughs/de.yml
+++ b/config/locales/views/callthroughs/de.yml
@@ -55,4 +55,4 @@ de:
       sip_account_id:
         label: 'SIP-Konto ID'
         hint: 'Die SIP-Konto ID finden Sie in der URL des entsprechenden SIP-Kontos.'
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/callthroughs/en.yml b/config/locales/views/callthroughs/en.yml
index 6720fdf..a9b4147 100644
--- a/config/locales/views/callthroughs/en.yml
+++ b/config/locales/views/callthroughs/en.yml
@@ -55,4 +55,4 @@ en:
       sip_account_id:
         label: 'SIP account ID'
         hint: 'Please look up the SIP account ID in the URL of the SIP account.'
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/conference_invitees/de.yml b/config/locales/views/conference_invitees/de.yml
index c5c6460..6a26c24 100644
--- a/config/locales/views/conference_invitees/de.yml
+++ b/config/locales/views/conference_invitees/de.yml
@@ -52,4 +52,4 @@ de:
       moderator:
         label: 'Moderator'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/conference_invitees/en.yml b/config/locales/views/conference_invitees/en.yml
index c321e02..80077c5 100644
--- a/config/locales/views/conference_invitees/en.yml
+++ b/config/locales/views/conference_invitees/en.yml
@@ -51,4 +51,4 @@ en:
       moderator:
         label: 'Moderator'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/conferences/de.yml b/config/locales/views/conferences/de.yml
index 2e0aaf1..ba0869c 100644
--- a/config/locales/views/conferences/de.yml
+++ b/config/locales/views/conferences/de.yml
@@ -78,4 +78,4 @@ de:
       announce_left_member_by_name:
         label: 'Die Konferenz verlassende Teilnehmer werden angekündigt'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/conferences/en.yml b/config/locales/views/conferences/en.yml
index ac42fd6..e11e9cb 100644
--- a/config/locales/views/conferences/en.yml
+++ b/config/locales/views/conferences/en.yml
@@ -78,4 +78,4 @@ en:
       announce_left_member_by_name:
         label: 'Announce the leaving of a member'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/fax_accounts/de.yml b/config/locales/views/fax_accounts/de.yml
index 4e96501..cc93a24 100644
--- a/config/locales/views/fax_accounts/de.yml
+++ b/config/locales/views/fax_accounts/de.yml
@@ -57,4 +57,4 @@ de:
       retries: 
         label: 'Max. Anzahl von Sendeversuchen'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/fax_accounts/en.yml b/config/locales/views/fax_accounts/en.yml
index a83aa3d..7350c63 100644
--- a/config/locales/views/fax_accounts/en.yml
+++ b/config/locales/views/fax_accounts/en.yml
@@ -57,4 +57,4 @@ en:
       retries: 
         label: 'Retries'
         hint: 'Number of times the system retries to send the fax in case the destination is busy.'
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/fax_documents/de.yml b/config/locales/views/fax_documents/de.yml
index df766bf..6bfa86b 100644
--- a/config/locales/views/fax_documents/de.yml
+++ b/config/locales/views/fax_documents/de.yml
@@ -144,5 +144,5 @@ de:
       destination_phone_number: 
         label: 'Ziel Fax-Nummer'
         hint: ''
-      button: 'Absenden'
+      submit: 'Absenden'
 
diff --git a/config/locales/views/fax_documents/en.yml b/config/locales/views/fax_documents/en.yml
index abc9178..ff5f8f8 100644
--- a/config/locales/views/fax_documents/en.yml
+++ b/config/locales/views/fax_documents/en.yml
@@ -144,5 +144,5 @@ en:
       destination_phone_number: 
         label: 'Destination phone number'
         hint: ''
-      button: 'Submit'
+      submit: 'Submit'
 
diff --git a/config/locales/views/gateway_parameters/de.yml b/config/locales/views/gateway_parameters/de.yml
index 8bbd923..944c1fb 100644
--- a/config/locales/views/gateway_parameters/de.yml
+++ b/config/locales/views/gateway_parameters/de.yml
@@ -57,4 +57,4 @@ de:
       description:
         label: 'Description'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/gateway_parameters/en.yml b/config/locales/views/gateway_parameters/en.yml
index 83c5d50..d784c12 100644
--- a/config/locales/views/gateway_parameters/en.yml
+++ b/config/locales/views/gateway_parameters/en.yml
@@ -57,4 +57,4 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/gateway_settings/de.yml b/config/locales/views/gateway_settings/de.yml
index ab4c291..b159bf2 100644
--- a/config/locales/views/gateway_settings/de.yml
+++ b/config/locales/views/gateway_settings/de.yml
@@ -57,4 +57,4 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/gateway_settings/en.yml b/config/locales/views/gateway_settings/en.yml
index fc69c76..e506133 100644
--- a/config/locales/views/gateway_settings/en.yml
+++ b/config/locales/views/gateway_settings/en.yml
@@ -57,4 +57,4 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/gateways/de.yml b/config/locales/views/gateways/de.yml
index 6144dd4..5365685 100644
--- a/config/locales/views/gateways/de.yml
+++ b/config/locales/views/gateways/de.yml
@@ -58,4 +58,4 @@ de:
       description:
         label: 'Description'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/gateways/en.yml b/config/locales/views/gateways/en.yml
index 07272bc..db2357f 100644
--- a/config/locales/views/gateways/en.yml
+++ b/config/locales/views/gateways/en.yml
@@ -58,4 +58,4 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/gemeinschaft_setups/de.yml b/config/locales/views/gemeinschaft_setups/de.yml
index d087583..57bc7e6 100644
--- a/config/locales/views/gemeinschaft_setups/de.yml
+++ b/config/locales/views/gemeinschaft_setups/de.yml
@@ -4,7 +4,7 @@ de:
     initial_setup:
       tenant_name_default: 'Beispiel-Firma GmbH'
       access_denied_only_available_on_a_new_system:  'Zugriff verweigert! Der Installations-Assistent ist nur auf einem frisch installierten System verfügbar.'
-      successful_setup:  'Ihr Admin-Konto wurde erstellt. Als nächsten Schritt müssen Sie einen Mandant anlegen.'
+      successful_setup:  'Ihre neue Telefonanlage ist jetzt eingerichtet. Bitte erstellen Sie jetzt ein paar SIP-Accounts und richten Sie danach Telefone dafür ein.'
       admin_name: 'admin'
       super_tenant_description: 'Die Benutzer dieses Mandanten haben besondere Rechte. Sie können andere Mandanten anlegen und löschen.'
       admin_group_name: 'Admins'
@@ -27,5 +27,11 @@ de:
         hint: ''
       default_area_code:
         label: 'Standard Ortsvorwahl'
-        hint: '030 für Berlin, 0261 für Koblenz, 02631 für Neuwied, usw.'        
-      button: 'Absenden'
\ No newline at end of file
+        hint: '030 für Berlin, 0261 für Koblenz, 02631 für Neuwied, usw.'
+      default_company_name:
+        label: 'Name der Organisation'
+        hint: 'z.B. Firmenname'
+      default_system_email:
+        label: 'System E-Mail Adresse'
+        hint: 'Für den E-Mail Versand von Faxen und Voicemails.'   
+      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 5e22e58..9d5f965 100644
--- a/config/locales/views/gemeinschaft_setups/en.yml
+++ b/config/locales/views/gemeinschaft_setups/en.yml
@@ -4,7 +4,7 @@ en:
     initial_setup:
       tenant_name_default: 'Snake Oil, Ltd.'
       access_denied_only_available_on_a_new_system:  'Access denied! The setup wizard is only available on a new system.'
-      successful_setup:  'Your admin account has been created. The next step is to create a tenant.'
+      successful_setup:  'Your new PBX is up and running. Have a look around and setup some SIP accounts and phones.'
       admin_name: 'admin'
       super_tenant_description: 'The members of this tenant have the power to create and delete other tenants.'
       admin_group_name: 'Admins'
@@ -28,4 +28,10 @@ en:
       default_area_code:
         label: 'Default area code'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      default_company_name:
+        label: 'Name of the organisation'
+        hint: 'e.g. name of the company'
+      default_system_email:
+        label: 'System e-mail address'
+        hint: 'From field for voicemail or fax e-mails.'        
+      submit: 'Create this PBX'
\ No newline at end of file
diff --git a/config/locales/views/gs_cluster_sync_log_entries/de.yml b/config/locales/views/gs_cluster_sync_log_entries/de.yml
index 120e8dd..ed5f370 100644
--- a/config/locales/views/gs_cluster_sync_log_entries/de.yml
+++ b/config/locales/views/gs_cluster_sync_log_entries/de.yml
@@ -57,4 +57,4 @@ de:
       status:
         label: 'Status'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/gs_cluster_sync_log_entries/en.yml b/config/locales/views/gs_cluster_sync_log_entries/en.yml
index add0c98..6a07984 100644
--- a/config/locales/views/gs_cluster_sync_log_entries/en.yml
+++ b/config/locales/views/gs_cluster_sync_log_entries/en.yml
@@ -57,4 +57,4 @@ en:
       status:
         label: 'Status'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/gs_nodes/de.yml b/config/locales/views/gs_nodes/de.yml
index 07538dc..5525119 100644
--- a/config/locales/views/gs_nodes/de.yml
+++ b/config/locales/views/gs_nodes/de.yml
@@ -62,4 +62,4 @@ de:
       accepts_updates_from:
         label: 'Änderungen empfangen'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/gs_nodes/en.yml b/config/locales/views/gs_nodes/en.yml
index bfb47be..75c06eb 100644
--- a/config/locales/views/gs_nodes/en.yml
+++ b/config/locales/views/gs_nodes/en.yml
@@ -62,4 +62,4 @@ en:
       accepts_updates_from:
         label: 'Accepts updates from this node?'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/gs_parameters/de.yml b/config/locales/views/gs_parameters/de.yml
index 92d1833..16a8c77 100644
--- a/config/locales/views/gs_parameters/de.yml
+++ b/config/locales/views/gs_parameters/de.yml
@@ -60,4 +60,4 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/gs_parameters/en.yml b/config/locales/views/gs_parameters/en.yml
index 9745b11..5539766 100644
--- a/config/locales/views/gs_parameters/en.yml
+++ b/config/locales/views/gs_parameters/en.yml
@@ -61,4 +61,4 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/gui_functions/de.yml b/config/locales/views/gui_functions/de.yml
index 2ada30f..daba3e9 100644
--- a/config/locales/views/gui_functions/de.yml
+++ b/config/locales/views/gui_functions/de.yml
@@ -47,4 +47,4 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/gui_functions/en.yml b/config/locales/views/gui_functions/en.yml
index 66bdff3..b303e81 100644
--- a/config/locales/views/gui_functions/en.yml
+++ b/config/locales/views/gui_functions/en.yml
@@ -47,4 +47,4 @@ de:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/hunt_group_members/de.yml b/config/locales/views/hunt_group_members/de.yml
index b399bde..2667e99 100644
--- a/config/locales/views/hunt_group_members/de.yml
+++ b/config/locales/views/hunt_group_members/de.yml
@@ -45,4 +45,4 @@ de:
       phone_numbers:
         label: 'Telefonnummern'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/hunt_group_members/en.yml b/config/locales/views/hunt_group_members/en.yml
index 6c7f654..b9b2faf 100644
--- a/config/locales/views/hunt_group_members/en.yml
+++ b/config/locales/views/hunt_group_members/en.yml
@@ -45,4 +45,4 @@ en:
       phone_numbers:
         label: 'Phone numbers'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/hunt_groups/de.yml b/config/locales/views/hunt_groups/de.yml
index cac1cbe..2263f91 100644
--- a/config/locales/views/hunt_groups/de.yml
+++ b/config/locales/views/hunt_groups/de.yml
@@ -54,4 +54,4 @@ de:
       hunt_group_members:
         label: 'Rufgruppen-Teilnehmer'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/hunt_groups/en.yml b/config/locales/views/hunt_groups/en.yml
index d0cc4cd..cf88374 100644
--- a/config/locales/views/hunt_groups/en.yml
+++ b/config/locales/views/hunt_groups/en.yml
@@ -54,4 +54,4 @@ en:
       hunt_group_members:
         label: 'Members of this hunt group'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/manufacturers/de.yml b/config/locales/views/manufacturers/de.yml
index 9530fae..2608743 100644
--- a/config/locales/views/manufacturers/de.yml
+++ b/config/locales/views/manufacturers/de.yml
@@ -46,4 +46,4 @@ de:
       state:
         label: 'Status'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/manufacturers/en.yml b/config/locales/views/manufacturers/en.yml
index a66f964..dccdf1b 100644
--- a/config/locales/views/manufacturers/en.yml
+++ b/config/locales/views/manufacturers/en.yml
@@ -46,4 +46,4 @@ en:
       state:
         label: 'State'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/phone_book_entries/de.yml b/config/locales/views/phone_book_entries/de.yml
index 21f635e..2c77aa5 100644
--- a/config/locales/views/phone_book_entries/de.yml
+++ b/config/locales/views/phone_book_entries/de.yml
@@ -158,4 +158,4 @@ de:
       image:
         label: 'Avatar Foto'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/phone_book_entries/en.yml b/config/locales/views/phone_book_entries/en.yml
index b41694e..abfbbb2 100644
--- a/config/locales/views/phone_book_entries/en.yml
+++ b/config/locales/views/phone_book_entries/en.yml
@@ -158,4 +158,4 @@ en:
       image:
         label: 'Photo'
         hint: 'Avatar photo'
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/phone_books/de.yml b/config/locales/views/phone_books/de.yml
index 6cc17f3..fa93945 100644
--- a/config/locales/views/phone_books/de.yml
+++ b/config/locales/views/phone_books/de.yml
@@ -43,4 +43,4 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/phone_books/en.yml b/config/locales/views/phone_books/en.yml
index 39052d5..1c89feb 100644
--- a/config/locales/views/phone_books/en.yml
+++ b/config/locales/views/phone_books/en.yml
@@ -43,4 +43,4 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/phone_models/de.yml b/config/locales/views/phone_models/de.yml
index 3c82402..ec45c4c 100644
--- a/config/locales/views/phone_models/de.yml
+++ b/config/locales/views/phone_models/de.yml
@@ -47,4 +47,4 @@ de:
       product_homepage_url:
         label: 'Produkt-Homepage URL'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/phone_models/en.yml b/config/locales/views/phone_models/en.yml
index adbc9fd..2efe037 100644
--- a/config/locales/views/phone_models/en.yml
+++ b/config/locales/views/phone_models/en.yml
@@ -46,4 +46,4 @@ en:
       product_homepage_url:
         label: 'Product homepage URL'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/phone_number_ranges/de.yml b/config/locales/views/phone_number_ranges/de.yml
index a589b32..75c4f49 100644
--- a/config/locales/views/phone_number_ranges/de.yml
+++ b/config/locales/views/phone_number_ranges/de.yml
@@ -48,4 +48,4 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/phone_number_ranges/en.yml b/config/locales/views/phone_number_ranges/en.yml
index 2474527..c422a2e 100644
--- a/config/locales/views/phone_number_ranges/en.yml
+++ b/config/locales/views/phone_number_ranges/en.yml
@@ -48,4 +48,4 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/phone_numbers/de.yml b/config/locales/views/phone_numbers/de.yml
index e6fc703..19fae04 100644
--- a/config/locales/views/phone_numbers/de.yml
+++ b/config/locales/views/phone_numbers/de.yml
@@ -62,4 +62,4 @@ de:
       extension:
         label: 'Durchwahl'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/phone_numbers/en.yml b/config/locales/views/phone_numbers/en.yml
index 07fb2fb..1e70c1f 100644
--- a/config/locales/views/phone_numbers/en.yml
+++ b/config/locales/views/phone_numbers/en.yml
@@ -62,4 +62,4 @@ en:
       extension:
         label: 'Extension'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/phone_sip_accounts/de.yml b/config/locales/views/phone_sip_accounts/de.yml
index 7a6736a..052e1b9 100644
--- a/config/locales/views/phone_sip_accounts/de.yml
+++ b/config/locales/views/phone_sip_accounts/de.yml
@@ -34,4 +34,4 @@ de:
       sip_account_id:
         label: 'SIP-Konto'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/phone_sip_accounts/en.yml b/config/locales/views/phone_sip_accounts/en.yml
index 3604758..d6e6bea 100644
--- a/config/locales/views/phone_sip_accounts/en.yml
+++ b/config/locales/views/phone_sip_accounts/en.yml
@@ -34,4 +34,4 @@ en:
       sip_account_id:
         label: 'SIP account'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      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 59313b1..af2804a 100644
--- a/config/locales/views/phones/de.yml
+++ b/config/locales/views/phones/de.yml
@@ -77,7 +77,7 @@ de:
       fallback_sip_account_id:
         label: 'Fallback SIP Account'
         hint: ''
-      button: 'Absenden'
+      submit: 'Absenden'
     sip_accounts:
       title: 'Verknüpfte SIP-Accounts'
       connect_to_sip_account: 'SIP-Account mit dem Telefon verknüpfen'
diff --git a/config/locales/views/phones/en.yml b/config/locales/views/phones/en.yml
index 9574443..306537f 100644
--- a/config/locales/views/phones/en.yml
+++ b/config/locales/views/phones/en.yml
@@ -77,7 +77,7 @@ en:
       fallback_sip_account_id:
         label: 'Fallback SIP Account'
         hint: ''
-      button: 'Submit'
+      submit: 'Submit'
     sip_accounts:
       title: 'Listing of connected SIP accounts'
       connect_to_sip_account: 'Connect to an existing SIP account'
diff --git a/config/locales/views/ringtones/de.yml b/config/locales/views/ringtones/de.yml
index d2429a9..470994f 100644
--- a/config/locales/views/ringtones/de.yml
+++ b/config/locales/views/ringtones/de.yml
@@ -35,5 +35,5 @@ de:
       bellcore_id:
         label: 'Bellcore-ID'
         hint: 'Im Telefon eingebaute Klingeltöne. "0" bedeutet lautlos.'
-      button: 'Absenden'
+      submit: 'Absenden'
     set_a_ringtone: 'Klingelton einstellen'
\ No newline at end of file
diff --git a/config/locales/views/ringtones/en.yml b/config/locales/views/ringtones/en.yml
index c9ee727..1b0b36a 100644
--- a/config/locales/views/ringtones/en.yml
+++ b/config/locales/views/ringtones/en.yml
@@ -35,5 +35,5 @@ en:
       bellcore_id:
         label: 'Bellcore ID'
         hint: 'Build in ringtone ID. A "0" means silence.'
-      button: 'Submit'
+      submit: 'Submit'
     set_a_ringtone: 'Set a ringtone'
\ No newline at end of file
diff --git a/config/locales/views/route_elements/de.yml b/config/locales/views/route_elements/de.yml
index 683bee8..fe14671 100644
--- a/config/locales/views/route_elements/de.yml
+++ b/config/locales/views/route_elements/de.yml
@@ -72,4 +72,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/route_elements/en.yml b/config/locales/views/route_elements/en.yml
index 35179cc..c24e03a 100644
--- a/config/locales/views/route_elements/en.yml
+++ b/config/locales/views/route_elements/en.yml
@@ -72,4 +72,4 @@ en:
       position:
         label: 'Position'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml
index 162a072..e711137 100644
--- a/config/locales/views/sip_accounts/de.yml
+++ b/config/locales/views/sip_accounts/de.yml
@@ -1,12 +1,12 @@
 de:
   sip_accounts:
-    name: 'SIP-Konto'
+    name: 'SIP-Account'
     controller:
-      successfuly_created: 'Ein SIP-Konto für %{resource} wurde erstellt.'
-      successfuly_updated: 'Das SIP-Konto wurde aktualisiert.'
-      successfuly_destroyed: 'Das SIP-Konto wurde gelöscht.'
+      successfuly_created: 'Ein SIP-Account für %{resource} wurde erstellt.'
+      successfuly_updated: 'Der SIP-Account wurde aktualisiert.'
+      successfuly_destroyed: 'Der SIP-Account wurde gelöscht.'
     index:
-      page_title: 'SIP-Konten'
+      page_title: 'SIP-Accounts'
       auth_name: 'Auth Name'
       caller_name: 'Caller Name'
       password: 'Passwort'
@@ -17,17 +17,17 @@ de:
       clip: 'Rufnummernanzeige (CLIP)'
       hotdeskable: 'Hot-Desk fähig'
       clip_no_screening: 'Spezifische Rufnummernanzeige (CLIP -no screening-)'
-      callforward_rules_act_per_sip_account: 'Rufweiterleitungen gelten für das gesamte SIP-Konto'
+      callforward_rules_act_per_sip_account: 'Rufweiterleitungen gelten für das gesamte SIP-Account'
       online: 'Online'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Konto löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Account löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
         create: 'Neu anlegen'
-        create_for: 'Neues SIP-Konto für %{resource} anlegen'
+        create_for: 'Neues SIP-Account für %{resource} anlegen'
     show:
-      page_title: 'SIP-Konto anzeigen'
+      page_title: 'SIP-Account anzeigen'
       auth_name: 'Auth Name'
       caller_name: 'Caller Name'
       password: 'Passwort'
@@ -37,18 +37,18 @@ de:
       clip: 'Rufnummernanzeige (CLIP)'
       hotdeskable: 'Hot-Desk fähig'
       clip_no_screening: 'Spezifische Rufnummernanzeige (CLIP -no screening-)'
-      callforward_rules_act_per_sip_account: 'Rufweiterleitungen gelten für das gesamte SIP-Konto'
+      callforward_rules_act_per_sip_account: 'Rufweiterleitungen gelten für das gesamte SIP-Account'
       registration: 'Registrierung'
       expires: 'Läuft ab'
       actions:
-        confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Konto löschen möchten?'
+        confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Account löschen möchten?'
         destroy: 'Löschen'
         edit: 'Bearbeiten'
-        view_all: 'Alle SIP-Konten anzeigen'
+        view_all: 'Alle SIP-Accounts anzeigen'
     new:
-      page_title: 'Neues SIP-Konto'
+      page_title: 'Neues SIP-Account'
     edit:
-      page_title: 'SIP-Konto bearbeiten'
+      page_title: 'SIP-Account bearbeiten'
     form:
       auth_name:
         label: 'Auth Name'
@@ -78,6 +78,6 @@ de:
         label: 'Hot-Desk fähig'
         hint: ''
       callforward_rules_act_per_sip_account: 
-        label: 'Rufweiterleitungen gelten für das gesamte SIP-Konto'
+        label: 'Rufweiterleitungen gelten für das gesamte SIP-Account'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml
index b02c60a..99d14b5 100644
--- a/config/locales/views/sip_accounts/en.yml
+++ b/config/locales/views/sip_accounts/en.yml
@@ -80,4 +80,4 @@ en:
       hotdeskable: 
         label: 'Hotdeskable'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/sip_domains/de.yml b/config/locales/views/sip_domains/de.yml
index 7c3bfb6..a93529d 100644
--- a/config/locales/views/sip_domains/de.yml
+++ b/config/locales/views/sip_domains/de.yml
@@ -35,4 +35,4 @@ de:
       realm:
         label: 'Realm'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/sip_domains/en.yml b/config/locales/views/sip_domains/en.yml
index 30432e4..a053864 100644
--- a/config/locales/views/sip_domains/en.yml
+++ b/config/locales/views/sip_domains/en.yml
@@ -35,4 +35,4 @@ en:
       realm:
         label: 'Realm'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/softkeys/de.yml b/config/locales/views/softkeys/de.yml
index 654da80..e8bbc9a 100644
--- a/config/locales/views/softkeys/de.yml
+++ b/config/locales/views/softkeys/de.yml
@@ -65,4 +65,4 @@ de:
       label:
         label: 'Beschriftung'
         hint: 'Je nach Telefonmodell gibt es die Möglichkeit eine Beschriftung bzw. eine Beschreibung auf dem Telefon anzuzeigen.'
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/softkeys/en.yml b/config/locales/views/softkeys/en.yml
index d78c685..8d8a3f3 100644
--- a/config/locales/views/softkeys/en.yml
+++ b/config/locales/views/softkeys/en.yml
@@ -61,4 +61,4 @@ en:
       label:
         label: 'Label'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/system_messages/de.yml b/config/locales/views/system_messages/de.yml
index 571c326..d841d0b 100644
--- a/config/locales/views/system_messages/de.yml
+++ b/config/locales/views/system_messages/de.yml
@@ -35,4 +35,4 @@ de:
       content:
         label: 'Nachricht'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/system_messages/en.yml b/config/locales/views/system_messages/en.yml
index 4ce8317..a039b10 100644
--- a/config/locales/views/system_messages/en.yml
+++ b/config/locales/views/system_messages/en.yml
@@ -35,4 +35,4 @@ en:
       content:
         label: 'Content'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/tenants/de.yml b/config/locales/views/tenants/de.yml
index 6036879..fa57c6a 100644
--- a/config/locales/views/tenants/de.yml
+++ b/config/locales/views/tenants/de.yml
@@ -68,6 +68,6 @@ de:
       did_list:
         label: 'Externe Rufnummern'
         hint: 'Hier können Sie die Rufnummern eintragen, mit denen Sie vom Festnetz aus erreichbar sind. Sollten Sie nur eine Nummer haben, dann bitte diese eintragen. Sie können das x als Wildcard für die oben angegebenen Durchwahlen benutzen. Beispiele: "0228-12345x, 0228-123450" (ein typisches Beispiel für einen Anlagenanschluss mit 2-stelligen Durchwahlen), "0228-123456", "0228-123456,0228-123999"'
-      button: 'Absenden'
+      submit: 'Absenden'
     
     switch_to_tenant: "Mandant wechseln"
diff --git a/config/locales/views/tenants/en.yml b/config/locales/views/tenants/en.yml
index edccda0..9975fce 100644
--- a/config/locales/views/tenants/en.yml
+++ b/config/locales/views/tenants/en.yml
@@ -68,6 +68,6 @@ en:
       did_list:
         label: 'External numbers'
         hint: 'These are the phone numbers which can be called from the outside (seperated by commas). The x represents all internal extensions (can be added to a trunk number). You can mix MSNs and DIDs. Examples: "0228-12345x, 0228-123450" (this would be the solution for most companies), "0228-123456", "0228-123456,0228-123999"'
-      button: 'Submit'
+      submit: 'Submit'
     
     switch_to_tenant: "Switch to tenant"
diff --git a/config/locales/views/user_group_memberships/de.yml b/config/locales/views/user_group_memberships/de.yml
index 9df4cad..a044e18 100644
--- a/config/locales/views/user_group_memberships/de.yml
+++ b/config/locales/views/user_group_memberships/de.yml
@@ -32,4 +32,4 @@ de:
       name:
         user: 'Benutzer'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/user_group_memberships/en.yml b/config/locales/views/user_group_memberships/en.yml
index 28049e0..4cce98d 100644
--- a/config/locales/views/user_group_memberships/en.yml
+++ b/config/locales/views/user_group_memberships/en.yml
@@ -32,4 +32,4 @@ en:
       name:
         user: 'User'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/user_groups/de.yml b/config/locales/views/user_groups/de.yml
index 303fca0..ac0e1b6 100644
--- a/config/locales/views/user_groups/de.yml
+++ b/config/locales/views/user_groups/de.yml
@@ -39,4 +39,4 @@ de:
       description:
         label: 'Beschreibung'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/user_groups/en.yml b/config/locales/views/user_groups/en.yml
index 1403a19..782b5eb 100644
--- a/config/locales/views/user_groups/en.yml
+++ b/config/locales/views/user_groups/en.yml
@@ -39,4 +39,4 @@ en:
       description:
         label: 'Description'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/users/de.yml b/config/locales/views/users/de.yml
index 20fa4e0..7cdaf68 100644
--- a/config/locales/views/users/de.yml
+++ b/config/locales/views/users/de.yml
@@ -24,7 +24,7 @@ de:
         destroy: 'Löschen'
         edit: 'Bearbeiten'
         show: 'Anzeigen'
-        create: 'Neue anlegen'
+        create: 'Neu anlegen'
         create_for: 'Neuen User für %{resource} anlegen'
     show:
       page_title: 'User anzeigen'
@@ -92,4 +92,4 @@ de:
       send_voicemail_as_email_attachment:
         label: 'Sprachnachrichten per E-Mail verschicken'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/users/en.yml b/config/locales/views/users/en.yml
index 121c925..29bae82 100644
--- a/config/locales/views/users/en.yml
+++ b/config/locales/views/users/en.yml
@@ -92,4 +92,4 @@ en:
       send_voicemail_as_email_attachment:
         label: 'Send voicemails as e-mail attachments'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/voicemail_settings/de.yml b/config/locales/views/voicemail_settings/de.yml
index 2271cae..52edd4b 100644
--- a/config/locales/views/voicemail_settings/de.yml
+++ b/config/locales/views/voicemail_settings/de.yml
@@ -49,4 +49,4 @@ de:
       purge:
         label: 'Löschen'
         hint: 'Nachricht löschen'
-      button: 'Absenden'
\ No newline at end of file
+      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 22be392..5995544 100644
--- a/config/locales/views/voicemail_settings/en.yml
+++ b/config/locales/views/voicemail_settings/en.yml
@@ -49,4 +49,4 @@ en:
       purge:
         label: 'Delete'
         hint: 'Delete message after notification is sent'
-      button: 'Submit'
+      submit: 'Submit'
diff --git a/config/locales/views/whitelists/de.yml b/config/locales/views/whitelists/de.yml
index 8b1b67f..8060f63 100644
--- a/config/locales/views/whitelists/de.yml
+++ b/config/locales/views/whitelists/de.yml
@@ -35,4 +35,4 @@ de:
       phone_numbers:
         label: 'Telefonnummern'
         hint: ''
-      button: 'Absenden'
\ No newline at end of file
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/whitelists/en.yml b/config/locales/views/whitelists/en.yml
index 2a91e54..475d560 100644
--- a/config/locales/views/whitelists/en.yml
+++ b/config/locales/views/whitelists/en.yml
@@ -35,4 +35,4 @@ en:
       phone_numbers:
         label: 'Phone numbers'
         hint: ''
-      button: 'Submit'
\ No newline at end of file
+      submit: 'Submit'
\ No newline at end of file