Merge branch 'develop'5.1-beta5

10 files changed, 444 insertions, 18 deletions

diff --git a/config/locales/views/intruders/de.yml b/config/locales/views/intruders/de.yml
index 42ece4b..5b67afe 100644
--- a/config/locales/views/intruders/de.yml
+++ b/config/locales/views/intruders/de.yml
@@ -11,16 +11,16 @@ de:
       key: 'Key'
       points: 'Points'
       bans: 'Bans'
-      ban_last: 'Ban last'
+      ban_last: 'Ban'
       ban_end: 'Ban end'
-      contact_ip: 'Contact ip'
-      contact_port: 'Contact port'
-      contact_count: 'Contact count'
-      contact_last: 'Contact last'
-      contacts_per_second: 'Contacts per second'
-      contacts_per_second_max: 'Contacts per second max'
+      contact_ip: 'IP'
+      contact_port: 'Port'
+      contact_count: 'Contact'
+      contact_last: 'Last'
+      contacts_per_second: 'Contacts/s'
+      contacts_per_second_max: 'max. Contacts/s'
       user_agent: 'User agent'
-      to_user: 'To user'
+      to_user: 'To'
       comment: 'Comment'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Intruder'
diff --git a/config/locales/views/intruders/en.yml b/config/locales/views/intruders/en.yml
index 99c2dcb..b9d65f4 100644
--- a/config/locales/views/intruders/en.yml
+++ b/config/locales/views/intruders/en.yml
@@ -11,16 +11,16 @@ en:
       key: 'Key'
       points: 'Points'
       bans: 'Bans'
-      ban_last: 'Ban last'
+      ban_last: 'Ban'
       ban_end: 'Ban end'
-      contact_ip: 'Contact ip'
-      contact_port: 'Contact port'
-      contact_count: 'Contact count'
-      contact_last: 'Contact last'
-      contacts_per_second: 'Contacts per second'
-      contacts_per_second_max: 'Contacts per second max'
+      contact_ip: 'IP'
+      contact_port: 'Port'
+      contact_count: 'Contact'
+      contact_last: 'Last'
+      contacts_per_second: 'Contacts/s'
+      contacts_per_second_max: 'max. Contacts/s'
       user_agent: 'User agent'
-      to_user: 'To user'
+      to_user: 'To'
       comment: 'Comment'
       actions:
         confirm_destroy: 'Are you sure you want to delete this Intruder?'
diff --git a/config/locales/views/parking_stalls/de.yml b/config/locales/views/parking_stalls/de.yml
new file mode 100644
index 0000000..44e31c8
--- /dev/null
+++ b/config/locales/views/parking_stalls/de.yml
@@ -0,0 +1,60 @@
+de:
+  parking_stalls:
+    name: 'Parkingstall'
+    controller:
+      successfuly_created: 'Parkingstall wurde angelegt.'
+      successfuly_updated: 'Parkingstall wurde aktualisiert.'
+      successfuly_destroyed: 'Parkingstall wurde gelöscht.'
+    index:
+      page_title: 'Übersicht von Parkingstall'
+      name: 'Name'
+      lot: 'Lot'
+      parking_stallable_id: 'Parking stallable'
+      parking_stallable_type: 'Parking stallable type'
+      comment: 'Comment'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Parkingstall'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Parkingstall neu anlegen für %{resource}'
+    show:
+      page_title: 'Parkingstall bearbeiten'
+      name: 'Name'
+      lot: 'Lot'
+      parking_stallable_id: 'Parking stallable'
+      parking_stallable_type: 'Parking stallable type'
+      comment: 'Comment'
+      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: 'Parkingstall neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Parkingstall bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      lot:
+        label: 'Lot'
+        hint: ''
+      parking_stallable_id:
+        label: 'Parking stallable'
+        hint: ''
+      parking_stallable_type:
+        label: 'Parking stallable type'
+        hint: ''
+      comment:
+        label: 'Comment'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/parking_stalls/en.yml b/config/locales/views/parking_stalls/en.yml
new file mode 100644
index 0000000..6d30b87
--- /dev/null
+++ b/config/locales/views/parking_stalls/en.yml
@@ -0,0 +1,60 @@
+en:
+  parking_stalls:
+    name: 'Parkingstall'
+    controller:
+      successfuly_created: 'Successfully created Parkingstall.'
+      successfuly_updated: 'Successfully updated Parkingstall.'
+      successfuly_destroyed: 'Successfully destroyed Parkingstall.'
+    index:
+      page_title: 'Listing Parkingstall'
+      name: 'Name'
+      lot: 'Lot'
+      parking_stallable_id: 'Parking stallable'
+      parking_stallable_type: 'Parking stallable type'
+      comment: 'Comment'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Parkingstall?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Parkingstall for %{resource}'
+    show:
+      page_title: 'Show Parkingstall'
+      name: 'Name'
+      lot: 'Lot'
+      parking_stallable_id: 'Parking stallable'
+      parking_stallable_type: 'Parking stallable type'
+      comment: 'Comment'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Parkingstall'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Parkingstall'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      lot:
+        label: 'Lot'
+        hint: ''
+      parking_stallable_id:
+        label: 'Parking stallable'
+        hint: ''
+      parking_stallable_type:
+        label: 'Parking stallable type'
+        hint: ''
+      comment:
+        label: 'Comment'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/sim_card_providers/de.yml b/config/locales/views/sim_card_providers/de.yml
new file mode 100644
index 0000000..7cb19a5
--- /dev/null
+++ b/config/locales/views/sim_card_providers/de.yml
@@ -0,0 +1,80 @@
+de:
+  sim_card_providers:
+    name: 'SIM Karten Provider'
+    controller:
+      successfuly_created: 'SIM Karten Provider wurde angelegt.'
+      successfuly_updated: 'SIM Karten Provider wurde aktualisiert.'
+      successfuly_destroyed: 'SIM Karten Provider wurde gelöscht.'
+    index:
+      page_title: 'Liste SIM Karten Provider'
+      name: 'Name'
+      homepage_url: 'Homepage URL'
+      docu_url: 'Docu URL'
+      api_server_url: 'API server URL'
+      api_username: 'API username'
+      api_password: 'API password'
+      ref: 'Ref'
+      sip_server: 'SIP-Server'
+      include_order_card_function: 'Include order card function'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: SIM Karten Provider'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'SIM Karten Provider neu anlegen für %{resource}'
+    show:
+      page_title: 'SIM Karten Provider bearbeiten'
+      name: 'Name'
+      homepage_url: 'Homepage URL'
+      docu_url: 'Docu URL'
+      api_server_url: 'API server URL'
+      api_username: 'API username'
+      api_password: 'API password'
+      ref: 'Ref'
+      sip_server: 'SIP-Server'
+      include_order_card_function: 'Include order card function'
+      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: 'SIM Karten Provider neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'SIM Karten Provider bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      homepage_url:
+        label: 'Homepage URL'
+        hint: ''
+      docu_url:
+        label: 'Docu URL'
+        hint: ''
+      api_server_url:
+        label: 'API server URL'
+        hint: ''
+      api_username:
+        label: 'API username'
+        hint: ''
+      api_password:
+        label: 'API password'
+        hint: ''
+      ref:
+        label: 'Ref'
+        hint: ''
+      sip_server:
+        label: 'SIP-Server'
+        hint: ''
+      include_order_card_function:
+        label: 'Include order card function'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/sim_card_providers/en.yml b/config/locales/views/sim_card_providers/en.yml
new file mode 100644
index 0000000..8b3843c
--- /dev/null
+++ b/config/locales/views/sim_card_providers/en.yml
@@ -0,0 +1,80 @@
+en:
+  sim_card_providers:
+    name: 'Simcardprovider'
+    controller:
+      successfuly_created: 'Successfully created Simcardprovider.'
+      successfuly_updated: 'Successfully updated Simcardprovider.'
+      successfuly_destroyed: 'Successfully destroyed Simcardprovider.'
+    index:
+      page_title: 'Listing Simcardprovider'
+      name: 'Name'
+      homepage_url: 'Homepage url'
+      docu_url: 'Docu url'
+      api_server_url: 'Api server url'
+      api_username: 'Api username'
+      api_password: 'Api password'
+      ref: 'Ref'
+      sip_server: 'Sip server'
+      include_order_card_function: 'Include order card function'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Simcardprovider?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Simcardprovider for %{resource}'
+    show:
+      page_title: 'Show Simcardprovider'
+      name: 'Name'
+      homepage_url: 'Homepage url'
+      docu_url: 'Docu url'
+      api_server_url: 'Api server url'
+      api_username: 'Api username'
+      api_password: 'Api password'
+      ref: 'Ref'
+      sip_server: 'Sip server'
+      include_order_card_function: 'Include order card function'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Simcardprovider'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Simcardprovider'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      homepage_url:
+        label: 'Homepage url'
+        hint: ''
+      docu_url:
+        label: 'Docu url'
+        hint: ''
+      api_server_url:
+        label: 'Api server url'
+        hint: ''
+      api_username:
+        label: 'Api username'
+        hint: ''
+      api_password:
+        label: 'Api password'
+        hint: ''
+      ref:
+        label: 'Ref'
+        hint: ''
+      sip_server:
+        label: 'Sip server'
+        hint: ''
+      include_order_card_function:
+        label: 'Include order card function'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/sim_cards/de.yml b/config/locales/views/sim_cards/de.yml
new file mode 100644
index 0000000..4c2a5e4
--- /dev/null
+++ b/config/locales/views/sim_cards/de.yml
@@ -0,0 +1,70 @@
+de:
+  sim_cards:
+    name: 'SIM-Karte'
+    controller:
+      successfuly_created: 'SIM-Karte wurde angelegt.'
+      successfuly_updated: 'SIM-Karte wurde aktualisiert.'
+      successfuly_destroyed: 'SIM-Karte wurde gelöscht.'
+      no_existing_sip_accounts_warning: 'Es existiert kein freier SIP-Account zum Anlegen einer neuen SIM-Karte.'
+    index:
+      page_title: 'Liste SIM-Karten'
+      sim_card_provider_id: 'SIM-Karten Provider'
+      auto_order_card: 'Auto order card'
+      sip_account_id: 'SIP-Account'
+      auth_key: 'Auth key'
+      state: 'Status'
+      log: 'Log'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: SIM-Karte'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'SIM-Karte neu anlegen für %{resource}'
+    show:
+      page_title: 'SIM-Karte bearbeiten'
+      sim_card_provider_id: 'SIM-Karten Provider'
+      auto_order_card: 'Auto order card'
+      sip_account_id: 'SIP-Account'
+      auth_key: 'Auth key'
+      state: 'Status'
+      log: 'Log'
+      sim_number: 'SIM-No.'      
+      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: 'SIM-Karte neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'SIM-Karte bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      sim_card_provider_id:
+        label: 'SIM-Karten Provider'
+        hint: ''
+      sim_number:
+        label: 'SIM-Nr.'
+        hint: ''
+      auto_order_card:
+        label: 'Auto order card'
+        hint: ''
+      sip_account_id:
+        label: 'SIP-Account'
+        hint: ''
+      auth_key:
+        label: 'Auth key'
+        hint: ''
+      state:
+        label: 'Status'
+        hint: ''
+      log:
+        label: 'Log'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/sim_cards/en.yml b/config/locales/views/sim_cards/en.yml
new file mode 100644
index 0000000..af82295
--- /dev/null
+++ b/config/locales/views/sim_cards/en.yml
@@ -0,0 +1,70 @@
+en:
+  sim_cards:
+    name: 'SIM card'
+    controller:
+      successfuly_created: 'Successfully created SIM card.'
+      successfuly_updated: 'Successfully updated SIM card.'
+      successfuly_destroyed: 'Successfully destroyed SIM card.'
+      no_existing_sip_accounts_warning: 'There is no available SIP account to create a new SIM card.'
+    index:
+      page_title: 'Listing SIM cards'
+      sim_card_provider_id: 'SIM card provider'
+      auto_order_card: 'Auto order card'
+      sip_account_id: 'Sip account'
+      auth_key: 'Auth key'
+      state: 'State'
+      log: 'Log'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this SIM card?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New SIM card for %{resource}'
+    show:
+      page_title: 'Show SIM card'
+      sim_card_provider_id: 'SIM card provider'
+      auto_order_card: 'Auto order card'
+      sip_account_id: 'Sip account'
+      auth_key: 'Auth key'
+      state: 'State'
+      log: 'Log'
+      sim_number: 'SIM-No.'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New SIM card'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing SIM card'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      sim_card_provider_id:
+        label: 'SIM card provider'
+        hint: ''
+      sim_number:
+        label: 'SIM-Nr.'
+        hint: ''        
+      auto_order_card:
+        label: 'Auto order card'
+        hint: ''
+      sip_account_id:
+        label: 'Sip account'
+        hint: ''
+      auth_key:
+        label: 'Auth key'
+        hint: ''
+      state:
+        label: 'State'
+        hint: ''
+      log:
+        label: 'Log'
+        hint: ''
+      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 8fe2300..7a7e540 100644
--- a/config/locales/views/sip_accounts/de.yml
+++ b/config/locales/views/sip_accounts/de.yml
@@ -81,4 +81,7 @@ de:
       callforward_rules_act_per_sip_account: 
         label: 'Rufweiterleitungen gelten für das gesamte SIP-Account'
         hint: ''
-      submit: 'Absenden'
\ No newline at end of file
+      language_code: 
+        label: 'Sprache'
+        hint: ''
+      submit: 'Absenden'
diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml
index aa934e9..35d5456 100644
--- a/config/locales/views/sip_accounts/en.yml
+++ b/config/locales/views/sip_accounts/en.yml
@@ -81,4 +81,7 @@ en:
       hotdeskable: 
         label: 'Hotdeskable'
         hint: ''
-      submit: 'Submit'
\ No newline at end of file
+      language_code: 
+        label: 'Language'
+        hint: ''
+      submit: 'Submit'