aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-11-23 01:05:31 +0100
committerSem <sembrestels@riseup.net>2012-11-23 01:05:31 +0100
commit39bca929f875ca6e9bd422b112d1e48b717fa126 (patch)
treedb17973fedc2bb72ba25dbfde6513e5194c69be2 /languages
parent58eebf19ad92aa1c3247aaec4f61e1440a81523a (diff)
parent75bd3af84a76345928a831eecbc5d0f99f9fead4 (diff)
downloadelgg-39bca929f875ca6e9bd422b112d1e48b717fa126.tar.gz
elgg-39bca929f875ca6e9bd422b112d1e48b717fa126.tar.bz2
Merge branch 'full' of git://github.com/kevinjardine/Elgg-Event-Calendar
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index dfbe0cda4..b8fb918cc 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -329,7 +329,9 @@ You can visit the event page here:
'event_calendar:bbb_server_url' => "Big Blue Button server URL (must end with slash)",
'event_calendar:bbb_security_salt' => "Big Blue Button security salt",
'event_calendar:bbb_create_error' => "Error: unable to create BBB conference, message was: %s",
+ 'event_calendar:conference_create_error' => "Error: unable to create web conference.",
'event_calendar:bbb_settings_error' => "Error: must set conference URL and salt in plugin settings",
+ 'event_calendar:couldnotjoin' => "Error: unable to join conference.",
'event_calendar:join_conf_button' => "Join conference",
'event_calendar:poll_suffix' => "(poll)",