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, 32 insertions, 0 deletions

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);

+

+?>