Merge commit 'ae76fa880c7aeb7f7b0846dd4b109be8d398018c' into develop

2 files changed, 16 insertions, 4 deletions

diff --git a/mod/simplepie/languages/en.php b/mod/simplepie/languages/en.php
index 07ff02905..a22316863 100644
--- a/mod/simplepie/languages/en.php
+++ b/mod/simplepie/languages/en.php
@@ -1,16 +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 --git a/mod/simplepie/languages/es.php b/mod/simplepie/languages/es.php
new file mode 100644
index 000000000..d9bd5d2d6
--- /dev/null
+++ b/mod/simplepie/languages/es.php
@@ -0,0 +1,14 @@
+<?php

+$spanish = array(

+        'simplepie:widget' => 'Enlace RSS',

+        'simplepie:description' => 'Agregar un blog externo',

+        'simplepie:notset' => 'Enlace RSS no configurado',

+        'simplepie:notfound' => 'no se encontro el feed. Revisa el feed url.',

+        'simplepie:feed_url' => 'Feed URL',

+        'simplepie:num_items' => 'Numero de items',

+        'simplepie:excerpt' => 'Incluir contenido',

+        'simplepie:post_date' => 'Incluir fecha del post',

+        'simplepie:postedon' => 'Posted on',

+        'simplepie:invalid_url' => 'Url invalida, copiela desde la barra del navegador por favor',

+);

+add_translation("en", $english);