Fixed a merging conflict.

Merge branch 'switchboard' into develop

Conflicts:
	app/models/sip_account.rb

4 files changed, 200 insertions, 0 deletions

diff --git a/config/locales/views/switchboard_entries/de.yml b/config/locales/views/switchboard_entries/de.yml
new file mode 100644
index 0000000..41804b5
--- /dev/null
+++ b/config/locales/views/switchboard_entries/de.yml
@@ -0,0 +1,55 @@
+de:
+  switchboard_entries:
+    name: 'Switchboard-Eintrag'
+    controller:
+      successfuly_created: 'Switchboard-Eintrag wurde angelegt.'
+      successfuly_updated: 'Switchboard-Eintrag wurde aktualisiert.'
+      successfuly_destroyed: 'Switchboard-Eintrag wurde gelöscht.'
+    index:
+      page_title: 'Liste aller Switchboard-Einträge'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'SIP-Account'
+      name: 'Name'
+      position: 'Position'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Switchboard-Eintrag'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Switchboard-Eintrag neu anlegen für %{resource}'
+    show:
+      page_title: 'Switchboard-Eintrag bearbeiten'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'SIP-Account'
+      name: 'Name'
+      position: 'Position'
+      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: 'Switchboard-Eintrag neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Switchboard-Eintrag bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      switchboard_id:
+        label: 'Switchboard'
+        hint: ''
+      sip_account_id:
+        label: 'SIP-Account'
+        hint: ''
+      name:
+        label: 'Name'
+        hint: ''
+      position:
+        label: 'Position'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/switchboard_entries/en.yml b/config/locales/views/switchboard_entries/en.yml
new file mode 100644
index 0000000..71f2fe4
--- /dev/null
+++ b/config/locales/views/switchboard_entries/en.yml
@@ -0,0 +1,55 @@
+en:
+  switchboard_entries:
+    name: 'Switchboardentry'
+    controller:
+      successfuly_created: 'Successfully created Switchboardentry.'
+      successfuly_updated: 'Successfully updated Switchboardentry.'
+      successfuly_destroyed: 'Successfully destroyed Switchboardentry.'
+    index:
+      page_title: 'Listing Switchboardentry'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'Sip account'
+      name: 'Name'
+      position: 'Position'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Switchboardentry?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Switchboardentry for %{resource}'
+    show:
+      page_title: 'Show Switchboardentry'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'Sip account'
+      name: 'Name'
+      position: 'Position'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Switchboardentry'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Switchboardentry'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      switchboard_id:
+        label: 'Switchboard'
+        hint: ''
+      sip_account_id:
+        label: 'Sip account'
+        hint: ''
+      name:
+        label: 'Name'
+        hint: ''
+      position:
+        label: 'Position'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml
new file mode 100644
index 0000000..0bec502
--- /dev/null
+++ b/config/locales/views/switchboards/de.yml
@@ -0,0 +1,45 @@
+de:
+  switchboards:
+    name: 'Switchboard'
+    controller:
+      successfuly_created: 'Switchboard wurde angelegt.'
+      successfuly_updated: 'Switchboard wurde aktualisiert.'
+      successfuly_destroyed: 'Switchboard wurde gelöscht.'
+    index:
+      page_title: 'Liste aller Switchboards'
+      name: 'Name'
+      user_id: 'User'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Switchboard'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Switchboard neu anlegen für %{resource}'
+    show:
+      page_title: 'Switchboard bearbeiten'
+      name: 'Name'
+      user_id: 'User'
+      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: 'Switchboard neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Switchboard bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      user_id:
+        label: 'User'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/switchboards/en.yml b/config/locales/views/switchboards/en.yml
new file mode 100644
index 0000000..250d5de
--- /dev/null
+++ b/config/locales/views/switchboards/en.yml
@@ -0,0 +1,45 @@
+en:
+  switchboards:
+    name: 'Switchboard'
+    controller:
+      successfuly_created: 'Successfully created Switchboard.'
+      successfuly_updated: 'Successfully updated Switchboard.'
+      successfuly_destroyed: 'Successfully destroyed Switchboard.'
+    index:
+      page_title: 'Listing Switchboard'
+      name: 'Name'
+      user_id: 'User'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Switchboard?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Switchboard for %{resource}'
+    show:
+      page_title: 'Show Switchboard'
+      name: 'Name'
+      user_id: 'User'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Switchboard'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Switchboard'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      user_id:
+        label: 'User'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file