From: friendica <info@friendica.com>
Date: Wed, 6 Jun 2012 01:01:10 +0000 (-0700)
Subject: Merge pull request #57 from CatoTH/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=915145fc2773bf7ac00ba58370de2c4abd4fc678;hp=ddc54d4dd074a52b2f493c8d39d08a2d4ec2ce32;p=friendica-addons.git

Merge pull request #57 from CatoTH/master

New Addon: Calendar with CalDAV support
---

diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 2b1296d5..7d66664c 100644
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 8623157c..fb6faee2 100644
--- 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' . '" />';