Merge pull request #57 from CatoTH/master

New Addon: Calendar with CalDAV support

diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 2b1296d5a336ab4a3864e4df03fab26eea5244d5..7d66664ceee04f0ab7a23c9785cc2ce34639cb2a 100644 (file)
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ

diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
index 8623157cbb1325b62f94e1a41b682acc2bd9c481..fb6faee2b8acec63061f67006dc84f330845227c 100644 (file)
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -389,8 +389,8 @@ function smiley_pack_fr_smilies(&$a,&$b) {
        $b['texts'][] = ':carotte';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carotte' . '" />';
 
-       $b['texts'][] = ':popcorn';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
+       $b['texts'][] = '~popcorn';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . '~popcorn' . '" />';
 
        $b['texts'][] = ':tomate';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';