From: Sem <sembrestels@riseup.net>
Date: Wed, 22 Jan 2014 03:02:17 +0000 (+0100)
Subject: Merge commit 'ae76fa880c7aeb7f7b0846dd4b109be8d398018c' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c0295c275d6edbca6c6c8bb51dc199150d0d5fc3;p=lorea%2Felgg.git

Merge commit 'ae76fa880c7aeb7f7b0846dd4b109be8d398018c' into develop
---

c0295c275d6edbca6c6c8bb51dc199150d0d5fc3
diff --cc mod/simplepie/actions/simplepie/save_group_feed.php
index 000000000,8dc2ffd78..8dc2ffd78
mode 000000,100644..100644
--- a/mod/simplepie/actions/simplepie/save_group_feed.php
+++ b/mod/simplepie/actions/simplepie/save_group_feed.php
diff --cc mod/simplepie/languages/en.php
index 07ff02905,000000000..a22316863
mode 100644,000000..100644
--- a/mod/simplepie/languages/en.php
+++ b/mod/simplepie/languages/en.php
@@@ -1,16 -1,0 +1,14 @@@
 +<?php
- 
 +$english = array(
 +	'simplepie:widget' => 'RSS Feed',
 +	'simplepie:description' => 'Add an external blog to your profile',
 +	'simplepie:notset' => 'Feed url is not set',
- 	'simplepie:notfind' => 'Cannot find feed. Check the feed url.',
++	'simplepie:notfound' => 'Cannot find feed. Check the feed url.',
 +	'simplepie:feed_url' => 'Feed URL',
 +	'simplepie:num_items' => 'Number of items',
 +	'simplepie:excerpt' => 'Include excerpt',
 +	'simplepie:post_date' => 'Include post date',
 +	'simplepie:postedon' => 'Posted on',
++	'simplepie:invalid_url' => 'Invalid url, copy it from the navigation bar please',
 +);
- 
 +add_translation("en", $english);
- 
diff --cc mod/simplepie/languages/es.php
index 000000000,d9bd5d2d6..d9bd5d2d6
mode 000000,100644..100644
--- a/mod/simplepie/languages/es.php
+++ b/mod/simplepie/languages/es.php
diff --cc mod/simplepie/views/default/forms/simplepie/save_group_feed.php
index 000000000,a3f771586..a3f771586
mode 000000,100644..100644
--- a/mod/simplepie/views/default/forms/simplepie/save_group_feed.php
+++ b/mod/simplepie/views/default/forms/simplepie/save_group_feed.php
diff --cc mod/simplepie/views/default/simplepie/group_module.php
index 000000000,90c017a86..90c017a86
mode 000000,100644..100644
--- a/mod/simplepie/views/default/simplepie/group_module.php
+++ b/mod/simplepie/views/default/simplepie/group_module.php