summaryrefslogtreecommitdiff
path: root/config/locales/views/conferences/en.yml
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-25 10:27:27 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-25 10:27:27 +0100
commitdf6e17e48995f25e72509986f30700d778b179b6 (patch)
treef432c24b8e4ad81009188650dabfd99194883265 /config/locales/views/conferences/en.yml
parent11f186a118285fbc87a536af26730780a9ad01f5 (diff)
parentcce94a74aa5c9691f9b37cd9be5a6831f8063812 (diff)
Merge branch 'develop'5.1.2
Diffstat (limited to 'config/locales/views/conferences/en.yml')
-rw-r--r--config/locales/views/conferences/en.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/config/locales/views/conferences/en.yml b/config/locales/views/conferences/en.yml
index e11e9cb..9866122 100644
--- a/config/locales/views/conferences/en.yml
+++ b/config/locales/views/conferences/en.yml
@@ -27,6 +27,16 @@ en:
show: 'View'
create: 'New'
create_for: 'New conference for %{resource}'
+ index_members:
+ caller: 'Caller'
+ join_time: 'Join time'
+ talking: 'Talking'
+ flags: 'Flags'
+ can_hear: 'hear'
+ can_speak: 'speak'
+ moderator: 'moderator'
+ has_floor: 'floor'
+ video: 'video'
show:
page_title: 'Show conference'
name: 'Name'
@@ -38,6 +48,9 @@ en:
open_for_anybody: 'Open for anybody'
announce_new_member_by_name: 'Announce new member'
announce_left_member_by_name: 'Announce left member'
+ identifier: 'Identifier'
+ member_count: 'Members'
+ run_time: 'Run time'
actions:
confirm_destroy: 'Are you sure you want to delete this conference?'
destroy: 'Delete'