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

3 files changed, 120 insertions, 0 deletions

diff --git a/mod/beechat/languages/en.php b/mod/beechat/languages/en.php
new file mode 100644
index 000000000..38f03be98
--- /dev/null
+++ b/mod/beechat/languages/en.php
@@ -0,0 +1,45 @@
+<?php
+
+$en_array = array(
+		  'beechat:icons:home' => 'Home',
+
+		  'beechat:contacts:button' => 'Chat',
+
+		  'beechat:availability:available' => 'Available',
+		  'beechat:availability:dnd' => 'Do not disturb',
+		  'beechat:availability:away' => 'Away',
+		  'beechat:availability:xa' => 'Extended away',
+		  'beechat:availability:offline' => 'Offline',
+
+		  'beechat:connection:state:offline' => 'Offline',
+		  'beechat:connection:state:connecting' => 'Connecting...',
+		  'beechat:connection:state:authenticating' => 'Authenticating...',
+		  'beechat:connection:state:online' => 'Online',
+		  'beechat:connection:state:failed' => 'Failed',
+		  'beechat:connection:state:disconnecting' => 'Disconnecting...',
+
+		  'beechat:chat:self' => 'Me',
+		  'beechat:chat:composing' => ' is typing.',
+
+		  'beechat:box:minimize' => 'Minimize',
+		  'beechat:box:close' => 'Close',
+		  'beechat:box:showhide' => 'Show/Hide this chat window',
+		  'beechat:enabled' => 'Chat enabled',
+		  'beechat:disabled' => 'Chat disabled',
+		  'beechat:enablechat' => 'Enable chat',
+		  'beechat:disablechat' => 'Disable chat',
+		  'beechat:domain' => 'Chat domain',
+		  'beechat:groupdomain' => 'MUC domain',
+		  'beechat:chatroom' => 'Group chat',
+		  'beechat:dbname' => 'Database name',
+		  'beechat:dbhost' => 'Database host',
+		  'beechat:dbuser' => 'Database user',
+		  'beechat:dbuser' => 'notification:method:xmpp',
+		  'notification:method:xmpp' => 'Xmpp/Jabber',
+		  'beechat:dbpassword' => 'Database password',
+		  'beechat:xmlrpcip' => 'Ejabberd IP'
+		  );
+
+add_translation('en', $en_array);
+
+?>
diff --git a/mod/beechat/languages/es.php b/mod/beechat/languages/es.php
new file mode 100644
index 000000000..78f009ce9
--- /dev/null
+++ b/mod/beechat/languages/es.php
@@ -0,0 +1,43 @@
+<?php
+
+$es_array = array(
+		  'beechat:icons:home' => 'Home',
+
+		  'beechat:contacts:button' => 'Chat',
+
+		  'beechat:availability:available' => 'Disponible',
+		  'beechat:availability:dnd' => 'No molestar',
+		  'beechat:availability:away' => 'Fuera',
+		  'beechat:availability:xa' => 'Fuera bastante tiempo',
+		  'beechat:availability:offline' => 'Desconectado',
+
+		  'beechat:connection:state:offline' => 'Desconectado',
+		  'beechat:connection:state:connecting' => 'Conectando...',
+		  'beechat:connection:state:authenticating' => 'Iniciando...',
+		  'beechat:connection:state:online' => 'Conectado',
+		  'beechat:connection:state:failed' => 'Fallo',
+		  'beechat:connection:state:disconnecting' => 'Desconectando...',
+
+		  'beechat:chat:self' => 'Yo',
+		  'beechat:chat:composing' => ' esta escribiendo.',
+
+		  'beechat:box:minimize' => 'Minimizar',
+		  'beechat:box:close' => 'Cerrar',
+		  'beechat:box:showhide' => 'Mostrar/Ocultar esta ventana de chat',
+		  'beechat:enabled' => 'Chat activado',
+		  'beechat:disabled' => 'Chat desactivado',
+		  'beechat:enablechat' => 'Activar chat',
+		  'beechat:disablechat' => 'Desactivar chat',
+		  'beechat:domain' => 'Dominio Chat',
+		  'beechat:groupdomain' => 'Dominio MUC',
+		  'beechat:chatroom' => 'Chat del grupo',
+		  'beechat:dbname' => 'Database name',
+		  'beechat:dbhost' => 'Database host',
+		  'beechat:dbuser' => 'Database user',
+		  'beechat:dbpassword' => 'Database password',
+		  'beechat:xmlrpcip' => 'Ejabberd IP'
+		  );
+
+add_translation('es', $es_array);
+
+?>
diff --git a/mod/beechat/languages/fr.php b/mod/beechat/languages/fr.php
new file mode 100644
index 000000000..58b0eac3a
--- /dev/null
+++ b/mod/beechat/languages/fr.php
@@ -0,0 +1,32 @@
+<?php
+
+$fr_array = array(
+		  'beechat:icons:home' => 'Accueil',
+
+		  'beechat:contacts:button' => 'Chat',
+
+		  'beechat:availability:available' => 'Disponible',
+		  'beechat:availability:dnd' => 'Ne pas déranger',
+		  'beechat:availability:away' => 'Absent',
+		  'beechat:availability:xa' => 'Absence prolongée',
+		  'beechat:availability:offline' => 'Hors ligne',
+
+		  'beechat:connection:state:offline' => 'Hors ligne',
+		  'beechat:connection:state:connecting' => 'Connexion...',
+		  'beechat:connection:state:authenticating' => 'Authentification...',
+		  'beechat:connection:state:online' => 'En ligne',
+		  'beechat:connection:state:failed' => 'Échec',
+		  'beechat:connection:state:disconnecting' => 'Déconnexion...',
+
+		  'beechat:chat:self' => 'Moi',
+		  'beechat:chat:composing' => ' est en train d\'écrire.',
+
+		  'beechat:box:minimize' => 'Diminuer',
+		  'beechat:box:close' => 'Fermer',
+		  'beechat:box:showhide' => 'Montrer/Cacher cette fenêtre de chat'
+
+		  );
+
+add_translation('fr', $fr_array);
+
+?>