Merge branch 'emberjs' into develop

2 files changed, 15 insertions, 5 deletions

diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml
index e73b100..1f66b9f 100644
--- a/config/locales/views/switchboards/de.yml
+++ b/config/locales/views/switchboards/de.yml
@@ -12,6 +12,7 @@ de:
       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'
@@ -26,6 +27,7 @@ de:
       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'
@@ -50,11 +52,14 @@ de:
         hint: ''
       reload_interval:
         label: 'Reload Interval'
-        hint: 'Milliseconds. nil = no reload'
+        hint: 'Millisekunden. nil = kein reload'
       show_avatars:
-        label: 'Show avatars'
+        label: 'Avatare anzeigen'
         hint: ''
       entry_width:
-        label: 'Entry width'
-        hint: ''
+        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 8489d28..fd160b5 100644
--- a/config/locales/views/switchboards/en.yml
+++ b/config/locales/views/switchboards/en.yml
@@ -12,6 +12,7 @@ en:
       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'
@@ -25,7 +26,8 @@ en:
       user_id: 'User'
       reload_interval:: 'Reload Interval'
       show_avatars: 'Show avatars'
-      entry_width: 'Entry width'      
+      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'
@@ -57,4 +59,7 @@ en:
       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