Commits

caedes committed 201b6da
  • Participants
  • Parent commits de93a38

Comments (0)

Files changed (94)

-4c22b23e35098306f70ba6a79c9ebb34b068568b elgg/mod/event_calendar
+757d4088f06667996098788d949e8ad944a2fb0a elgg/mod/event_calendar

File elgg/actions/comments/add.php

 			
 	notify_user($entity->owner_guid,
 				$user->guid,
-				elgg_echo('generic_comment:email:subject', get_user_language(get_user($entity->owner_guid), false)),
+				elgg_echo('generic_comment:email:subject'),
 				sprintf(
-					elgg_echo('generic_comment:email:body', get_user_language(get_user($entity->owner_guid), false)),
+					elgg_echo('generic_comment:email:body'),
 					$entity->title,
 					$user->name,
 					$comment_text,

File elgg/engine/lib/notification.php

 	}
 }
 
-/*
- * Returns the language of $user or the site's one if the user has no
- * predefined language.
- *
- * If the translation is not already loaded we load it as well.
- *
- * Defaults to English if others fail.
- *
- * @author Lorea.cc
- *
- */
-# if (!function_exists("get_user_language")) {
-function get_user_language($user, $mod) {
-    global $CONFIG;
-
-    if (!empty($user->language)) {
-        $lang = $user->language;
-    } else if (!empty($CONFIG->language)) {
-        $lang = $CONFIG->language;
-    }
-    if (!empty($lang)) {
-        if (empty($CONF->translations[$lang]) && $mod) {
-            register_translations($CONFIG->pluginspath.$mod."/languages/", true);
-        }
-        return $lang;
-    }
-
-    return 'en';
-}
-# }
-
 // Register a startup event
 register_elgg_event_handler('init','system','notification_init',0);
 register_elgg_event_handler('create','object','object_notifications');

File elgg/mod/blog/languages/ca.php

 	 'blog:yourfriends'  =>  "últims blocs de les teves amistats" , 
 	 'blog:yourgroups' => "últims blocs dels teus grups" ,
 	 'blog:everyone'  =>  "Tots els blocs" , 
-	 'blog:newpost'  =>  "Nova entrada" , 
+	 'blog:newpost'  =>  "Afegir entrada al bloc" , 
 	 'blog:via'  =>  "A través del bloc" , 
 	 'blog:read'  =>  "Llegir el bloc" , 
 	 'blog:addpost'  =>  "Escriure una entrada al bloc" , 
 	 'blog:preview:description'  =>  "Això és una previsualització sense desar de la teva entrada al bloc." , 
 	 'blog:preview:description:link'  =>  "Per continuar editant o desar la teva entrada, prem aquí." , 
 	 'blog:enableblog'  =>  "Activar el bloc del grup" , 
-	 'blog:group'  =>  "Bloc" , 
+	 'blog:group'  =>  "Bloc del grup" , 
 	 'blog:none'  =>  "No existeix cap bloc" , 
 	 'blog:river:created'  =>  "%s ha escrit" , 
 	 'blog:river:updated'  =>  "%s ha actualitzat" , 
 	 'blog:posted'  =>  "S'ha inserit correctament l'entrada al teu bloc." , 
 	 'blog:deleted'  =>  "S'ha esborrat correctament l'entrada al bloc." , 
 	 'blog:widget:description'  =>  "Aquest giny mostra les últimes entrades al bloc." , 
-	 'blog:moreblogs'  =>  "Més entrades" , 
+	 'blog:moreblogs'  =>  "Mostrar més entrades al bloc" , 
 	 'blog:numbertodisplay'  =>  "Nombre d'entrades al bloc a mostrar" , 
 	 'blog:error'  =>  "Alguna cosa no ha anat bé. Siusplau, torna-ho a provar." , 
 	 'blog:save:failure'  =>  "No es pot desar l'entrada del bloc. Siusplau. torna-ho a provar." , 

File elgg/mod/blog/languages/en.php

 			'blog:preview:description:link' => 'To continue editing or save your post, click here.',
 	
 			'groups:enableblog' => 'Enable group blog',
-			'blog:group' => 'Blog',
+			'blog:group' => 'Group blog',
 			'blog:nogroup' => 'This group does not have any blog posts yet',
 			'blog:noblog:user' => 'This user does not have any blog posts yet',
 			'blog:more' => 'More blog posts',

File elgg/mod/blog/languages/es.php

 	 'blog:blank'  =>  "Tienes que rellenar el título y el cuerpo para poder enviarla" , 
 	 'blog:notfound'  =>  "No triunfas. No encontramos esta entrada. Prueba con otra búsqueda." , 
 	 'blog:notdeleted'  =>  "Ups!, no podemos borrar esto" , 
-	 'blog:newpost'  =>  "Nueva entrada" , 
+	 'blog:newpost'  =>  "Nueva nota en el blog" , 
 	 'blog:via'  =>  "vía blogs" , 
 	 'blog:enableblog'  =>  "Habilitar blog del grupo" , 
-	 'blog:group'  =>  "Blog" , 
+	 'blog:group'  =>  "Blog del grupo" , 
 	 'blog:nogroup'  =>  "Este grupo todavía no ha publicado ninguna entrada en su blog." , 
 	 'blog:noblog:user'  =>  "Este habitante todavía no ha publicado ninguna entrada en su blog." , 
+	 'blog:group'  =>  "Blog del grupo" , 
 	 'blog:error'  =>  "Algo ha ido mal, por favor inténtalo de nuevo." , 
 	 'blog:none'  =>  "No se han publicado entradas" , 
 	 'blog:widget:description'  =>  "Este elemento muestra tus últimas entradas en el blog" , 

File elgg/mod/blog/languages/fr.php

 	 'blog:preview:description'  =>  "ceci est une prévisualisation non enregistrée de ton post" , 
 	 'blog:preview:description:link'  =>  "pour continuer à éditer ou pour enregistrer clique ici" , 
 	 'blog:enableblog'  =>  "activer le blog du groupe" , 
-	 'blog:group'  =>  "Blog" , 
+	 'blog:group'  =>  "blog du groupe" , 
 	 'blog:river:created'  =>  "%s a écrit" , 
 	 'blog:river:updated'  =>  "%s a mis à jour" , 
 	 'blog:river:posted'  =>  "%s a posté" , 
 
 add_translation('fr', $french); 
 
-?>
+?>

File elgg/mod/blog/languages/gl.php

 	 'blog:newpost'  =>  "Nova nota no blogue" , 
 	 'blog:via'  =>  "vía blogues" , 
 	 'blog:enableblog'  =>  "Habilitar blogue no grupo" , 
-	 'blog:group'  =>  "Blogue" , 
+	 'blog:group'  =>  "Blogue do grupo" , 
 	 'blog:error'  =>  "Algo foi mal, por favor volve tentalo." , 
 	 'blog:none'  =>  "Non se publicaron entradas" , 
 	 'blog:widget:description'  =>  "Este elemento amosa as túas últimas entradas no blogue" , 
 
 add_translation('gl', $galician); 
 
-?>
+?>

File elgg/mod/blog/languages/it.php

 	 'blog:preview:description'  =>  "Questo è un anteprima del tuo post non ancora salvata." , 
 	 'blog:preview:description:link'  =>  "Per continuare a modificare o salvare il tuo post, clicca qui." , 
 	 'blog:enableblog'  =>  "Abilita blog di gruppo" , 
-	 'blog:group'  =>  "Blog" , 
+	 'blog:group'  =>  "Blog di gruppo" , 
 	 'blog:river:created'  =>  "%s ha scritto " , 
 	 'blog:river:updated'  =>  "%s ha aggiornato" , 
 	 'blog:river:posted'  =>  "%s ha inserito" , 
 
 add_translation('it', $italian); 
 
-?>
+?>

File elgg/mod/blog/languages/pt.php

 	 'blog:notfound'  =>  "Desculpe, não foi possível encontrar o artigo especificado no blog." , 
 	 'blog:notdeleted'  =>  "Desculpe, não foi possível excluir esse artigo do blog." , 
 	 'blog:enableblog'  =>  "Ativar blog do grupo" , 
-	 'blog:group'  =>  "Blog" , 
+	 'blog:group'  =>  "Blog do grupo" , 
 	 'blog:none'  =>  "Não existe nenhum blog" , 
 	 'blog:widget:description'  =>  "Este widget mostra suas últimas publicações no blog." , 
 	 'blog:moreblogs'  =>  "Mais publicações do blog" , 
 
 add_translation('pt', $portuguese); 
 
-?>
+?>

File elgg/mod/blog/views/default/blog/groupprofile_blog.php

  */
 
 if ($vars['entity']->blog_enable != 'no') {
-	$vars['title'] = elgg_echo("blog:group");
-	$vars['more_link'] = "{$vars['url']}pg/blog/owner/group:{$vars['entity']->guid}/";
-	$vars['more_text'] = elgg_echo('blog:moreblogs');
+?>
 
-	$add_link = $vars['url']."pg/blog/new/group:".$vars['entity']->guid."/";
-	$link_text = elgg_echo("blog:newpost");
-	$vars['buttons'] = array($add_link => $link_text);
+<div class="group_widget">
+<h2><a href="<?php echo $vars['url']; ?>pg/blog/group:<?php echo $vars['entity']->guid ?>"><?php echo elgg_echo("blog:group"); ?></a></h2>
+<?php 
+	if($vars['entity']->isMember()){
+		$add_link = $vars['url']."pg/blog/group:".$vars['entity']->guid."/new/";
+		$link_text = elgg_echo("blog:newpost");
+		echo "<a class=\"add_topic_button\" style=\"float:right;margin-top:-30px;margin-right:10px\" href=\"$add_link\">$link_text</a>";
+	}
+?>
 
+<?php
 	$context = get_context();
 	set_context('search');
-	$vars['content'] = elgg_list_entities(array('types' => 'object',
+	$content = elgg_list_entities(array('types' => 'object',
 										'subtypes' => 'blog',
 										'container_guid' => $vars['entity']->guid,
 										'limit' => 5,
 										'pagination' => FALSE));
 	set_context($context);
 
-	if (!$vars['content']) {
-		$vars['content'] = "<div class=\"forum_latest\">" . elgg_echo("blog:nogroup") . "</div>";
+    if ($content) {
+		echo $content;
+
+		$more_url = "{$vars['url']}pg/blog/owner/group:{$vars['entity']->guid}/";
+		echo "<div class=\"forum_latest\"><a href=\"{$more_url}\">" . elgg_echo('blog:more') . "</a></div>";
+	} else {
+		echo "<div class=\"forum_latest\">" . elgg_echo("blog:nogroup") . "</div>";
 	}
-	echo elgg_view('groups/group_widget',$vars);
-	unset($vars['more_text']);
-}
+?>
+</div>
+<?php
+}

File elgg/mod/bookmarks/languages/ca.php

 
 $catalan = array( 
 	 'bookmarks'  =>  "Adreces d'interès" , 
-	 'bookmarks:add'  =>  "Nova adreça d'interès" , 
+	 'bookmarks:add'  =>  "Afegireix una adreça d'interès" , 
 	 'bookmarks:read'  =>  "adreces d'interès de %s" , 
 	 'bookmarks:friends'  =>  "Adreces d'interès de les amistats" , 
 	 'bookmarks:everyone'  =>  "Totes les adreces d'interès" , 
 	 'bookmarks:river:annotate'  =>  "un comentari per aquest element marcat com adreça d'interés" , 
 	 'bookmarks:river:item'  =>  "un element" , 
 	 'item:object:bookmarks'  =>  "elements marcats com adreces d'interés" , 
-	 'bookmarks:group'  =>  "Adreces" , 
+	 'bookmarks:group'  =>  "Grup d'adreces d'interés" , 
 	 'bookmarks:enablebookmarks'  =>  "Activa l'agrupació d'adreces d'interés" , 
 	 'bookmarks:widget:description'  =>  "Aquest giny mostra les darreres adreces d'interés" , 
 	 'bookmarks:bookmarklet:description'  =>  "El marcador dinàmic de les adreces d'interès et permet compartir qualsevol recurs que trobis a la xarxa amb les teves amistats, o simplement marcar-los per a tu mateix/a. Utilitza'ls, simplement arrossega el botó a la teva barra de direcció:" , 
 	 'bookmarks:save:success'  =>  "S'ha afegit correctament." , 
 	 'bookmarks:delete:success'  =>  "S'ha esborrat correctament." , 
 	 'bookmarks:save:failed'  =>  "No es pot desar l'adreça interés. Siusplau, torna-ho a provar." , 
-	 'bookmarks:delete:failed'  =>  "No es pot esborrar l'adreça d'interés. Siusplau, torna-ho a provar.",
-	 'container' => "On ho vols guardar?",
-	 'container:myprofile' => "Al meu perfil"
+	 'bookmarks:delete:failed'  =>  "No es pot esborrar l'adreça d'interés. Siusplau, torna-ho a provar."
 ); 
 
 add_translation('ca', $catalan); 
 
-?>
+?>

File elgg/mod/bookmarks/languages/en.php

 
 			'item:object:bookmarks' => 'Bookmarked items',
 
-			'bookmarks:group' => 'Bookmarks',
+			'bookmarks:group' => 'Group bookmarks',
 			'groups:enablebookmarks' => 'Enable group bookmarks',
 			'bookmarks:nogroup' => 'This group does not have any bookmarks yet',
 
 
 			'bookmarks:save:failed' => "Your bookmarked item could not be saved. Make sure you've entered a title and address and then try again.",
 			'bookmarks:delete:failed' => "Your bookmarked item could not be deleted. Please try again.",
-		/**
-		 * Miscelaneous
-		 */
-			'container' => "Where do you want to store it?",
-			'container:myprofile' => "In my profile",
 
 
 	);
 
 	add_translation("en",$english);
 
-?>
+?>

File elgg/mod/bookmarks/languages/es.php

 
 $spanish = array( 
 	 'bookmarks'  =>  "Enlaces" , 
-	 'bookmarks:add'  =>  "A&ntilde;adir un enlace" , 
+	 'bookmarks:add'  =>  "A&ntilde;adir a enlaces" , 
 	 'bookmarks:read'  =>  "Enlaces marcados" , 
 	 'bookmarks:friends'  =>  "Enlaces de tus amigxs" , 
 	 'bookmarks:everyone'  =>  "Todos los enlaces" , 
 	 'bookmarks:new'  =>  "Un nuevo enlace marcado" , 
 	 'bookmarks:via'  =>  "vía enlaces" , 
 	 'bookmarks:numbertodisplay'  =>  "Número de enlaces a mostrar" , 
-	 'bookmarks:group'  =>  "Enlaces" , 
+	 'bookmarks:group'  =>  "Enlaces del grupo" , 
 	 'bookmarks:enablebookmarks'  =>  "Habilitar enlaces de grupos" , 
-	 'bookmarks:morebookmarks'  =>  "Más enlaces",
-	 'container' => "¿Dónde quieres guardarlo?",
-	 'container:myprofile' => "En mi perfil",
+	 'bookmarks:morebookmarks'  =>  "Más enlaces"
 ); 
 
 add_translation('es', $spanish); 
 
-?>
+?>

File elgg/mod/bookmarks/languages/gl.php

 	 'bookmarks:new'  =>  "Un novo enlace marcado" , 
 	 'bookmarks:via'  =>  "vía enlaces" , 
 	 'bookmarks:numbertodisplay'  =>  "Número de enlaces a mostrar" , 
-	 'bookmarks:group'  =>  "Enlaces" , 
+	 'bookmarks:group'  =>  "Enlaces do grupo" , 
 	 'bookmarks:enablebookmarks'  =>  "Habilita-los enlaces de grupos" , 
 	 'bookmarks:morebookmarks'  =>  "Máis enlaces"
 ); 
 
 add_translation('gl', $galician); 
 
-?>
+?>

File elgg/mod/bookmarks/languages/it.php

 	 'bookmarks:delete:confirm'  =>  "Sei sicuro di voler cancellare questa  risorsa?" , 
 	 'bookmarks:visit'  =>  "Visita le risorse" , 
 	 'bookmarks:river:annotate'  =>  "postato un commento su questo articolo dei preferiti " , 
-	 'bookmarks:group'  =>  "Preferiti" , 
+	 'bookmarks:group'  =>  "Preferiti di gruppo" , 
 	 'bookmarks:widget:description'  =>  "Questo widget è stato progettato per il vostro cruscotto e vi mostrerà le ultime nella tua casella di posta segnalibri. " , 
 	 'bookmarks:bookmarklet:description'  =>  "Il bookmarklet segnalibri \"PREFERITI\" ti permette di condividere tutte le risorse che trovate sul web con i vostri amici, o semplicemente per te. Per poterlo utilizzare, è sufficiente trascinare ilseguente pulsante  link del tuo browser:" , 
 	 'bookmarks:bookmarklet:descriptionie'  =>  "Se si utilizza Internet Explorer, sarà necessario fare clic destro del mouse sull'icona bookmarklet, selezionare 'Aggiungi ai preferiti', e poi la barra dei collegamenti " , 
 
 add_translation('it', $italian); 
 
-?>
+?>

File elgg/mod/bookmarks/languages/pt.php

 	 'bookmarks:this:group'  =>  "Favorito em %s" , 
 	 'bookmarks:bookmarklet:group'  =>  "Obter bookmarklet do grupo" , 
 	 'bookmarks:morebookmarks'  =>  "Mais favoritos" , 
-	 'bookmarks:group'  =>  "Favoritos" , 
+	 'bookmarks:group'  =>  "Favoritos do grupo" , 
 	 'bookmarks:enablebookmarks'  =>  "Habilitar favoritos do grupo"
 ); 
 
 add_translation('pt', $portuguese); 
 
-?>
+?>

File elgg/mod/bookmarks/views/default/bookmarks/form.php

 			$address = $vars['entity']->address;
 			$tags = $vars['entity']->tags;
 			$access_id = $vars['entity']->access_id;
-			$container_guid = $vars['entity']->container_guid;
 			$shares = $vars['entity']->shares;
 			$owner = $vars['entity']->getOwnerEntity();
 			$highlight = 'default';
 			$tags = array();
 
 			if ($vars['container_guid'] && get_entity($vars['container_guid']) instanceof ElggGroup) {
-				$container_guid = $vars['container_guid'];
-				$access_id = get_entity($container_guid)->access_id;
+				$access_id = get_entity($vars['container_guid'])->access_id;
 			}
 			elseif (defined('ACCESS_DEFAULT'))
 				$access_id = ACCESS_DEFAULT;
 				}
 			
 			?>
-			<?php
-			if(empty($container_guid) && $groups = get_users_membership(get_loggedin_userid())){
-			?>
-		<p>
-			<label>
-				<?php	echo elgg_echo('container'); ?>
-				<?php	echo elgg_view('input/container', array('internalname' => 'container_guid',
-					'candidates' => array_merge(array(get_loggedin_user()), $groups),
-					'value' => get_loggedin_userid()));
-				?>
-			</label>
-		</p>
-			<?php } else { ?>
-
-			<input type="hidden" name="container_guid" value="<?php echo !empty($container_guid) ? $vars['container_guid'] : get_loggedin_userid(); ?>" />
-
-			<?php } ?>
 		<p>
 			<label>
 				<?php 	echo elgg_echo('access'); ?>
 			</label>
 		</p>
 		<p>
+			<?php echo $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : ""; ?>
 			<input type="hidden" name="bookmark_guid" value="<?php echo $guid; ?>" />
 			<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
 		</p>

File elgg/mod/bookmarks/views/default/bookmarks/groupprofile_bookmarks.php

  */
 
 if ($vars['entity']->bookmarks_enable != 'no') {
-	$vars['title'] = elgg_echo("bookmarks:group");
-	$vars['more_link'] = "{$vars['url']}pg/bookmarks/group:{$vars['entity']->guid}/";
+?>
 
-	$add_link = $vars['url']."pg/bookmarks/add/group:".$vars['entity']->guid."/";
-	$link_text = elgg_echo("bookmarks:add");
-	$vars['buttons'] = array($add_link => $link_text);
+<div class="group_widget">
+<h2><a href="<?php echo $vars['url']; ?>pg/bookmarks/group:<?php echo $vars['entity']->guid ?>/items"><?php echo elgg_echo("bookmarks:group"); ?></a></h2>
 
+<?php 
+	if($vars['entity']->isMember()){
+		$add_link = $vars['url']."pg/bookmarks/group:".$vars['entity']->guid."/add";
+		$link_text = elgg_echo("bookmarks:add");
+		echo "<a class=\"add_topic_button\" style=\"float:right;margin-top:-30px;margin-right:10px\" href=\"$add_link\">$link_text</a>";
+	}
+?>
+<?php
 	$context = get_context();
 	set_context('search');
-	$vars['content'] = elgg_list_entities(array('types' => 'object',
+	$content = elgg_list_entities(array('types' => 'object',
 										'subtypes' => 'bookmarks',
 										'container_guid' => $vars['entity']->guid,
 										'limit' => 5,
 										'pagination' => FALSE));
 	set_context($context);
 
-	if (!$vars['content']) {
-		$vars['content'] = "<div class=\"forum_latest\">" . elgg_echo("bookmarks:nogroup") . "</div>";
+    if ($content) {
+		echo $content;
+
+		$more_url = "{$vars['url']}pg/bookmarks/owner/group:{$vars['entity']->guid}/";
+		echo "<div class=\"forum_latest\"><a href=\"$more_url\">" . elgg_echo('bookmarks:more') . "</a></div>";
+	} else {
+		echo "<div class=\"forum_latest\">" . elgg_echo("bookmarks:nogroup") . "</div>";
 	}
-	echo elgg_view('groups/group_widget',$vars);
-}
+?>
+</div>
+<?php
+}

File elgg/mod/dokuwiki/languages/ca.php

 
 $catalan = array( 
 	 'dokuwiki:wiki'  =>  "Wiki" , 
-	 'dokuwiki:groupwiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki del grup" , 
 	 'dokuwiki:userwiki'  =>  "La meva Wiki" , 
 	 'dokuwiki'  =>  "Wikis" , 
 	 'item:object:dokuwiki'  =>  "Wikis" , 
 
 add_translation('ca', $catalan); 
 
-?>
+?>

File elgg/mod/dokuwiki/languages/en.php

 		"dokuwiki:wikifrom"=>'%s wiki',
 		"dokuwiki:pages"=>'%s pages',
 		"dokuwiki:dokuwiki"=>'Wiki',
-		"dokuwiki:groupwiki"=>'Wiki',
+		"dokuwiki:groupwiki"=>'Group Wiki',
 		"dokuwiki:userwiki"=>'My Wiki',
 		"groups:enabledokuwiki"=>'Enable group wiki',
 		"groups:enabledokuwiki_frontpage"=>'Show main wiki page in the group front page (only if wiki is enabled)',

File elgg/mod/dokuwiki/languages/es.php

 
 	$spanish = array(
                 "dokuwiki:wiki"=>'Wiki',
-                "dokuwiki:groupwiki"=>'Wiki',
+                "dokuwiki:groupwiki"=>'Wiki del grupo',
                 "dokuwiki:userwiki"=>'Mi Wiki',
                 "dokuwiki"=>'Wikis',
                 "item:object:dokuwiki"=>'Wikis',

File elgg/mod/dokuwiki/languages/gl.php

 
 $galician = array( 
 	 'dokuwiki:wiki'  =>  "Wiki" , 
-	 'dokuwiki:groupwiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki do grupo" , 
 	 'dokuwiki:userwiki'  =>  "A miña Wiki" , 
 	 'dokuwiki'  =>  "Wikis" , 
 	 'item:object:dokuwiki'  =>  "Wikis" , 
 
 add_translation('gl', $galician); 
 
-?>
+?>

File elgg/mod/dokuwiki/languages/pt.php

 	 'dokuwiki:wikifrom'  =>  "%s Wiki" , 
 	 'dokuwiki:pages'  =>  "%s páginas" , 
 	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
-	 'dokuwiki:groupwiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki do grupo" , 
 	 'dokuwiki:userwiki'  =>  "Minha Wiki" , 
 	 'groups:enabledokuwiki'  =>  "Habilitar Wiki do grupo" , 
 	 'dokuwiki'  =>  "Wikis" , 
 
 add_translation('pt', $portuguese); 
 
-?>
+?>

File elgg/mod/faq/actions/faq/answer.php

 						$url = $CONFIG->wwwroot . "pg/faq/list?categoryId=" . get_metastring_id($faq->category) . "#qID" . $faq->guid;
 						if($same){
 							// notify user, question added and not adjusted
-							$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject", get_user_language($user, 'faq')), sprintf(elgg_echo("faq:answer:notify:message:added:same", get_user_language($user, 'faq')), $question, $url));
+							$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject"), sprintf(elgg_echo("faq:answer:notify:message:added:same"), $question, $url));
 						} else {
 							// notify user, question added and adjusted
-							$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject", get_user_language($user, 'faq')), sprintf(elgg_echo("faq:answer:notify:message:added:adjusted", get_user_language($user, 'faq')), $orgQuestion, $question, $url));
+							$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject"), sprintf(elgg_echo("faq:answer:notify:message:added:adjusted"), $orgQuestion, $question, $url));
 						}
 						
 						if(in_array(true, $result)){
 			$user = get_user($faq->owner_guid);
 			
 			if($question == $orgQuestion){
-				$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject", get_user_language($user, 'faq')), sprintf(elgg_echo("faq:answer:notify:not_added:same", get_user_language($user, 'faq')), $question, $answer));
+				$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject"), sprintf(elgg_echo("faq:answer:notify:not_added:same"), $question, $answer));
 			} else {
-				$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject", get_user_language($user, 'faq')), sprintf(elgg_echo("faq:answer:notify:not_added:adjusted", get_user_language($user, 'faq')), $orgQuestion, $question, $answer));
+				$result = notify_user($user->guid, $user->site_guid, elgg_echo("faq:answer:notify:subject"), sprintf(elgg_echo("faq:answer:notify:not_added:adjusted"), $orgQuestion, $question, $answer));
 			}
 			
 			$faq->delete();

File elgg/mod/file/languages/ca.php

 	 'file:edit'  =>  "Modifica el fitxer" , 
 	 'file:more'  =>  "Més fitxers" , 
 	 'file:list'  =>  "Vista de llista" , 
-	 'file:group'  =>  "Fitxers" , 
+	 'file:group'  =>  "Fitxers del grup" , 
 	 'file:gallery'  =>  "Vista de galeria" , 
 	 'file:gallery_list'  =>  "Vista de galeria o llista" , 
 	 'file:num_files'  =>  "Nombre de fitxers a mostrar" , 
 
 add_translation('ca', $catalan); 
 
-?>
+?>

File elgg/mod/file/languages/en.php

 			'file:upload' => "Upload a file",
 			'file:replace' => 'Replace file content (leave blank to not change file)',
 	
-			'file:group' => "Files",
+			'file:group' => "Group files",
 			'groups:enablefiles' => 'Enable group files',
 			'file:newupload' => 'New file upload',
 			'file:more' => "More files",
 	);
 					
 	add_translation("en",$english);
-?>
+?>

File elgg/mod/file/languages/es.php

 	 'file:edit'  =>  "Editar archivo" , 
 	 'file:more'  =>  "Ver más archivos" , 
 	 'file:list'  =>  "modo Lista" , 
-	 'file:group'  =>  "Archivos" , 
+	 'file:group'  =>  "Archivos del grupo" , 
 	 'file:gallery'  =>  "modo Galería" , 
 	 'file:gallery_list'  =>  "Mostrar sólo icono o con detalle" , 
 	 'file:num_files'  =>  "Número de archivos a mostrar" , 

File elgg/mod/file/languages/fr.php

 	 'file:edit'  =>  "Modifier fichier" , 
 	 'file:more'  =>  "Autres fichiers" , 
 	 'file:list'  =>  "Liste" , 
-	 'file:group'  =>  "Fichiers" , 
+	 'file:group'  =>  "Fichiers de groupe" , 
 	 'file:gallery'  =>  "Gallerie" , 
 	 'file:gallery_list'  =>  "Gallerie ou liste" , 
 	 'file:num_files'  =>  "Nombre de fichiers &agrave; afficher" , 
 
 add_translation('fr', $french); 
 
-?>
+?>

File elgg/mod/file/languages/gl.php

 	 'file:edit'  =>  "Editar arquivo" , 
 	 'file:more'  =>  "Ver máis arquivos" , 
 	 'file:list'  =>  "modo Lista" , 
-	 'file:group'  =>  "Arquivos" , 
+	 'file:group'  =>  "Arquivos do grupo" , 
 	 'file:gallery'  =>  "modo Galería" , 
 	 'file:gallery_list'  =>  "Amosar só iconos ou con detalle" , 
 	 'file:num_files'  =>  "Número de arquivos a amosar" , 
 
 add_translation('gl', $galician); 
 
-?>
+?>

File elgg/mod/file/languages/it.php

 	 'file:friends'  =>  "%s's file amici" , 
 	 'file:all'  =>  "I file di tutto il sito" , 
 	 'file:edit'  =>  "Edit file" , 
-	 'file:group'  =>  "File" , 
+	 'file:group'  =>  "File gruppo" , 
 	 'file:gallery'  =>  "vista galleria" , 
 	 'file:title'  =>  "Titolo" , 
 	 'file:desc'  =>  "Descrizione" , 
 
 add_translation('it', $italian); 
 
-?>
+?>

File elgg/mod/file/languages/pt.php

 	 'file:edit'  =>  "Editar arquivo" , 
 	 'file:more'  =>  "Mais arquivos" , 
 	 'file:list'  =>  "exibição em lista" , 
-	 'file:group'  =>  "Arquivos" , 
+	 'file:group'  =>  "Arquivos do grupo" , 
 	 'file:gallery'  =>  "exibição em galeria" , 
 	 'file:gallery_list'  =>  "Exibição em galeria ou lista" , 
 	 'file:num_files'  =>  "Número de arquivos a exibir" , 
 
 add_translation('pt', $portuguese); 
 
-?>
+?>

File elgg/mod/file/views/default/file/groupprofile_files.php

  */
 
 if ($vars['entity']->file_enable != 'no') {
-	$vars['title'] = elgg_echo("file:group");
-	$vars['more_link'] = $vars['url'].'pg/file/owner/group:'.$vars['entity']->guid;
+?>
 
-	$add_link = $vars['url']."pg/file/new/group:".$vars['entity']->guid."/";
-	$link_text = elgg_echo("file:upload");
-	$vars['buttons'] = array($add_link => $link_text);
-
+<div class="group_widget">
+<h2><a href="<?php echo $vars['url']; ?>pg/file/group:<?php echo $vars['entity']->guid ?>"><?php echo elgg_echo("file:group"); ?></a></h2>
+<?php 
+	if($vars['entity']->isMember()){
+		$add_link = $vars['url']."pg/file/group:".$vars['entity']->guid."/new/";
+		$link_text = elgg_echo("file:upload");
+		echo "<a class=\"add_topic_button\" style=\"float:right;margin-top:-30px;margin-right:10px\" href=\"$add_link\">$link_text</a>";
+	}
+?>
+<?php
 	$context = get_context();
 	set_context('search');
-	$vars['content'] = elgg_list_entities(array('types' => 'object',
+	$content = elgg_list_entities(array('types' => 'object',
 										'subtypes' => 'file',
 										'container_guid' => $vars['entity']->guid,
 										'limit' => 5,
 										'pagination' => FALSE));
 	set_context($context);
 
-	if (!$vars['content']) {
-		$vars['content'] = "<div class=\"forum_latest\">" . elgg_echo("file:nogroup") . "</div>";
+    if ($content) {
+		echo $content;
+
+		$more_url = "{$vars['url']}pg/file/owner/group:{$vars['entity']->guid}/";
+		echo "<div class=\"forum_latest\"><a href=\"$more_url\">" . elgg_echo('file:more') . "</a></div>";
+	} else {
+		echo "<div class=\"forum_latest\">" . elgg_echo("file:nogroup") . "</div>";
 	}
-
-	echo elgg_view('groups/group_widget',$vars);
-}
 ?>
+</div>
+<?php
+}

File elgg/mod/friend_request/start.php

  * new relationships work both ways.
  */
 
+/*
+ * Returns the language of $user or the site's one if the user has no
+ * predefined language.
+ *
+ * If the translation is not already loaded we load it as well.
+ *
+ * Defaults to English if others fail.
+ */
+if (!function_exists("get_user_language")) {
+function get_user_language($user, $mod) {
+    global $CONFIG;
+
+    if (!empty($user->language)) {
+        $lang = $user->language;
+    } else if (!empty($CONFIG->language)) {
+        $lang = $CONFIG->language;
+    }
+    if (!empty($lang)) {
+        if (empty($CONF->translations[$lang])) {
+            register_translations($CONFIG->pluginspath.$mod."/languages/", true);
+        }
+        return $lang;
+    }
+
+    return 'en';
+}
+}
 
 function iagree_init() {
 	global $CONFIG;

File elgg/mod/graphstats/languages/en.php

 		'graphstats:implication' => 'Implication',
 		'graphstats:graphs' => 'Graphs',
 		'graphstats:timestats' => 'Stats over time',
-		'graphstats:groupgraph' => 'Group network',
-		'timeline' => 'Timeline');
+		'graphstats:groupgraph' => 'Group network');
 
 	add_translation("en", $english);
 ?>

File elgg/mod/graphstats/start.php

                 register_page_handler('graphstats','graphstats_page_handler');
                 register_page_handler('graphs','graphstats_graphs_page_handler');
                 register_page_handler('groupgraph','graphstats_group_page_handler');
-		elgg_extend_view('groupriver/more_link', 'timeline/groups/link');
-		elgg_extend_view('groupriver/more_text', 'timeline/groups/text');
+		elgg_extend_view('groupriver/groupprofile', 'timeline/grouptimeline');
+		elgg_extend_view('groups/right_column', 'timeline/grouptimeline');
+		// elgg_extend_view("footer/links", "graphstats/footer");
 	}
 
 	register_elgg_event_handler('init','system','graphstats_init');

File elgg/mod/graphstats/views/default/timeline/grouptimeline.php

+<?php
+	$group = page_owner_entity();
+	echo "<a href='".$vars['url']."mod/graphstats/timeline/index.php?group_guid=".$group->guid."'>" . elgg_echo("timeline") . "</a>";
+?>

File elgg/mod/groupmembers/actions/reinvite.php

         if (check_entity_relationship($group->guid, 'invited', $user->guid)) {
         // Send email
             if (notify_user($user->getGUID(), $group->owner_guid,
-            sprintf(elgg_echo('groups:invite:subject', get_user_language($user, 'groupmembers')), $user->name, $group->name),
-            sprintf(elgg_echo('groups:invite:body', get_user_language($user, 'groupmembers')), $user->name, $group->name, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
+            sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name),
+            sprintf(elgg_echo('groups:invite:body'), $user->name, $group->name, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
             NULL))
                 system_message(elgg_echo("groups:userinvited"));
             else

File elgg/mod/groupriver/languages/ca.php

 // Generate By translationbrowser. 
 
 $catalan = array( 
-	 'groupriver'  =>  "Activitat" , 
+	 'groupriver'  =>  "Activitat del grup" , 
 	 'groupriver:widget:title'  =>  "Activitat del grup" , 
 	 'groupriver:widget:description'  =>  "Activitat del grup"
 ); 
 
 add_translation('ca', $catalan); 
 
-?>
+?>

File elgg/mod/groupriver/languages/en.php

    */
 
 $english = array(
-	'groupriver' => 'Activity',
+	'groupriver' => 'Group activity',
     'groupriver:widget:title' => 'Group activity',
     'groupriver:widget:description' => 'Group activity',
  	);

File elgg/mod/groupriver/languages/es.php

    */
 
 $spanish = array(
-	'groupriver' => 'Actividad',
+	'groupriver' => 'Actividad del grupo',
     'groupriver:widget:title' => 'Actividad del grupo',
     'groupriver:widget:description' => 'Actividad del grupo',
  	);

File elgg/mod/groupriver/languages/fr.php

 // générée par translationbrowser 
 
 $french = array( 
-	 'groupriver'  =>  "Activité" , 
+	 'groupriver'  =>  "Activité du groupe" , 
 	 'groupriver:widget:title'  =>  "Activité du groupe" , 
 	 'groupriver:widget:description'  =>  "Activité du groupe"
 ); 
 
 add_translation('fr', $french); 
 
-?>
+?>

File elgg/mod/groupriver/languages/gl.php

 // Generado por translationbrowser 
 
 $galician = array( 
-	 'groupriver'  =>  "Actividade" , 
+	 'groupriver'  =>  "Actividade do grupo" , 
 	 'groupriver:widget:title'  =>  "Actividade do grupo" , 
 	 'groupriver:widget:description'  =>  "Actividade do grupo"
 ); 
 
 add_translation('gl', $galician); 
 
-?>
+?>

File elgg/mod/groupriver/languages/pt.php

 // Gerado pelo browser de tradução. 
 
 $portuguese = array( 
-	 'groupriver'  =>  "Atividade" , 
+	 'groupriver'  =>  "Atividade do grupo" , 
 	 'groupriver:widget:title'  =>  "Atividade do grupo" , 
 	 'groupriver:widget:description'  =>  "Atividade do grupo"
 ); 
 
 add_translation('pt', $portuguese); 
 
-?>
+?>

File elgg/mod/groupriver/views/default/groupriver/groupprofile.php

-<?php
-	/*
-	** Activity River for Groups
-	*
-	*
-	* @author Jon Maul
-	* @copyright The MITRE Corporation 2010
-	* @link http://www.mitre.org/
-	*/
+<div id="group_river_widget">
+	<h2><?php echo elgg_echo("groupriver"); ?></h2>
+	<?php
+		$pagination = false; // also should be customizable
+	?>
+	<div id="group_river_widget_content">
+		<?php
+			if ($pagination) { ?>
+				<style type="text/css">
+					.river_pagination { display: inline; }
+				</style>
+		<?php
+			}
+		?>
 
-	$vars['title'] = elgg_echo("groupriver");
-	$vars['more_link'] = elgg_view('groupriver/more_link'); // not defined in this plugin
-	$vars['more_text'] = elgg_view('groupriver/more_text'); // not defined too.
-	$vars['buttons'] = false;
+		<?php
+		/*
+		** Activity River for Groups
+		*
+		*
+		* @author Jon Maul
+		* @copyright The MITRE Corporation 2010
+		* @link http://www.mitre.org/
+		*/
 
-	$vars['content'] = '<div id="group_river_widget_content">';
-		
-	$pagination = false; // also should be customizable
-	if ($pagination) {
-		$vars['content'] .= '<style type="text/css">.river_pagination { display: inline; } </style>';
-	}
 
-	$owner = page_owner_entity();
-	$group_guid = $owner->guid;
-	$limit = 10;  // TODO: make configurable
+		$owner = page_owner_entity();
+		$group_guid = $owner->guid;
+		$limit = 10;  // TODO: make configurable
 
-	$offset = (int) get_input('offset', 0);
+		$offset = (int) get_input('offset', 0);
 
-	// Sanitise variables -- future proof in case they get sourced elsewhere
-	$limit = (int) $limit;
-	$offset = (int) $offset;
-	$group_guid = (int) $group_guid;
+		// Sanitise variables -- future proof in case they get sourced elsewhere
+		$limit = (int) $limit;
+		$offset = (int) $offset;
+		$group_guid = (int) $group_guid;
 
-	$sql = "SELECT {$CONFIG->dbprefix}river.id, {$CONFIG->dbprefix}river.type, {$CONFIG->dbprefix}river.subtype, {$CONFIG->dbprefix}river.action_type, {$CONFIG->dbprefix}river.access_id, {$CONFIG->dbprefix}river.view, {$CONFIG->dbprefix}river.subject_guid, {$CONFIG->dbprefix}river.object_guid, {$CONFIG->dbprefix}river.posted FROM {$CONFIG->dbprefix}river INNER JOIN {$CONFIG->dbprefix}entities AS entities1 ON {$CONFIG->dbprefix}river.object_guid = entities1.guid LEFT OUTER JOIN {$CONFIG->dbprefix}entities AS entities2 ON entities1.container_guid = entities2.guid WHERE entities2.guid = $group_guid OR {$CONFIG->dbprefix}river.object_guid = $group_guid ORDER BY posted DESC limit {$offset},{$limit}";
+		$sql = "SELECT {$CONFIG->dbprefix}river.id, {$CONFIG->dbprefix}river.type, {$CONFIG->dbprefix}river.subtype, {$CONFIG->dbprefix}river.action_type, {$CONFIG->dbprefix}river.access_id, {$CONFIG->dbprefix}river.view, {$CONFIG->dbprefix}river.subject_guid, {$CONFIG->dbprefix}river.object_guid, {$CONFIG->dbprefix}river.posted FROM {$CONFIG->dbprefix}river INNER JOIN {$CONFIG->dbprefix}entities AS entities1 ON {$CONFIG->dbprefix}river.object_guid = entities1.guid LEFT OUTER JOIN {$CONFIG->dbprefix}entities AS entities2 ON entities1.container_guid = entities2.guid WHERE entities2.guid = $group_guid OR {$CONFIG->dbprefix}river.object_guid = $group_guid ORDER BY posted DESC limit {$offset},{$limit}";
 
-	$items = get_data($sql);
+		$items = get_data($sql);
 
-if (count($items) > 0) {
-		if ($pagination) {
-			$group_river = array_slice($items, $offset);
+        if (count($items) > 0) {
+			if ($pagination) {
+				$group_river = array_slice($items, $offset);
+			}
+			$river_items = elgg_view('river/item/list',array(
+												'limit' => $limit,
+												'offset' => $offset,
+												'items' => $items,
+												'pagination' => $pagination
+											));
 		}
-		$vars['content'] .= elgg_view('river/item/list',array(
-											'limit' => $limit,
-											'offset' => $offset,
-											'items' => $items,
-											'pagination' => $pagination
-										));
-	}
-	$vars['content'] .= '</div>';
-	echo elgg_view('groups/group_widget',$vars);
-	unset($vars['more_text']);
+		echo $river_items;
 
-?>
+		?>
+
+	</div>
+</div>

File elgg/mod/groups/actions/addtogroup.php

 	// Load configuration
 	global $CONFIG;
 
+    /*
+     * Returns the language of $user or the site's one if the user has no
+     * predefined language.
+     *
+     * If the translation is not already loaded we load it as well.
+     *
+     * Defaults to English if others fail.
+     */
+    if (!function_exists('get_user_language')) {
+    function get_user_language($user, $mod) {
+        global $CONFIG;
+
+        if (!empty($user->language)) {
+            $lang = $user->language;
+        } else if (!empty($CONFIG->language)) {
+            $lang = $CONFIG->language;
+        }
+        if (!empty($lang)) {
+            if (empty($CONF->translations[$lang])) {
+                register_translations($CONFIG->pluginspath.$mod."/languages/", true);
+            }
+            return $lang;
+        }
+
+        return 'en';
+    }
+    }
+
+
 	gatekeeper();
 
 	$logged_in_user = get_loggedin_user();

File elgg/mod/groups/actions/invite.php

 // Load configuration
 global $CONFIG;
 
+/*
+ * Returns the language of $user or the site's one if the user has no
+ * predefined language.
+ *
+ * If the translation is not already loaded we load it as well.
+ *
+ * Defaults to English if others fail.
+ */
+if (!function_exists('get_user_language')) {
+function get_user_language($user, $mod) {
+    global $CONFIG;
+
+    if (!empty($user->language)) {
+        $lang = $user->language;
+    } else if (!empty($CONFIG->language)) {
+        $lang = $CONFIG->language;
+    }
+    if (!empty($lang)) {
+        if (empty($CONF->translations[$lang])) {
+            register_translations($CONFIG->pluginspath.$mod."/languages/", true);
+        }
+        return $lang;
+    }
+
+    return 'en';
+}
+}
+
+
 gatekeeper();
 
 $logged_in_user = get_loggedin_user();

File elgg/mod/groups/actions/joinrequest.php

 // Load configuration
 global $CONFIG;
 
+/*
+ * Returns the language of $user or the site's one if the user has no
+ * predefined language.
+ *
+ * If the translation is not already loaded we load it as well.
+ *
+ * Defaults to English if others fail.
+ */
+if (!function_exists('get_user_language')) {
+function get_user_language($user) {
+    global $CONFIG;
+
+    if (!empty($user->language)) {
+        $lang = $user->language;
+    } else if (!empty($CONFIG->language)) {
+        $lang = $CONFIG->language;
+    }
+    if (!empty($lang)) {
+        if (empty($CONF->translations[$lang])) {
+            register_translations($CONFIG->pluginspath."groups/languages/", true);
+        }
+        return $lang;
+    }
+
+    return 'en';
+}
+}
+
 gatekeeper();
 
 $user_guid = get_input('user_guid', get_loggedin_userid());

File elgg/mod/groups/languages/ca.php

 	 'groups:interests'  =>  "Etiquetes" , 
 	 'groups:website'  =>  "Pàgina web" , 
 	 'groups:members'  =>  "Membres del Grup" , 
-	 'groups:members:latest' => "Nouvinguts",
-	 'groups:members:num' => "%s membres",
 	 'groups:access'  =>  "Permisos d'accés" , 
-	 'groups:owner'  =>  "Contacte" , 
+	 'groups:owner'  =>  "Creat per" , 
 	 'groups:widget:size'  =>  "Mida" , 
 	 'groups:widget:small'  =>  "Vista compacta" , 
 	 'groups:widget:normal'  =>  "Vista normal" , 
 	 'groups:widgets:entities:description'  =>  "Llistat d'objectes desats en aquest grup" , 
 	 'groups:widgets:entities:label:displaynum'  =>  "Llistat d'objectes del grup" , 
 	 'groups:widgets:entities:label:pleaseedit'  =>  "Siusplau, configura la caixa." , 
-	 'groups:widget:more:default' => "Més",
 	 'group:notdeleted'  =>  "No es pot esborrar el grup" , 
 	 'grouppost:notdeleted'  =>  "No es poden esborrar les entrades del grup" , 
 	 'groups:joinrequestkilled'  =>  "S'ha esborrat la petició d'entrada" , 

File elgg/mod/groups/languages/en.php

 			'groups:interests' => 'Tags',
 			'groups:website' => 'Website',
 			'groups:members' => 'Group members',
-			'groups:members:latest' => 'Latest members',
 			'groups:membership' => "Group membership permissions",
 			'groups:access' => "Access permissions",
-			'groups:owner' => "Contact",
+			'groups:owner' => "Created by",
 			'groups:widget:num_display' => 'Number of groups to display',
 			'groups:widget:membership' => 'Group membership',
 			'groups:widgets:description' => 'Display the groups you are a member of on your profile',
-			'groups:widget:more:default' => 'More',
 			'groups:noaccess' => 'No access to group',
 			'groups:cantedit' => 'You can not edit this group',
 			'groups:saved' => 'Group saved',
 
 			'groups:memberlist' => "Group members",
 			'groups:membersof' => "Members of %s",
-			'groups:members:num' => "%s members",
 			'groups:members:more' => "View more members",
 
 			'groups:notfound' => "Group not found",
 			'groups:widgets:entities:label:displaynum' => 'List the objects of a group.',
 			'groups:widgets:entities:label:pleaseedit' => 'Please configure this widget.',
 
-			'groups:widget:more' => "More",
-
 			'groups:forumtopic:edited' => 'Forum topic successfully edited.',
 
 			'groups:allowhiddengroups' => 'Do you want to allow private (invisible) groups?',

File elgg/mod/groups/languages/es.php

 	 'groups:briefdescription'  =>  "Breve descripción" , 
 	 'groups:interests'  =>  "Intereses" , 
 	 'groups:website'  =>  "Website" , 
-	 'groups:members'  =>  "Miembros del grupo" , 
-	 'groups:members:latest' => "Últimos miembros" ,
-	 'groups:members:num' => "%s miembros" ,
+	 'groups:members'  =>  "Últimos miembros" , 
 	 'groups:membership'  =>  "Permisos de lxs miembros del grupo" , 
 	 'groups:access'  =>  "Permisos de acceso" , 
-	 'groups:owner'  =>  "Contacto" , 
+	 'groups:owner'  =>  "Creado por" , 
 	 'groups:widget:num_display'  =>  "Número de grupos a mostrar" , 
 	 'groups:widget:membership'  =>  "Grupos" , 
 	 'groups:widgets:description'  =>  "Mostrar en tu perfil los grupos a los que perteneces" , 
-	 'groups:widget:more:default' => "Más",
 	 'groups:noaccess'  =>  "Acceso no permitido al grupo" , 
 	 'groups:cantedit'  =>  "No puedes editar este grupo" , 
 	 'groups:saved'  =>  "Grupo guardado" , 

File elgg/mod/groups/languages/fr.php

 	 'groups:members'  =>  "Membres du groupe" , 
 	 'groups:membership'  =>  "Membres" , 
 	 'groups:access'  =>  "Permissions d'acc&agrave;s" , 
-	 'groups:owner'  =>  "Contact" , 
+	 'groups:owner'  =>  "Propri&eacute;taire" , 
 	 'groups:widget:num_display'  =>  "Nombre de groupes à afficher" , 
 	 'groups:widget:membership'  =>  "Membres des groupes" , 
 	 'groups:widgets:description'  =>  "Afficher les groupes dont je fais partie avec mon profil" , 
 
 %s" , 
 	 'groups:welcome:subject'  =>  "Bienvenue au groupe %s!" , 
-	 'groups:welcome:body'  =>  "Bonjour, %s!
-		
-Vous faites maintenant partie du groupe %s! Cliquez ci-dessous pour commencer à poster!
-
+	 'groups:welcome:body'  =>  "Bonjour, %s!
+		
+Vous faites maintenant partie du groupe %s! Cliquez ci-dessous pour commencer à poster!
+
 %s" , 
 	 'groups:request:subject'  =>  "%s a demandé d'adhérer à %s" , 
-	 'groups:request:body'  =>  "Bonjour, %s,
-
-%s a demandé d'adhérer à %s. Cliquez ci-dessous pour voir leur profil :
-
-%s
-
-ou cliquez cidessous pour afficher la demande :
-
+	 'groups:request:body'  =>  "Bonjour, %s,
+
+%s a demandé d'adhérer à %s. Cliquez ci-dessous pour voir leur profil :
+
+%s
+
+ou cliquez cidessous pour afficher la demande :
+
 %s" , 
 	 'groups:river:member'  =>  "fait maintenant partie du" , 
 	 'groups:nowidgets'  =>  "Aucun widget n'a été défini pour ce groupe." , 
 
 add_translation('fr', $french); 
 
-?>
+?>

File elgg/mod/groups/languages/gl.php

 	 'groups:members'  =>  "Membros" , 
 	 'groups:membership'  =>  "Permisos dxs membros do grupo" , 
 	 'groups:access'  =>  "Permisos de acceso" , 
-	 'groups:owner'  =>  "Contacto" , 
+	 'groups:owner'  =>  "Creado por" , 
 	 'groups:widget:num_display'  =>  "Número de grupos a amosar" , 
 	 'groups:widget:membership'  =>  "Membros" , 
 	 'groups:widgets:description'  =>  "Mostrar no teu perfil os grupos ós que pertences" , 

File elgg/mod/groups/languages/it.php

 	 'groups:members'  =>  "Membri gruppo" , 
 	 'groups:membership'  =>  "Autorizzazioni Gruppo di appartenenza " , 
 	 'groups:access'  =>  "Permessi accesso" , 
-	 'groups:owner'  =>  "Contatto" , 
+	 'groups:owner'  =>  "Proprietario" , 
 	 'groups:widget:num_display'  =>  "Numero dei gruppi da visualizzare" , 
 	 'groups:widget:membership'  =>  "Gruppo di appartenenza" , 
 	 'groups:widgets:description'  =>  "Visualizzare i gruppi di cui si è un membro" , 
 	 'groups:invite:subject'  =>  "%s hai ricevuto l'invito ad unirti a %s" , 
 	 'groups:started'  =>  "Inizia da" , 
 	 'groups:joinrequest:remove:check'  =>  "Sei sicuro di voler lasciare il gruppo?" , 
-	 'groups:invite:body'  =>  "Ciao %s,
-
-%s sei stato invitato ad unirti al gruppo '%s' , clicca qui sotto per confermare:
-
+	 'groups:invite:body'  =>  "Ciao %s,
+
+%s sei stato invitato ad unirti al gruppo '%s' , clicca qui sotto per confermare:
+
 %s" , 
 	 'groups:welcome:subject'  =>  "Benvenuto nel gruppo %s" , 
-	 'groups:welcome:body'  =>  "Ciao %s!
-
-Tu ora sei un nuovo membro del gruppo '%s' ! Clicca per seguirci o per iniziare la tua attività!
-
+	 'groups:welcome:body'  =>  "Ciao %s!
+
+Tu ora sei un nuovo membro del gruppo '%s' ! Clicca per seguirci o per iniziare la tua attività!
+
 %s" , 
 	 'groups:request:subject'  =>  "% s ha chiesto di aderire a % s " , 
-	 'groups:request:body'  =>  "Ciao %s,
-
-%s richiesto di aderire al gruppo '%s' , clicca per vedere il suo profilo:
-
-%s
-
-oppure clicca per confermare la richiesta:
-
+	 'groups:request:body'  =>  "Ciao %s,
+
+%s richiesto di aderire al gruppo '%s' , clicca per vedere il suo profilo:
+
+%s
+
+oppure clicca per confermare la richiesta:
+
 %s" , 
 	 'groups:river:member'  =>  "%s e' un nuovo membro di" , 
 	 'groupforum:river:updated'  =>  "%s è stato aggiornato" , 
 
 add_translation('it', $italian); 
 
-?>
+?>

File elgg/mod/groups/languages/pt.php

 	 'groups:members'  =>  "Membros do grupo" , 
 	 'groups:membership'  =>  "Permissões de associação ao grupo" , 
 	 'groups:access'  =>  "Permissões de acesso" , 
-	 'groups:owner'  =>  "Contato" , 
+	 'groups:owner'  =>  "Criador" , 
 	 'groups:widget:num_display'  =>  "Número de grupos a serem exibidos" , 
 	 'groups:widget:membership'  =>  "Grupos associados" , 
 	 'groups:widgets:description'  =>  "Mostra, no seu perfil, os grupos dos quais você participa" , 
 
 add_translation('pt', $portuguese); 
 
-?>
+?>

File elgg/mod/groups/views/default/groups/css.php

 .group_widget .search_listing {
 border:2px solid #CCCCCC;
 }
-
-.group_widget h2 {
-	margin-bottom: 5px !important;
-}
-
-.group_widget .more {
-	font-size: 14px;
-	color: #AAAAAA;
-	font-weight: lighter;
-}
-
-.group_widget .add_topic_button {
-	float:right;
-	margin-top:-30px;
-	margin-right:10px;
-}

File elgg/mod/groups/views/default/groups/groupprofile.php

 			echo "<p><b>" . elgg_echo("groups:owner") . ": </b><a href=\"" . get_user($vars['entity']->owner_guid)->getURL() . "\">" . get_user($vars['entity']->owner_guid)->name . "</a>".elgg_view('tools/object', $vars)."</p>";
 
 		?>
-		<p><?php echo sprintf(elgg_echo('groups:members:num'), $vars['entity']->getMembers(0, 0, TRUE)); ?></p>
+		<p><?php echo elgg_echo('groups:members') . ": " . $vars['entity']->getMembers(0, 0, TRUE); ?></p>
 	</div><!-- end of group_stats -->
 </div><!-- end of groups_info_column_right -->
 

File elgg/mod/groups/views/default/groups/members.php

 	 * @package ElggGroups
 	 */
 	 
-	$vars['title'] = elgg_echo("groups:members:latest");
-	$vars['internal_id'] = "group_members";
-	$vars['more_link'] = "{$vars['url']}pg/groups/memberlist/{$vars['entity']->guid}/";
+?>
 
-	$members = $vars['entity']->getMembers(100);
-	$vars['content'] = "";
-	foreach($members as $mem){
-		$vars['content'] .= "<div class=\"member_icon\"><a href=\"".$mem->getURL()."\">" .
-			elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny', 'override' => 'true')) .
-		"</a></div>";
-	}
-	echo elgg_view('groups/group_widget',$vars);
+<div id="group_members">
+<h2><?php echo elgg_echo("groups:members"); ?></h2>
+
+<?php
+
+    $members = $vars['entity']->getMembers(100);
+    foreach($members as $mem){
+           
+        echo "<div class=\"member_icon\"><a href=\"".$mem->getURL()."\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny', 'override' => 'true')) . "</a></div>";   
+           
+    }
+
+	echo "<div class=\"clearfloat\"></div>";
+	$more_url = "{$vars['url']}pg/groups/memberlist/{$vars['entity']->guid}/";
+	echo "<div id=\"groups_member_link\"><a href=\"{$more_url}\">" . elgg_echo('groups:members:more') . "</a></div>";
+
 ?>
+<div class="clearfloat"></div>
+</div>

File elgg/mod/messages/start.php

 	 * @package ElggMessages
 	 */
 
+    /*
+     * Returns the language of $user or the site's one if the user has no
+     * predefined language.
+     *
+     * If the translation is not already loaded we load it as well.
+     *
+     * Defaults to English if others fail.
+     */
+    if (!function_exists('get_user_language')) {
+    function get_user_language($user, $mod) {
+        global $CONFIG;
+
+        if (!empty($user->language)) {
+            $lang = $user->language;
+        } else if (!empty($CONFIG->language)) {
+            $lang = $CONFIG->language;
+        }
+        if (!empty($lang)) {
+            if (empty($CONF->translations[$lang])) {
+                register_translations($CONFIG->pluginspath.$mod."/languages/", true);
+            }
+            return $lang;
+        }
+
+        return 'en';
+    }
+    }
+
 	/**
 	 * Messages initialisation
 	 *

File elgg/mod/pages/languages/ca.php

 	 'pages'  =>  "Pàgines" , 
 	 'pages:yours'  =>  "Les teves pàgines" , 
 	 'pages:user'  =>  "Les meves pàgines" , 
-	 'pages:group'  =>  "Pàgines" , 
+	 'pages:group'  =>  "Pàgines del grup" , 
 	 'pages:all'  =>  "Totes les pàgines" , 
 	 'pages:new'  =>  "Nova pàgina" , 
-	 'pages:groupprofile'  =>  "Pàgines" , 
+	 'pages:groupprofile'  =>  "Pàgines del grup" , 
 	 'pages:edit'  =>  "Modificar la pàgina" , 
 	 'pages:delete'  =>  "Esborrar la pàgina" , 
 	 'pages:history'  =>  "Històric del a pàgina" , 
 	 'item:object:page'  =>  "Pàgines" , 
 	 'item:object:pages_welcome'  =>  "Pàgines de benvinguda bloquejades" , 
 	 'pages:nogroup'  =>  "El grup no té contingut encara o bé no tens permisos per veure la informació generada" , 
-	 'pages:more'  =>  "s pàgines" , 
+	 'pages:more'  =>  "Veure totes les seves pàgines" , 
 	 'pages:river:annotate'  =>  "un comentari a la pàgina:" , 
 	 'pages:river:created'  =>  "%s diu" , 
 	 'pages:river:updated'  =>  "%s ha actualitzat" , 
 
 add_translation('ca', $catalan); 
 
-?>
+?>

File elgg/mod/pages/languages/en.php

 			'pages' => "Pages",
 			'pages:yours' => "Your pages",
 			'pages:user' => "Pages home",
-			'pages:group' => "Pages",
+			'pages:group' => "Group pages",
 			'pages:all' => "All site pages",
 			'pages:new' => "New page",
-			'pages:groupprofile' => "Pages",
+			'pages:groupprofile' => "Group pages",
 			'pages:edit' => "Edit this page",
 			'pages:delete' => "Delete this page",
 			'pages:history' => "Page history",
 	);
 					
 	add_translation("en",$english);
-?>
+?>

File elgg/mod/pages/languages/es.php

 	 'pages'  =>  "Páginas" , 
 	 'pages:yours'  =>  "Tus páginas" , 
 	 'pages:user'  =>  "Mis páginas" , 
-	 'pages:group'  =>  "Páginas" , 
+	 'pages:group'  =>  "Páginas del grupo" , 
 	 'pages:all'  =>  "Todas las páginas" , 
 	 'pages:new'  =>  "Nueva página" , 
-	 'pages:groupprofile'  =>  "Páginas" , 
+	 'pages:groupprofile'  =>  "Páginas del grupo" , 
 	 'pages:edit'  =>  "Editar la página" , 
 	 'pages:delete'  =>  "Borrar la página" , 
 	 'pages:history'  =>  "Historial de la página" , 
 	 'item:object:page'  =>  "Páginas" , 
 	 'item:object:pages_welcome'  =>  "Páginas de bienvenida bloquedas" , 
 	 'pages:nogroup'  =>  "El grupo no tiene contenido creado de momento, o bien no tienes permisos para visualializarlo la información" , 
-	 'pages:more'  =>  "Ver todas" , 
+	 'pages:more'  =>  "Ver todas sus páginas" , 
 	 'pages:river:annotate'  =>  "un comentario en la página:" , 
 	 'pages:river:created'  =>  "%s ha escrito" , 
 	 'pages:river:updated'  =>  "%s ha actualizado" , 
 
 add_translation('es', $spanish); 
 
-?>
+?>

File elgg/mod/pages/languages/fr.php

 	 'pages'  =>  "Pages" , 
 	 'pages:yours'  =>  "Vos pages" , 
 	 'pages:user'  =>  "Accueil aux pages" , 
-	 'pages:group'  =>  "Pages" , 
+	 'pages:group'  =>  "Pages de %s" , 
 	 'pages:all'  =>  "Toutes les pages du site" , 
 	 'pages:new'  =>  "Nouvelle page" , 
-	 'pages:groupprofile'  =>  "Pages" , 
+	 'pages:groupprofile'  =>  "Pages de groupe" , 
 	 'pages:edit'  =>  "Modifier cette page" , 
 	 'pages:delete'  =>  "Supprimer cette page" , 
 	 'pages:history'  =>  "Historique de la page" , 
 
 add_translation('fr', $french); 
 
-?>
+?>

File elgg/mod/pages/languages/it.php

 	 'pages'  =>  "Pagine" , 
 	 'pages:yours'  =>  "Le tue pagine" , 
 	 'pages:user'  =>  "Home pagine" , 
-	 'pages:group'  =>  "Pagine" , 
+	 'pages:group'  =>  "Pagine del gruppo" , 
 	 'pages:all'  =>  "Tutte le pagine del sito" , 
 	 'pages:new'  =>  "Nuova Pagina" , 
-	 'pages:groupprofile'  =>  "Pagine" , 
+	 'pages:groupprofile'  =>  "Pagine gruppo" , 
 	 'pages:edit'  =>  "Edita questa pagina" , 
 	 'pages:delete'  =>  "Cancella questa pagina" , 
 	 'pages:history'  =>  "Cronistoria pagine" , 
 
 add_translation('it', $italian); 
 
-?>
+?>

File elgg/mod/pages/languages/pt.php

 	 'pages'  =>  "Páginas" , 
 	 'pages:yours'  =>  "Suas páginas" , 
 	 'pages:user'  =>  "Páginas" , 
-	 'pages:group'  =>  "Páginas" , 
+	 'pages:group'  =>  "Páginas do grupo" , 
 	 'pages:all'  =>  "Todas as páginas" , 
 	 'pages:new'  =>  "Nova página" , 
-	 'pages:groupprofile'  =>  "Páginas" , 
+	 'pages:groupprofile'  =>  "Páginas do grupo" , 
 	 'pages:edit'  =>  "Editar esta página" , 
 	 'pages:delete'  =>  "Excluir esta página" , 
 	 'pages:history'  =>  "Histórico da página" , 
 
 add_translation('pt', $portuguese); 
 
-?>
+?>

File elgg/mod/pages/views/default/pages/groupprofile_pages.php

  */
 
 if ($vars['entity']->pages_enable != 'no') {
-	$vars['title'] = elgg_echo("pages:group");
-	$vars['more_link'] = $vars['url'].'pg/pages/owned/group:'.$vars['entity']->guid;
+?>
 
-	$add_link = $vars['url']."pg/pages/new/?container_guid=".$vars['entity']->guid;
-	$link_text = elgg_echo("pages:new");
-	$vars['buttons'] = array($add_link => $link_text);
-
+<div class="group_widget">
+<h2><a href="<?php echo $vars['url']; ?>pg/pages/owned/<?php echo page_owner_entity()->username; ?>"><?php echo elgg_echo("pages:group"); ?></a></h2>
+<?php 
+	if($vars['entity']->isMember()){
+		$add_link = $vars['url']."pg/pages/new/?container_guid=".$vars['entity']->guid;
+		$link_text = elgg_echo("pages:new");
+		echo "<a class=\"add_topic_button\" style=\"float:right;margin-top:-30px;margin-right:10px\" href=\"$add_link\">$link_text</a>";
+	}
+?>
+<?php
 	$context = get_context();
 	set_context('search');
-	$vars['content'] = elgg_list_entities(array('types' => 'object', 'subtypes' => array('page', 'page_top'), 'container_guid' => $vars['entity']->guid, 'limit' => 5, 'full_view' => FALSE, 'pagination' => FALSE));
+	$content = elgg_list_entities(array('types' => 'object',
+										'subtypes' => array('page', 'page_top'),
+										'container_guid' => $vars['entity']->guid,
+										'limit' => 5,
+										'full_view' => FALSE,
+										'pagination' => FALSE));
 	set_context($context);
 
-	if (!$vars['content']) {		
-		$vars['content'] = "<div class=\"forum_latest\">" . elgg_echo("pages:nogroup") . "</div>";
+    if ($content) {
+		echo $content;
+
+		$more_url = "{$vars['url']}pg/pages/owned/group:{$vars['entity']->guid}/";
+		echo "<div class=\"forum_latest\"><a href=\"$more_url\">" . elgg_echo('pages:more') . "</a></div>";
+	} else {
+		echo "<div class=\"forum_latest\">" . elgg_echo("pages:nogroup") . "</div>";
 	}
-	echo elgg_view('groups/group_widget',$vars);
+?>
+</div>
+<?php
 }

File elgg/mod/tasks/languages/ca.php

 	 'tasks:noresults'  =>  "No hi ha tasques" , 
 	 'tasks:createdby'  =>  "Creat per" , 
 	 'tasks:tasks'  =>  "Tasques" , 
-	 'group:task'  =>  "Tasques" , 
+	 'group:task'  =>  "Tasques del grup" , 
 	 'tasks:owner'  =>  "Creat per" , 
 	 'tasks:reportedby'  =>  "Creador de tasques" , 
 	 'tasks:group'  =>  "Grup" , 
 	 'tasks:subscribed'  =>  "Subscrit" , 
 	 'item:object:tasks'  =>  "Tasques" , 
 	 'tasks:container'  =>  "Contenidor" , 
-	 'tasks:group:active'  =>  "Tasques" , 
+	 'tasks:group:active'  =>  "Tasques actives del grup" , 
 	 'tasks:users'  =>  "Assignat a" , 
 	 'tasks:unassigned'  =>  "No assignat" , 
 	 'tasks:mine'  =>  "Les meves tasques" , 
 
 add_translation('ca', $catalan); 
 
-?>
+?>

File elgg/mod/tasks/languages/en.php

 			'tasks:noresults' => "No tasks",
 			'tasks:createdby' => "Created by",
 			'tasks:tasks' => "Tasks",
-			'group:task' => "Tasks",
+			'group:task' => "Group Tasks",
 			'tasks:owner' => "Created by",
 			'tasks:reportedby' => "Task Creator",
 			'tasks:group' => "Group",
 		        'item:object:tasks'  =>  "Tasks",
 		        'tasks:container' => "Container",
 
-			'tasks:group:active' => "Tasks",
+			'tasks:group:active' => "Active Group Tasks",
 			'tasks:scope' => "Scope",
 			'tasks:users' => "Asigned to",
 			'tasks:unassigned' => "Unassigned",

File elgg/mod/tasks/languages/es.php

 
 $spanish = array( 
 	 'tasks:tasks'  =>  "Tareas" , 
-	 'group:task'  =>  "Tareas" ,
+	 'group:task'  =>  "Tareas del grupo" ,
          'tasks:createsubtask' => "Crear subtarea",
 	 'tasks:owner'  =>  "Creado por" , 
 	 'tasks:creator'  =>  "Creador" , 
 	 'tasks:create'  =>  "Crear tarea" , 
 	 'tasks:subscribed'  =>  "Suscritas" , 
 	 'tasks:river:annotate'  =>  "un comentario en la tarea" , 
-	 'tasks:group:active'  =>  "Tareas" , 
+	 'tasks:group:active'  =>  "Tareas del grupo" , 
 	 'tasks:river:subscribe'  =>  "%s se ha apuntado a la tarea" , 
 	 'tasks:today'  =>  "Hoy" , 
 	 'tasks:river:unsubscribe'  =>  "%s ha dejado la tarea" ,