Index: conf/lang/fr/vm/sounds.xml
===================================================================
--- conf/lang/fr/vm/sounds.xml	(revision 16642)
+++ conf/lang/fr/vm/sounds.xml	(working copy)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <include><!--This line will be ignored it's here to validate the xml and is optional -->
   <macro name="voicemail_enter_id">
     <input pattern="(.*)">
       <match>
-	<action function="speak-text" data="Entrez votre Identification, suivi par $1."/>
+        <action function="play-file" data="voicemail/vm-enter_id.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -11,7 +11,8 @@
   <macro name="voicemail_enter_pass">
     <input pattern="(.*)">
       <match>
-	<action function="speak-text" data="Entrez votre code, suivi par $1."/>
+        <action function="play-file" data="voicemail/vm-enter_pass.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -19,7 +20,7 @@
   <macro name="voicemail_fail_auth">
     <input pattern="(.*)">
       <match>
-	<action function="speak-text" data="Identification incorrect."/>
+        <action function="play-file" data="voicemail/vm-fail_auth.wav"/>
       </match>
     </input>
   </macro>
@@ -27,7 +28,7 @@
   <macro name="voicemail_hello">
     <input pattern="(.*)">
       <match>
-	<action function="speak-text" data="Bienvenue sur votre répondeur."/>
+        <!--<action function="play-file" data="voicemail/vm-hello.wav"/> -->
       </match>
     </input>
   </macro>
@@ -35,7 +36,7 @@
   <macro name="voicemail_goodbye">
     <input pattern="(.*)">
       <match>
-	<action function="speak-text" data="Au revoir."/>
+        <action function="play-file" data="voicemail/vm-goodbye.wav"/>
       </match>
     </input>
   </macro>
@@ -43,54 +44,75 @@
   <macro name="voicemail_abort">
     <input pattern="(.*)">
       <match>
-	<action function="speak-text" data="Trop de tentatives échouées."/>
+        <action function="play-file" data="voicemail/vm-abort.wav"/>
       </match>
     </input>
   </macro>
 
   <macro name="voicemail_message_count">
-    <input pattern="^([^:]+):urgent-new">
+    <input pattern="^(\d+):(new)$" break_on_match="true">
       <match>
-	<action function="speak-text" data="Vous avez $1 nouveaux messages urgents dans le répertoire ${voicemail_current_folder}."/>
+        <action function="play-file" data="voicemail/vm-you_have.wav"/>
+        <action function="say" data="$1" method="pronounced" type="items"/>
+        <action function="play-file" data="voicemail/vm-$2.wav"/> 
+        <action function="play-file" data="voicemail/vm-message.wav"/>
       </match>
     </input>
-    <input pattern="^([^:]+):new">
+    <input pattern="^(\d+):(saved)$">
       <match>
-	<action function="speak-text" data="Vous avez $1 nouveaux messages dans le répertoire ${voicemail_current_folder}."/>
+        <action function="play-file" data="voicemail/vm-you_have.wav"/>
+        <action function="say" data="$1" method="pronounced" type="items"/>
+        <action function="play-file" data="voicemail/vm-message.wav"/>
+        <action function="play-file" data="voicemail/vm-$2.wav"/> 
       </match>
     </input>
-    <input pattern="^([^:]+):saved">
-      <match>
-	<action function="speak-text" data="Vous avez $1 messages sauvegardés dans le répertoire ${voicemail_current_folder}."/>
-      </match>
-    </input>
   </macro>
 
   <macro name="voicemail_menu">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-	<action function="speak-text" 
-		data="Pour écouter les nouveaux messages, tapez $1, Pour écouter les messages enregistrés, tapez $2, Pour les options avancées, tapez $3, pour sortir, tapez $4."/>
+        <action function="play-file" data="voicemail/vm-listen_new.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-listen_saved.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-advanced.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-to_exit.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$4" method="pronounced" type="name_phonetic"/>
       </match>
     </input>
   </macro>
 
-
   <macro name="voicemail_config_menu">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-	<action function="speak-text" 
-		data="pour enregistrer un message d'accueil, tapez $1, Pour choisir votre message d'accueil, tapez $2, Pour enregistrer votre nom, tapez $3, Pour changer votre mot de passe, tapez $4, Pour retourner au menu principal, tapez $5."/>
+        <action function="play-file" data="voicemail/vm-to_record_greeting.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-choose_greeting.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-record_name2.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-change_password.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-main_menu.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
 
-
   <macro name="voicemail_record_name">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="enregistrez votre nom après le bip, puis tapez une touche ou arrêtez de parler pour arrêter l'enregistrement."/>
-
+        <action function="play-file" data="voicemail/vm-record_name1.wav"/>
       </match>
     </input>
   </macro>
@@ -98,8 +120,15 @@
   <macro name="voicemail_record_file_check">
     <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$">
       <match>
-	<action function="speak-text" 
-		data="Pour écouter l'enregistrement, tapez $1, pour sauvegarder l'enregistrement, tapez $2, Pour réenregistrer, tapez $3."/>
+        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-rerecord.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -107,25 +136,95 @@
   <macro name="voicemail_record_urgent_check">
     <input pattern="^([0-9#*]):([0-9#*])$">
       <match>
-	<action function="speak-text" 
-		data="Pour indiquer ce message comme étant urgent, tapez $1, Pour continuer, tapez $2."/>
+        <action function="play-file" data="voicemail/vm-mark-urgent.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-continue.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
 
+  <macro name="voicemail_forward_prepend">
+    <input pattern="^([0-9#*]):([0-9#*])$">
+      <match>
+        <action function="play-file" data="voicemail/vm-forward_add_intro.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-send_message_now.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="voicemail_forward_message_enter_extension">
+    <input pattern="^([0-9#*])$">
+      <match>
+        <action function="play-file" data="voicemail/vm-forward_enter_ext.wav"/>
+        <action function="play-file" data="voicemail/vm-followed_by.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="voicemail_invalid_extension">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
+      </match>
+    </input>
+  </macro>
+
   <macro name="voicemail_listen_file_check">
-    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])(:(.*))?$">
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):(.*)$">
       <match>
-	<action function="speak-text" 
-		data="Pour réécouter l'enregistrement à nouveau, tapez $1, Pour sauvegarder l'enregistrement, tapez $2,  Pour supprimer l'enregistrement, tapez $3, pour transférer l'enregistrement à votre courriel $8, tapez $4, Pour appeler l'appelant, tapez $5, Pour transférer ce message à un  autre numéro, tapez $6."/>
+        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-forward_to_email.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$4" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
       </match>
     </input>
+    <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$">
+      <match>
+        <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-save_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-delete_recording.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$3" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-return_call.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$5" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-to_forward.wav"/>
+        <action function="play-file" data="voicemail/vm-press.wav"/>
+        <action function="say" data="$6" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
   </macro>
 
   <macro name="voicemail_choose_greeting">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="choisissez un message d'accueil entre 1 et 3."/>
+        <action function="play-file" data="voicemail/vm-choose_greeting_choose.wav"/>
       </match>
     </input>
   </macro>
@@ -133,7 +232,7 @@
   <macro name="voicemail_choose_greeting_fail">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="valeur incorrecte."/>
+        <action function="play-file" data="voicemail/vm-choose_greeting_fail.wav"/>
       </match>
     </input>
   </macro>
@@ -141,7 +240,7 @@
   <macro name="voicemail_record_greeting">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="enregistrez votre message d'accueil après le bip, puis tapez une touche ou arrêtez de parler pour arrêter l'enregistrement."/>
+        <action function="play-file" data="voicemail/vm-record_greeting.wav"/>
       </match>
     </input>
   </macro>
@@ -149,15 +248,17 @@
   <macro name="voicemail_record_message">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="enregistrez votre message après le bip, puis tapez une touche ou arrêtez de parler pour arrêter l'enregistrement."/>
+        <action function="play-file" data="voicemail/vm-record_message.wav"/>
       </match>
     </input>
   </macro>
 
   <macro name="voicemail_greeting_selected">
-    <input pattern="^(.*)$">
+    <input pattern="^(\d+)$">
       <match>
-	<action function="speak-text" data="message d'accueil numéro $1 sélectionné."/>
+        <action function="play-file" data="voicemail/vm-greeting.wav"/>
+        <action function="say" data="$1" method="pronounced" type="items"/>
+        <action function="play-file" data="voicemail/vm-selected.wav"/>
       </match>
     </input>
   </macro>
@@ -165,36 +266,35 @@
   <macro name="voicemail_play_greeting">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="$1 n'est pas disponible."/>
+        <action function="play-file" data="voicemail/vm-person.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-not_available.wav"/>
       </match>
     </input>
   </macro>
 
   <macro name="voicemail_say_number">
-    <input pattern="^(.*)$">
+    <input pattern="^(\d+)$">
       <match>
-	<action function="speak-text" data="$1"/>
+        <action function="say" data="$1" method="pronounced" type="items"/>
       </match>
     </input>
   </macro>
 
   <macro name="voicemail_say_message_number">
-    <input pattern="^new:(.*)$">
+    <input pattern="^([a-z]+):(\d+)$">
       <match>
-	<action function="speak-text" data="nouveau message numéro $1."/>
+        <action function="play-file" data="voicemail/vm-$1.wav"/> 
+        <action function="play-file" data="voicemail/vm-message_number.wav"/>
+        <action function="say" data="$2" method="pronounced" type="items"/> 
       </match>
     </input>
-    <input pattern="^saved:(.*)$">
-      <match>
-	<action function="speak-text" data="message sauvegardé numéro $1."/>
-      </match>
-    </input>
   </macro>
 
   <macro name="voicemail_say_phone_number">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="$1."/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
@@ -202,35 +302,39 @@
   <macro name="voicemail_say_name">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="$1."/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
       </match>
     </input>
   </macro>
-
-  <macro name="voicemail_ack">
+  <!-- Note: Update this to marked-urgent,emailed and saved once new sound files are recorded -->
+  <macro name="voicemail_ack"> 
     <input pattern="^(too-small)$">
       <match>
-	<action function="speak-text" data="message trop court"/>
+        <action function="play-file" data="voicemail/vm-too-small.wav"/>
       </match>
     </input>
     <input pattern="^(deleted)$">
       <match>
-	<action function="speak-text" data="message supprimé"/>
+        <action function="play-file" data="voicemail/vm-message.wav"/>
+        <action function="play-file" data="voicemail/vm-$1.wav"/>
       </match>
     </input>
     <input pattern="^(saved)$">
       <match>
-	<action function="speak-text" data="message sauvegardé"/>
+        <action function="play-file" data="voicemail/vm-message.wav"/>
+        <action function="play-file" data="voicemail/vm-$1.wav"/>
       </match>
     </input>
     <input pattern="^(emailed)$">
       <match>
-	<action function="speak-text" data="message envoyé"/>
+        <action function="play-file" data="voicemail/vm-message.wav"/>
+        <action function="play-file" data="voicemail/vm-$1.wav"/>
       </match>
     </input>
     <input pattern="^(marked-urgent)$">
       <match>
-	<action function="speak-text" data="message marqué comme étant urgent"/>
+        <action function="play-file" data="voicemail/vm-message.wav"/>
+        <action function="play-file" data="voicemail/vm-$1.wav"/>
       </match>
     </input>
   </macro>
@@ -238,9 +342,40 @@
   <macro name="voicemail_say_date">
     <input pattern="^(.*)$">
       <match>
-	<action function="speak-text" data="${strftime($1|%e/%m/%Y, %H heures %M)}"/>
+        <action function="say" data="$1" method="pronounced" type="current_date_time"/>
       </match>
     </input>
   </macro>
 
-</include><!--This line will be ignored it's here to validate the xml and is optional -->
\ No newline at end of file
+  <macro name="voicemail_disk_quota_exceeded">
+    <input pattern="^(.*)$">
+        <match>
+            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
+        </match>
+    </input>
+  </macro>
+
+  <macro name="valet_announce_ext">
+    <input pattern="^([^\:]+):(.*)$">
+      <match>
+        <action function="say" data="$2" method="pronounced" type="name_spelled"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="valet_lot_full">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
+      </match>
+    </input>
+  </macro>
+
+  <macro name="valet_lot_empty">
+    <input pattern="^(.*)$">
+      <match>
+        <action function="play-file" data="tone_stream://%(275,10,600);%(275,100,300)"/>
+      </match>
+    </input>
+  </macro>
+</include><!--This line will be ignored it's here to validate the xml and is optional -->
Index: conf/lang/fr/fr.xml
===================================================================
--- conf/lang/fr/fr.xml	(revision 16642)
+++ conf/lang/fr/fr.xml	(working copy)
@@ -1,5 +1,5 @@
 <include>
-  <language name="fr" sound-path="/snds" tts-engine="cepstral" tts-voice="david">
+  <language name="fr" sound-path="$${sounds_dir}/fr/fr/sibylle" tts-engine="cepstral" tts-voice="david">
     <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>
     <!--voicemail_fr_tts is purely implemented with tts, we need a files based implementation too -->
 	<X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>
Index: src/mod/say/mod_say_fr/mod_say_fr.c
===================================================================
--- src/mod/say/mod_say_fr/mod_say_fr.c	(revision 16642)
+++ src/mod/say/mod_say_fr/mod_say_fr.c	(working copy)
@@ -39,8 +39,9 @@
  * 
  * Anthony Minessale II <anthm@freeswitch.org>
  * Michael B. Murdock <mike@mmurdock.org>
+ * Stephane Alnet <stephane@shimaore.net>
  *
- * mod_say_fr.c -- Say for English
+ * mod_say_fr.c -- Say for French
  *
  */
 
@@ -80,10 +81,17 @@
 		if (a >= 48 && a <= 57) {
 			say_file("digits/%d.wav", a - 48);
 		} else {
-			if (type == SST_NAME_SPELLED) {
-				say_file("ascii/%d.wav", a);
-			} else if (type == SST_NAME_PHONETIC) {
-				say_file("phonetic-ascii/%d.wav", a);
+			switch(type) {
+				case SST_NAME_SPELLED:
+       				case SST_URL:
+			        case SST_EMAIL_ADDRESS:
+					say_file("ascii/%d.wav", a);
+					break;
+				case SST_NAME_PHONETIC:
+					say_file("phonetic-ascii/%d.wav", a);
+					break;
+				default:
+					break;
 			}
 		}
 	}
@@ -95,16 +103,33 @@
 {
 
 	if (a) {
-		say_file("digits/%d.wav", a);
-		say_file("digits/hundred.wav");
+		if(a > 1) {
+			say_file("digits/%d.wav", a);
+			say_file("digits/hundred.wav");
+		} else {
+			say_file("digits/hundred.wav");
+		}
 	}
 
 	if (b) {
 		if (b > 1) {
-			say_file("digits/%d0.wav", b);
-		} else {
-			say_file("digits/%d%d.wav", b, c);
-			c = 0;
+			/* fr-FR */
+			if(b == 7 || b == 9) {
+				if(c == 1) { /* 71 and 91 */
+					say_file("digits/%d%d.wav", b, c);
+					c = 0;
+				} else { /* 70, 72..79, 90, 92..99 */
+					say_file("digits/%d0.wav", b-1);
+					c = c + 10;
+				}
+			} else { /* 20..69, 80..89 */
+				say_file("digits/%d0.wav", b);
+				if(c == 1 && b != 8) { /* 21, 31, 41, 51, 61 */
+					say_file("currency/and.wav");
+				}
+			}
+		} else { /* 10..19 */
+			c = c + 10;
 		}
 	}
 
@@ -310,38 +335,26 @@
 
 		if (hours) {
 			say_num(hours, SSM_PRONOUNCED);
-			if (hours == 1) {
-				say_file("time/hour.wav");
-			} else {
-				say_file("time/hours.wav");
-			}
+			say_file("time/hour.wav");
 		} else {
 			say_file("digits/0.wav");
-			say_file("time/hours.wav");
+			say_file("time/hour.wav");
 		}
 
 		if (minutes) {
 			say_num(minutes, SSM_PRONOUNCED);
-			if (minutes == 1) {
-				say_file("time/minute.wav");
-			} else {
-				say_file("time/minutes.wav");
-			}
+			say_file("time/minute.wav");
 		} else {
 			say_file("digits/0.wav");
-			say_file("time/minutes.wav");
+			say_file("time/minute.wav");
 		}
 
 		if (seconds) {
 			say_num(seconds, SSM_PRONOUNCED);
-			if (seconds == 1) {
-				say_file("time/second.wav");
-			} else {
-				say_file("time/seconds.wav");
-			}
+			say_file("time/second.wav");
 		} else {
 			say_file("digits/0.wav");
-			say_file("time/seconds.wav");
+			say_file("time/second.wav");
 		}
 
 		return SWITCH_STATUS_SUCCESS;
@@ -370,36 +383,25 @@
 
 	if (say_date) {
 		say_file("time/day-%d.wav", tm.tm_wday);
+		if(tm.tm_mday > 1) {
+			say_num(tm.tm_mday, SSM_PRONOUNCED);
+		} else {
+			say_num(tm.tm_mday, SSM_COUNTED);
+		}
 		say_file("time/mon-%d.wav", tm.tm_mon);
-		say_num(tm.tm_mday, SSM_COUNTED);
 		say_num(tm.tm_year + 1900, SSM_PRONOUNCED);
 	}
 
 	if (say_time) {
-		int32_t hour = tm.tm_hour, pm = 0;
+		int32_t hour = tm.tm_hour;
 
-		if (hour > 12) {
-			hour -= 12;
-			pm = 1;
-		} else if (hour == 12) {
-			pm = 1;
-		} else if (hour == 0) {
-			hour = 12;
-			pm = 0;
-		}
-
 		say_num(hour, SSM_PRONOUNCED);
-
-		if (tm.tm_min > 9) {
+		say_file("time/hour.wav");
+		if(tm.tm_min) {
+			say_file("currency/and.wav");
 			say_num(tm.tm_min, SSM_PRONOUNCED);
-		} else if (tm.tm_min) {
-			say_file("time/oh.wav");
-			say_num(tm.tm_min, SSM_PRONOUNCED);
-		} else {
-			say_file("time/oclock.wav");
+			say_file("time/minute.wav");
 		}
-
-		say_file("time/%s.wav", pm ? "p-m" : "a-m");
 	}
 
 	return SWITCH_STATUS_SUCCESS;
@@ -434,17 +436,13 @@
 
 	/* If negative say "negative" */
 	if (sbuf[0] == '-') {
-		say_file("currency/negative.wav");
+		say_file("currency/minus.wav");
 		dollars++;
 	}
 
 	/* Say dollar amount */
 	fr_say_general_count(session, dollars, type, method, args);
-	if (atoi(dollars) == 1) {
-		say_file("currency/dollar.wav");
-	} else {
-		say_file("currency/dollars.wav");
-	}
+	say_file("currency/euro.wav");
 
 	/* Say "and" */
 	say_file("currency/and.wav");
@@ -452,14 +450,10 @@
 	/* Say cents */
 	if (cents) {
 		fr_say_general_count(session, cents, type, method, args);
-		if (atoi(cents) == 1) {
-			say_file("currency/cent.wav");
-		} else {
-			say_file("currency/cents.wav");
-		}
+		say_file("currency/cent.wav");
 	} else {
 		say_file("digits/0.wav");
-		say_file("currency/cents.wav");
+		say_file("currency/cent.wav");
 	}
 
 	return SWITCH_STATUS_SUCCESS;
@@ -495,6 +489,16 @@
 	case SST_CURRENCY:
 		say_cb = fr_say_money;
 		break;
+        case SST_TELEPHONE_NUMBER:
+        case SST_TELEPHONE_EXTENSION:
+        case SST_URL:
+        case SST_EMAIL_ADDRESS:
+        case SST_POSTAL_ADDRESS:
+        case SST_ACCOUNT_NUMBER:
+        case SST_SHORT_DATE_TIME:
+		say_cb = fr_spell;
+		break;
+
 	default:
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown Say type=[%d]\n", type);
 		break;