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

8 files changed, 168 insertions, 0 deletions

diff --git a/mod/dokuwiki/languages/ca.php b/mod/dokuwiki/languages/ca.php
new file mode 100644
index 000000000..ca2c0df1e
--- /dev/null
+++ b/mod/dokuwiki/languages/ca.php
@@ -0,0 +1,18 @@
+<?php
+$language = array (
+  'dokuwiki:wiki' => 'Wiki',
+  'dokuwiki:title' => 'Wikis',
+  'item:object:dokuwiki' => 'Wikis',
+  'dokuwiki:wikifrom' => 'la wiki de %s',
+  'dokuwiki:pages' => '%s pàgines',
+  'dokuwiki:dokuwiki' => 'Wiki',
+  'dokuwiki:group' => 'Wiki del group',
+  'dokuwiki:userwiki' => 'La meva Wiki',
+  'dokuwiki:sidebar' => 'Navegació wiki',
+  'groups:enabledokuwiki' => 'Activar la wiki del grup',
+  'groups:enabledokuwiki_frontpage' => 'Mostra la pàgina d\'inici de la wiki a la pàgina principal del grup (només si la wiki està activada)',
+  'groups:enabledokuwiki_frontsidebar' => 'Mostra la barra lateral de la wiki a la pàgina principal del grup (només si la wiki està activada)',
+  'dokuwiki' => 'Wikis',
+  'dokuwiki:river:modified' => '%s ha modificat la pàgina %s el %s',
+);
+add_translation("ca", $language);
\ No newline at end of file
diff --git a/mod/dokuwiki/languages/de.php b/mod/dokuwiki/languages/de.php
new file mode 100755
index 000000000..e951d0b41
--- /dev/null
+++ b/mod/dokuwiki/languages/de.php
@@ -0,0 +1,21 @@
+<?php
+
+// Mit dem translation browser generiert 
+
+$german = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "GruppenWiki" , 
+	 'dokuwiki:userwiki'  =>  "Mein Wiki" , 
+	 'dokuwiki'  =>  "Wikis" , 
+	 'item:object:dokuwiki'  =>  "Wikis" , 
+	 'dokuwiki:title'  =>  "Wikis" , 
+	 'dokuwiki:wikifrom'  =>  "Wiki von %s" , 
+	 'dokuwiki:pages'  =>  "Seiten von %s" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'groups:enabledokuwiki'  =>  "GruppenWiki einrichten" , 
+	 'dokuwiki:river:modified'  =>  "%s hat die Seite %s im %s bearbeitet"
+); 
+
+add_translation('de', $german); 
+
+?>
\ No newline at end of file
diff --git a/mod/dokuwiki/languages/en.php b/mod/dokuwiki/languages/en.php
new file mode 100755
index 000000000..20b7cb656
--- /dev/null
+++ b/mod/dokuwiki/languages/en.php
@@ -0,0 +1,32 @@
+<?php

+/**

+         * Elgg spotlight lorea

+         * 

+         * @package

+         * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

+         * @author lorea

+         * @copyright lorea

+         * @link http://lorea.cc

+         */

+

+	$english = array(

+		"dokuwiki:wiki"=>'Wiki',

+		"dokuwiki:title"=>'Wikis',

+		"item:object:dokuwiki"=>'Wikis',

+		"dokuwiki:wikifrom"=>'%s wiki',

+		"dokuwiki:pages"=>'%s pages',

+		"dokuwiki:dokuwiki"=>'Wiki',

+		"dokuwiki:group"=>'Group wiki',

+		"dokuwiki:userwiki"=>'My Wiki',

+		"dokuwiki:sidebar" => 'Wiki navigation',

+		"groups:enabledokuwiki"=>'Enable group wiki',

+		"groups:enabledokuwiki_frontpage"=>'Show main wiki page in the group front page (only if wiki is enabled)',

+		"groups:enabledokuwiki_frontsidebar"=>'Show wiki sidebar in the group front page (only if wiki is enabled)',

+		"dokuwiki"=>'Wikis',

+

+		"dokuwiki:river:modified"=>'%s modified page %s on %s',

+	);

+	

+	add_translation("en",$english);

+

+?>

diff --git a/mod/dokuwiki/languages/es.php b/mod/dokuwiki/languages/es.php
new file mode 100644
index 000000000..613d79ba6
--- /dev/null
+++ b/mod/dokuwiki/languages/es.php
@@ -0,0 +1,18 @@
+<?php
+$language = array (
+  'dokuwiki:wiki' => 'Wiki',
+  'dokuwiki:title' => 'Wikis',
+  'item:object:dokuwiki' => 'Wikis',
+  'dokuwiki:wikifrom' => 'Wiki %s',
+  'dokuwiki:pages' => 'páginas %s',
+  'dokuwiki:dokuwiki' => 'Wiki',
+  'dokuwiki:group' => 'Wiki del grupo',
+  'dokuwiki:userwiki' => 'Mi wiki',
+  'dokuwiki:sidebar' => 'Navegación wiki',
+  'groups:enabledokuwiki' => 'Activar wiki del grupo',
+  'groups:enabledokuwiki_frontpage' => 'Muestra la página principal de la wiki en la página principal del grupo (sólo si la wiki está activada)',
+  'groups:enabledokuwiki_frontsidebar' => 'Muestra la barra lateral de wiki en la página principal del grupo (sólo si la wiki está activada)',
+  'dokuwiki' => 'Wikis',
+  'dokuwiki:river:modified' => '%s ha modificado la página %s en %s',
+);
+add_translation("es", $language);
\ No newline at end of file
diff --git a/mod/dokuwiki/languages/fr.php b/mod/dokuwiki/languages/fr.php
new file mode 100644
index 000000000..dcaa14c00
--- /dev/null
+++ b/mod/dokuwiki/languages/fr.php
@@ -0,0 +1,12 @@
+<?php
+
+// Generate By translationbrowser. 
+
+$french = array( 
+	 'dokuwiki:userwiki'  =>  "Mon wiki" , 
+	 'groups:enabledokuwiki'  =>  "Habiliter le wiki groupe"
+); 
+
+add_translation('fr', $french); 
+
+?>
\ No newline at end of file
diff --git a/mod/dokuwiki/languages/gl.php b/mod/dokuwiki/languages/gl.php
new file mode 100644
index 000000000..ba67b6f32
--- /dev/null
+++ b/mod/dokuwiki/languages/gl.php
@@ -0,0 +1,23 @@
+<?php
+
+// Xerado por translationbrowser 
+
+$galician = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki do grupo" , 
+	 'dokuwiki:userwiki'  =>  "A miña Wiki" , 
+	 'dokuwiki'  =>  "Wikis" , 
+	 'item:object:dokuwiki'  =>  "Wikis" , 
+	 'dokuwiki:title'  =>  "Wikis" , 
+	 'dokuwiki:wikifrom'  =>  "%s wiki" , 
+	 'dokuwiki:pages'  =>  "%s páxinas" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'groups:enabledokuwiki'  =>  "Habilitar wiki do grupo" , 
+	 'dokuwiki:river:modified'  =>  "%s modificou a páxina %s en %s" , 
+	 'groups:enabledokuwiki_frontpage'  =>  "Amosa la wiki na portada do grupo" , 
+	 'groups:enabledokuwiki_frontsidebar'  =>  "Amosa la barra da wiki na portada do grupo"
+); 
+
+add_translation('gl', $galician); 
+
+?>
\ No newline at end of file
diff --git a/mod/dokuwiki/languages/pl.php b/mod/dokuwiki/languages/pl.php
new file mode 100755
index 000000000..e43e14526
--- /dev/null
+++ b/mod/dokuwiki/languages/pl.php
@@ -0,0 +1,21 @@
+<?php
+
+// Generate By translationbrowser. 
+
+$polish = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:title'  =>  "Wiki" , 
+	 'item:object:dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:wikifrom'  =>  "%s wiki" , 
+	 'dokuwiki:pages'  =>  "%s strony" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki Grupy" , 
+	 'dokuwiki:userwiki'  =>  "Twoje Wiki" , 
+	 'groups:enabledokuwiki'  =>  "Włącz wiki grupy" , 
+	 'dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:river:modified'  =>  "%s modyfikacja strony %s na %s"
+); 
+
+add_translation('pl', $polish); 
+
+?>
\ No newline at end of file
diff --git a/mod/dokuwiki/languages/pt.php b/mod/dokuwiki/languages/pt.php
new file mode 100644
index 000000000..4c067cd52
--- /dev/null
+++ b/mod/dokuwiki/languages/pt.php
@@ -0,0 +1,23 @@
+<?php
+
+// Gerado pelo browser de tradução. 
+
+$portuguese = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:title'  =>  "Wikis" , 
+	 'dokuwiki:wikifrom'  =>  "%s Wiki" , 
+	 'dokuwiki:pages'  =>  "%s páginas" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki" , 
+	 'dokuwiki:userwiki'  =>  "Minha Wiki" , 
+	 'groups:enabledokuwiki'  =>  "Habilitar Wiki do grupo" , 
+	 'dokuwiki'  =>  "Wikis" , 
+	 'dokuwiki:river:modified'  =>  "%s modificou a página %s em %s" , 
+	 'item:object:dokuwiki'  =>  "Wikis" , 
+	 'groups:enabledokuwiki_frontpage'  =>  "Mostrar a página wiki principal na página principal do grupo (só se a wiki estiver habilitada)" , 
+	 'groups:enabledokuwiki_frontsidebar'  =>  "Mostrar a barra lateral de wiki na página principal do grupo (só se a wiki estiver habilitada)"
+); 
+
+add_translation('pt', $portuguese); 
+
+?>