Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 28 insertions, 0 deletions

diff --git a/mod/openid_client/languages/en.php b/mod/openid_client/languages/en.php
new file mode 100644
index 000000000..4af3bf06a
--- /dev/null
+++ b/mod/openid_client/languages/en.php
@@ -0,0 +1,28 @@
+<?php

+/**

+ * OpenID client English language file

+ */

+

+$english = array(

+

+	'openid_client' => 'OpenID',

+	'openid_client:login:header' => 'Log in with',

+	'openid_client:login' => 'Login in with OpenID',

+	'openid_client:others' => 'Others...',

+	'openid_client:url' => 'OpenID URL',

+

+	'openid_client:create' => 'Create an account',

+	'openid_client:create:instructs' => 'Your account has been approved. We just need you to confirm or set the below information.',

+

+	'openid_client:success:register' => 'Your account has been created.',

+	'openid_client:error:bad_register' => 'Unable to create an account. Please contact a site administrator.',

+	'openid_client:error:bad_response' => 'Bad response from the OpenID server',

+	'openid_client:error:no_html' => 'An error occurred trying to contact %s',

+	'openid_client:warning:username_not_available' => 'The username %s is not available. Please pick another.',

+	'openid_client:warning:username_valid' => 'The username %s is not valid as this site. Please pick another.',

+	'openid_client:warning:email_not_available' => 'The email address %s is not available. Please pick another.',

+

+	'river:friend:user:openid' => "%s is now a friend with %s",

+);

+

+add_translation('en', $english);